repeater optimization tweaks