document token attributes and special tokens and do some small
corrections