Fixes and improvements to wording
Merge pull request #2 from Foxtacles/fixes

Fixes and improvements to wording