Any tips on this and the oil filter and oil change would be welcome.

One item about oil filter change, I learned this the hard way. The oil filter housing is cast aluminum with two steel pins/srews that hold the cap. DO NOT OVERTIGHTEN these, if you do you will pull out those pins.
The large O ring on the cap eliminates the need for excessive tightening.

Vahe
240D/77