changed things around pre-import, a few remaining tweaks before import scripts need to be written