calibration now uses x-angle system and code cleanup