massive cleaning and updates