Added a bunch of settings changes