Some grouping bugs fixed..