bugfixes and co