More changes; some useful, some not.