MASTER: A few minor edits and a "no duplicate comments" addition.
MASTER: Updated.