Remaining changes. Still there is an issue generating valid unicode chars for the DFA library.