Minor edits and a couple of comments