Made a bunch more settings work