fix up for events analysis and better naming of chart labels