Options/Calibrate improvements