Various updates to calibration and blending