comments and edit