Fixes #984
Fixes #1055; Also cleans up import/export/save to ignore table_info data