updating settings, adding some comments