Clarifying option descriptions
Making add and remove methods work in non-item based mode