Lots of improvements to auto-calibrator.