updated grammar, /* and */ will now be handled via states
updated grammar, comment tokens will now be handled via states