many small bugfixes