some improvements to settings