A bunch of non-technical changes, mostly minor.

I made a bunch of fixes, mostly for consistency. I didn't make any technical changes.
There are still more changes that could be made, but I wanted to see what you think
of what I've done so far before doing them.