more edits and fixes