improved group parsing - more