Working NewDFA
GMSquare and more DFA fixes