Some more cleaning and bug squishes