Usability Improvements

Users can now throw around templates with far fewer nasty surprises.