and some bugfixes