Improvements: Water heater