more small bugfixes