removed old stuff, changed some settings