Export/Import, ton of bugfixes/polish