Update calibration subroutine defaults, add output