more bugfixes