major update--full expansion/lexicon generation cycle