small bugfixing, features