More calibration and compass threading