10.8, OCD, and bug fix

Just a few small things. Good coding overall. =)