improvements and experiments
possibility to "insert" expected tokens
fixed error