Removing one TODO
Error events emitted
doc and clean up