RR: heat yaml now works. Fixing up finalise scripts.