some repeater-list fixes, plus grunting