Cleanup and Dupe glitch fix