More explanation and checks for animation state tracking