improved calibration algorithms