adapted settings + bugfixes