bugfixes and other quality