Listener Manager

- please review my small changes