I second Novak. Their 20 rebuild kit was awesome and came with really good instructions. Rebuilt it without any issues as a first timer. Also did a T150 at the same time. Their knowledge base is also helpful and customer service has been top notch for me.
79/82/84/92 CJ-7 - 258/T-150: always a work in progress
1993 ZJ - 4.0L/AX-15: new daily/cheap fixer-up