some fixes, all tests work now