Update virtual pageview event categories, general polish