wording tweaks and consolidation fix
Merge pull request #341 from jpecht/master

wording tweaks and consolidation fix