small bugfixes
small bugfixes