Fixed HTML output, added paradigm to XML