On Monday the diesel mechanic took the injection pump off the engine, it will go to a specialist for a complete overhaul.  Minor jobs still in progress include replacing the smoke detector in the engine room and reinstalling the autopilot main unit, which was returned after servicing by Raymarine.