updated parser and added a few lexer tokens