Add dictionaries and some fixes.
PR: ports/9625 Submitted by: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>