Fixed a few settings. Need to now make the ui follow suit.