Minor bug fixes, stuff arose trying to fold my death tracking into integrated.