Added tracking for more game states + hook for death