More improvements.  Still more work to do.