timing and calibration improvements