more template edits