roughing out calibration routine

plus other very minor tweaks