Miscellaneous

Just a few small tweaks, I broke things up into separate commits so you could pick and choose in case you don't like everything.