Fix uniquify
Add watchwords