Formatting, grammar, bug fixes

As per the issue I created. Here is the pull request.