small bugfixes while testing