WIP first pass at all of Sarina's comments

I still need to double check I didn't miss anything
and also I want Jenkins to crack at it.