UP: Final mods before quick corpus/dict build