Final edits

lots of stuff changed