added table of tokens, fixed some small errors