Fix some bug, add new token generator.