various wording changes
Merge pull request #1198 from alanfgh/patch-5

various wording changes