Jack,
I have used a couple of products to etch the tank. I haven't used it but Evaporust is probably very good. I used one of those plumbers test plugs from the hardware store to seal the filler hole. I can't remember the exact size but you can measure the opening and go to the hardware store and find the right one. It looks like this and can be tightened with a wrench.

I used a rubber stopper that fit the hole where the petcock goes. It worked great. This will work better if you shake the tank now and then and leave it in different positions - up, down, left, right, etc. For thick rust you will need something to scrub the inside. The best I have come up with is about 4 feet of steel chain. I used light weight stuff that goes on a swing set. With this in there, when you shake the tank it scrubs the corrosion and allows the etch to penetrate quicker. Since the chain is all one piece, all you have to do to remove it is to hook one link and pull it out. I have used screws in the past and that is plain stupid. Live and learn.
Tank Before:

Tank After:

As others have stated, once the metal is etched it will rust very quickly. Drain, flush with water, drain, then flush with alcohol to drive the moisture out. I filled mine with gasoline and put the stoppers back in. That was about 6 months ago and I hope it is still clean when I need to use it.