Refactored things

Changed settings stuff.