Fixed state transitions and new GUI