Added support for user dictionary.
Updated TODO/DONE list.