Correct some typos
Merge pull request #707 from patriciomacadden/typo

Correct some typos
revert part of f069b53
revert more of f069b53