You have sorted this out by now I presume.
I have made some comments here that may help others in the future.