Added Death listener, plus more stuff