add lispwords, and align mappings