fixes to event start and end