Clean and change some misc stuff