further improvements to the XSLT