Fixing Duplicates and Erros