improvements to round robin generator