Carried over sub mapping changes

I should probably push this back into xlmp.py