Make tweaks to the core of the repair loop

This contains some tweaks to the core implementation of the repair loop that should smooth out some edge cases.