some small bugfixing