Import/Export behavior code complete, minor fixes