Improve de-duping and enough word check