More tweaks to randomizer