minor changes, adding more tokens and lexical stuff