bugfixing/simplyfing settings