Use dictionaries for spell object
Change cursor-move to use text block formatting.
Merge branch 'cl-work'