fixes as I was trying to follow along

I got this far and then saw your email that you are redoing this. so I'll just stop here :)