Fix some lexer and parser error.. Add