Second edit run through notebooks

I'm just submitting this as a PR for visibility. I'm going to merge this myself.