heat configuration fixes

work in progress -- currently testing