more bugfixes
even more fixes