More cleaning and fine tuning