Fix wording and some formatting