Moved settings to separate config file, added some settings