Fixed some bugs
Fixed some bugs
Fixed vocabulary issues