Re-including my many changes from the last week or so.