(1) Tidies to the Wishlist; (2) Extra testing for duplicates and