more robust event handling
removed unnecessary dependencies
test config added