Fixed several errors causing calibration to not begin properly