Thanks for the reply's guys.

I did have a scope trace of the Ign secondaries but it keeps crashing the pico software when I try and open it! They were ranging from 8-14kv. Cant remember what the spark line was but looked reasonable. Fuel trims were reset when I did the original work but I have not re checked them, Will do first thing in the morning. MAP sensor seems OK, 1v at idle, Peak at 4.2v, responds quickly. Not tried the gas analyser, very rarely use it, Will also give that a try in the morning.

Cheers.
Steve.