A few small changes.
Merge pull request #1 from whalesalad/master

merge @whalesalad's latest changes into @marks' master