Import data improvements

This code will all look familiar to you, Laurence.