fix clean, change some other stuff