Refactor import, handle blank metadata fields as requested, docs.