edits and fixes