fixes - simpler calibration