Fixed calibration and tracking, now verifiable