competition management tweaks, created an infinite loop? Addresses most of #38.