more data import tweaks