small bugfixes after test