clean up templates
escaped a bunch of templates that were missed
fixes #39