If wax is desired there is none better than Renaissance Wax. The Smithsonian and the Tower of London can't be wrong. (Can they?)

For "regular" stock cleaning and polishing Ballistol works just fine. It can be used on the rest of the gun, too, as a CLP. Great stuff, Ballistol!

I don't use linseed oil anymore for "rubbed in" polishing. I find that walnut oil works at least as well and it is unadulterated "food grade". Care should be taken to make sure that one is not allergic to walnuts, though.