add xpi
fix unloading more