Fit mathematics improved, obsollete GBTracker cleaned up