bugfixes and configuration