More tweaks

Eight commits, with 16 lines of code. Can you tell that I'm hand coding form the Github site at work?