fixes argument name for T12 to T8 measure
adds service water heating to m0