Better death stats handling, fix chart