add proper noun support, some more vocab