That's pretty good going Chris
One tip - if you're ripping out the carbon canister thing, it might be best to leave it's valve connected to the loom.
I removed mine and it's wiring... After running the engine for a while yesterday I checked for fault codes and the only one I have is for a broken evap valve