more tweaks for calibration