Clean up and change some settings