Lots of Little Changes

I can't exactly remember the changes in this one, but I'm pretty sure
they were mostly cosmetic.