seveal small bugfixes