3.0 cleanup

Cleanup the early chapters a bit. I'm starting to quickly read the entire book and look for obviously wrong or content that confuses me.
I agree. Too much un-DRY stuff that gets out of date too quickly.