organized settings, added more options