whole lotta new cleanup, all tests are passing

94% coverage, wooo