more updates to event functionality