Some updates to wording, clarifications