do second round of gabe and steiner's edits