Various changes trying to get calibration to work. So far, no luck.