items renamed to subitems, subtypes renamed to items, raw versions shuffled around appropriately, in tables 2, 3a, and 3b