- some bugfixes