fixes
some fixes on settings