Minor message changes

Tweaked a few of the messages and fixed a small mistake.
Merge pull request #2 from varkor/master

Minor message changes