Updated, added more XSLT rules