Added tokens; Fixed lexer; Updated parser;