import from xml + other fixes
import from huge xml