* new fields on token
* some code cleanup