first round of changes from reviewer feedback