some more bugfixes