minor tune-up of events stuff