Minor syntax changes
tweaking event bus for error handling
Fixing issues with default service