more randomization tweaks