More changes and references