More changes, and some clean up.