Fix issues with settings

FIX ALL THE THINGS!!!!