Added Disconnect stuff
Changed listen logic