taking care of TODOs and some bug fixes for import/export/dump/restore