Wording changes

this addresses most of my comments on the patch-2 branch