bugfixes and extensions