Refactored some settings, Fixed some bugs