quick safety checkin gworking on calibration again
safety checkin of better two-pass calibration code ( more cleanup to do)