More comments and edits