some bugfixes again