Some edits and comments