Calibration enhancements

The old method used about 4 increments for voltage gain, and 1 for current gain, so it is not much slower, but I agree, acceleration would be nice.