debugging improvements for data-import phase2 & 3