Lots more changes.  Still a bit more to be done, however.