Implement calibration procedure, other tweaks