Fixed event management.
changes to event management