fixed a lot of dup problems and found a lot more
merged