more import work; export bugfixes