some bugfixes again -.-