Fix consistency issues and most glaring wording issues.
Merge pull request #15 from Shnatsel/master

Fix consistency issues and most glaring wording issues