fixed some import/export weirdness