Reordering and fixing plurals.
Abandoning the full randomization approach in favor of more coherent swappable chunks.