a bunch of template edits