some restructuring
various fitter fixes