Some cleanup and improvements.
Adding puppet.