changes made to settings

changes made to settings merged