small bugfixes
conflict resolved