I discovered a pin hole oil leak in the pan today of my 1986 C30 (Universal M-25). Looks like the engine will need to be pulled. While it is out it, I plan on some overhaul work. To start, I might as well upgrade to a 3" heat exhchager. Also, the wiring harness will be replaced because it has been diagnosed as losing amperage. The engine will be painted. The engine mounts will be cleaned up. The yard has suggested that this would be a good time for a muffler replacement. The oil dip stick tube will be replaced as it is badly rusted. What else should I be doing to the engine while it is in for some "spa treatment?" Can I save some money and get some of these parts at a Kubota dealer? Thanks for your advice. Mike