More edits

To reflect Thomas’ changes in answers.