better cleaning and dupe error catch work