massive round of templating edits, #1