Minor adjustments to vocabulary and vocabulary handling to include
part-of-speech with vocab