and more bugfixes