Changed events to meet new spec. Also allowed for overwriting individual event types.