Fix documentation and Listener