Fix some wording and markup