fran updates to lexical and syntax analysis