Mms proposed updates

These are my proposed updates, mostly reflecting the things that I've been doing without documenting them. Feel free to tear them apart. I'll annotate changes that I think need explanation.
Consistency with style above. I prefer this not only because of the space saved on the right, but because I find it convenient to always have evenly spaced tabs. With the former style, you could easily end up indenting by 5 or 7 spaces.