Committing additional edits and clean up to the calibration scripts.
For got to save the changes to these files before my previous commit.