fixes and edits