more grouping improvements