added monitoring emitter, bug fixes