Changed some settings
Minor updates