update authentication & fix event emitter