Some Jonathan edits