Added code to display tokens are they are parsed, updated comment tokens and add OHTER token to catch undefined tokens.