Some changes to token.cpp