Import/Export was added. Some small minor fixes