I think I've finally managed to merge all of the code for the current release up to the line where I'm trying to incorporate the locking fixes. *whee* Now to test it. :)