Tokens completely revised
Updating the documentation