Fixed a bunch of stuff that the book had wrong.

All the test pass now.