Fix issues with numbering and randomization (#3/#4).