Fixed bugs with calibration state-machine after testing on Ultimaker