Minor edits and comments