tweaks per Sam's comments. Just pushing straight to master.