Fixed some rather silly bugs, and cleared up some misunderstandings. We now fail 23 tests.