Added some grouping parameters
Minor doc change