Fix wording and some typos