more xml tweaks