again, some bugfixes