Peda1996 master

Tokens improvenments etc.