Removed some dupes from vocab, corrected some types in vocab.def,
updated documentation to match