Add more tokens, resolve some bugs
Update README