almost all tests passing
remove temporary errors etc