Review State Machine Changes

Review changes to a state machine for missing transitions and impossible states.

• review
• code