integrated yuliya's edits

not done copyediting yet but I'm just going to commit these first