Fixing caching issue.
Vocabulary fixes.
More vocabulary.