Minor bug fixes

fix bug where block heater turns off 1 hr late. Reorganized command
list for fewer lines.