Adjustments to group probability generation

(These changes should have been in the last commit)