change names of a few things for consistency, and do better with <text> in <group>