Added new calibration information and tweaks related to that.