more bugfixes with settings