bugs and edits