Misc cleanups.  Reimplement heater state display/control.