Add Heat instructions. Fix bugs. Simplify keystone script