Bug fixes and display change

Erroneous comment-start removed, Pump and Heater place on display
swapped.