Typos

Fixing comments, the English sounds weird.
Fixing typo

Thanks FnTm for the pull request review.
Merge pull request #755 from kenden/1.7

Rephrased comment, the English was weird.
Merge branch '1.7' into 1.8