+ resources for RosterItems; cleanups & refactoring