added tagging words with types, seems to work so far