Some messy improvements to e-Sword import messy situation