Ametist, that's great, thank you.
I could go on tinkering but I think it's time to let it rest. I'll leave it for a week, just in case anyone finds any other issues and then send it to Diafero and he can put it through his various tests. Fingers crossed it should pass!