edits and fixes!