improvements to event vector