some cleaning and updates