bugfixes and more