D'oh! Shouldn't try to rush things. Hopefully the latest commit corrects my mistakes. If not I will wait until I've had a good nights sleep before fixing.
Thanks for the feedback.