Add tons of polish

The commits do a decent job of describing the changes.

overall though, just looking for a sanity check on names, commas and things...

i'll squash some commits before this goes in