updated event_bus, fixed some warnings