A bit more cleanup
Fixed the settings calls..
Ooops..