Many fixes to death conditions ingame