updates and edits