switched to JDOM2; links to subcategories added