Many changes to xslt templates