add lexer and small parser changes