Renamed switch
Tweak hot tub heating
Persist combinator values (for restart)