Updated Listener

Added more events and catches into listener.