Made the settings a little less confusing