Calibration mode improvements

Less intensive.
Controls now work in calib mode.