Adds stevens first round of edits (still some outstanding q?s)