bugfix
dispatchers and validators
more on nfa