Misc changes in wording and formatting