minor edits before shipping off.
Merge pull request #3 from scopatz/master

Some minor changes