added small bugfixes