Spring cleaning

PM sent on various parts.