Improved What Happens when you die

Part of Issue #88