some bugfixes...