Minor edits + comments