grouping added; docs improvements