improvements on calibration code / tools