fixes to new calibrator