some experimental token functions
small fix added