More vocabulary improvements