A giant wad of changes, too  many to add.  Pushing so I can go home and debug.