more combinators for Automaton, changed some signatures