More changes and fixing data links