Added ECauseOfDeath and did some cleanup