Merging branches

Minor bug to deal with, but finally new heat works.