some improvements to calibration plus testing