Don't use EventEmitter
Cleanup & some bugfixes