DFA merged to branch, parsing -extract(), some refactoring