Fix typos and such
Merge pull request #1 from sosiouxme/master

Fix typos and such