a few more issues

17 tests still failing. Almost there...