- bugfixes and further improvements