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.
Just an indentation fix.