more small bugfixes
more changes