added various fixes to hotwater_mk1