I took the Cat off, and ran it without it and that wasn't the problem.
Next I installed a new distributor cap and rotor. That wasn't the problem.
I ran a comp error check, the usual 12 and 33 came back to me, which as I understand it doesn't mean anything for my YJ, but I also got a 21, which is the oxygen sensor. I know it is broken and it's not even plugged in, but that shouldn't be what's causing the problem.
I know the fuel pressure is good.
Any other thoughts?