improved group parsing - nits