Here are the changes I made. I've labeled them with ticket999 until we decide how to proceed. I've included a diff and a pdf. In the pdf, just search for ticket999. Please let me know what you think. Thanks, -d