Settings tweaks

Some small updates to the settings. Feel free to go through and add more changes as necessary.