Fixed up confusion over the eventBus, many fixes.