Change wording

First bunch of changes from the @slhenry questionnaire