added composite automata, fixed trigo and a bit more