Added some 'questions' in the form of comments to parser. Made names of tokens between parser and scanner agree.