Updates to calibration & early scanning features