second round of edits and fixes