add better randomization for bugs