small bugfix
several changes