Completed DFA. Added all switches.