Updated user settings option, enhanced comments