work on AST
some changes in parser