Event Bus & Bug fixes