added lexical categories and included non-word items in word mapping