fixing some glitches with import