I did talk to a guy who works on my Jeep. He said, 16 gallon gas tank, possibly 14 for the 4 cylinder.
A few 'upgrades' to make. First, I replace the stock headlights. I went with Cibie H4s from Daniel Stern Lighting and a headlight harness from him. A bit of $$. Some have been happy with LEDs. I'd replace the stock aluminum steering box spacer, with a steel aftermarket one. About $35 to $50. I'd also look into an after market double sheer trackbar (panhard bar). Probably $250 and up.