bugfixes
more fixes