Scruff - Check out the modified Db that Arod23 and I have been working on. We hope to have it up for d-load in the next day or so. We specificaly addressed the issues you mentioned with our DB.
Check out the thread
here
If you read thru it you will eventualy come across the readme files I posted which detail the edis we have made.