Slow down the control loop, plus tidying up.