several bugfixes...