Fixed Listener (hopefully)

Also updated TODO list