Now, the Trainer starts with 20 Collars, and Collars no longer appear randomly.
Neither Collars nor Revives are used now if your don't specify the slot on which to use them.