1981 240d vac problems

[Glacierbut]

I have learned a great deal from all of you pros out there on this site. I have a 1981 240D with an automatic tranny. Have been getting this ol diva fixed up best I can. One issue I am having problems with(of course) is vacuum. The car only has 128,000 miles on her. there must be a leak in the vacuum system as the tranny does not always shift when it should. When I plugged the two vacuum lines leading to all of the locking system, she shifted like a bat out of hell. Very smooth and crisp. Might even say the old car was fast and sporty. Stop laughing! She can hear you. The only problem was that the engine would not shut off. Once I re-attached the locking system vac lines, the engine finially shut off. The door locks work, they just take awhile to engage. There is some oil in the vac lines and at the key switch. Do I need to do a vac pump rebuild? I ordered some paper type filters to install in vac line to get out the oil. Not sure what the best approach is. I could live without the door locks if I keep the lines plugged, just need to be able to shut the car off.
I would appreciate any suggestions you might have.
Thanks