Almost there

I have been chasing down some hard to find errors which have taken a while to get to the bottom of. Hopefully they are now sorted out, but will need to review the logs in a few days to make sure.

I think everything is now working as it should.