Minor edits

Commits are pretty self-explanatory. Mostly minor housekeeping type stuff.