more bugfixes
more fixes