more bugfixes.