some bugfixes after test run