* Improved token generator stability and made it a state-machine internally