improved group parsing
improved group parsing - more
improved group parsing - nits