some bugfixes? all tests still fail.