work:another round of edits and fixes with J