some cleaning and uptates