More work on tuning, allow Setpoint to be set