tidied up some import/export stuff