Woo! Calibration seems to work now :D