More changes and updates.