Various changes to moveCalibration.h

Still needs to be tested