More editing to correct information flow and residence in report + Shortened data set IDs to avoid overflow into other sections