Insert repeaters, Fix some problems with groups