Minor template and language changes

Some minor, pedantic revisions for things that somehow irked me.