Sorry for so many emails.  The software does weird things...  Hopefully this version is correct and complete.