Adding edits and clarifications from @gvwilson