just some bugfixes