re-did importer to support bulk importing
fix lingering code plus a typo