several bugfixes
several bugfixes