Removed addition of vocabulary string to keyword. Other changes.