more rnd tweaks