some Bugfixes and extensions