settings fix, + bugfix