chased down a couple of bugs, test suite still failing.