more tweaks to importing modules