* more bugfixes ...