Update indexing of tokens, and add fuller morphological analysis for verbs.