even more bugfixes