More cleaning and fixing