Improvements made to token.js and lexer.js