fix event class to generate event_instances rather than frankenstein-ish data structures