Thanks Guys! I got the diplo changes, Vovan, though I haven't implemented them yet. Thanks for the patch to make the scenarios work, Laurent. I am back to major RL for a bit, so other than critical support I won't be able to do much with the new stuff in the immediate future. In the next week or so, I'd like to have a version of the code settled down enough to send out to the scenario guys, so they can get back to working on them.