Improvements

Completed death handling