Changed some stuff in token.cpp