More changes, cleaning up. Likely to be final.