spellcheck, more reorg