diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d5a3636df..ef6411ad0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,2 +1,9 @@
+Validator Changes
+* none
+
+Other Code Changes
 * Updating client logger to log both req and resp
 * Refactoring of converter loader and misc packages. 
+* rework all HTTP access through a single access point (todo: refactor this to use okhttp)
+* Improvements to rendering for IG publication
+
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java
index 864ee8520..baed5c0d8 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CKMImporter.java
@@ -1,5 +1,8 @@
 package org.hl7.fhir.convertors.misc;
 
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
+
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -39,10 +42,10 @@ import org.w3c.dom.Element;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -122,13 +125,10 @@ public class CKMImporter {
   }
 
   private Document loadXml(String address) throws Exception {
-    URL url = new URL(address);
-    HttpURLConnection connection =
-      (HttpURLConnection) url.openConnection();
-    connection.setRequestMethod("GET");
-    connection.setRequestProperty("Accept", "application/xml");
-
-    InputStream xml = connection.getInputStream();
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(address, "application/xml");
+    res.checkThrowException();
+    InputStream xml = new ByteArrayInputStream(res.getContent());
 
     DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
     DocumentBuilder db = dbf.newDocumentBuilder();
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/DicomPackageBuilder.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/DicomPackageBuilder.java
index 78ad85ac9..84b192755 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/DicomPackageBuilder.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/DicomPackageBuilder.java
@@ -122,7 +122,10 @@ public class DicomPackageBuilder {
     npm.addProperty("version", version);
     JsonArray fv = new JsonArray();
     npm.add("fhirVersions", fv);
-    fv.add("4.0");
+    fv.add("4.0.1");
+    JsonObject dep = new JsonObject();
+    npm.add("dependencies", dep);
+    dep.addProperty("hl7.fhir.r4.core", "4.0.1");
     return npm;
   }
 
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
index b65671884..9f9bf14a5 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ICD11Generator.java
@@ -17,11 +17,13 @@ import org.hl7.fhir.r4.terminologies.CodeSystemUtilities;
 import org.hl7.fhir.r4.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
+import org.hl7.fhir.utilities.json.JsonTrackingParser;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -388,12 +390,12 @@ public class ICD11Generator {
 
 
   private JsonObject fetchJson(String source) throws IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    c.addRequestProperty("Accept", "application/json");
-    c.addRequestProperty("API-Version", "v2");
-    c.addRequestProperty("Accept-Language", "en");
-    return (JsonObject) new com.google.gson.JsonParser().parse(TextFile.streamToString(c.getInputStream()));
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    http.addHeader("API-Version", "v2");
+    http.addHeader("Accept-Language", "en");
+    HTTPResult res = http.get(source, "application/json");
+    res.checkThrowException();
+    return JsonTrackingParser.parseJson(res.getContent());
   }
 
 
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java
index 5c5fbb69e..5e7d1d6c1 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java
@@ -159,4 +159,9 @@ public class TerminologyClientR2 implements TerminologyClient {
     client.setUserAgent(userAgent);
     return this;
   }
+
+  @Override
+  public String getServerVersion() {
+    return client.getServerVersion();
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java
index 68f03ba60..27082bd05 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java
@@ -168,4 +168,9 @@ public class TerminologyClientR3 implements TerminologyClient {
     client.setUserAgent(userAgent);
     return this;
  }
+
+  @Override
+  public String getServerVersion() {
+    return client.getServerVersion();
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java
index d9e6431e0..b91ba2f85 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java
@@ -168,4 +168,9 @@ public class TerminologyClientR4 implements TerminologyClient {
     client.setUserAgent(userAgent);
     return this;
   }
+
+  @Override
+  public String getServerVersion() {
+    return client.getServerVersion();
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java
index cffbc1503..25cf47be6 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java
@@ -154,4 +154,9 @@ public class TerminologyClientR5 implements TerminologyClient {
     client.setUserAgent(userAgent);
     return this;
   }
+
+  @Override
+  public String getServerVersion() {
+    return client.getServerVersion();
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java
index 5308f7c98..fa0f4966a 100644
--- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java
+++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java
@@ -866,4 +866,8 @@ public class FHIRToolingClient {
   public void setUserAgent(String userAgent) {
     utils.setUserAgent(userAgent);
   }
+
+  public String getServerVersion() {
+    return conf == null ? null : conf.getSoftware().getVersion();
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java
index 8239deb2e..d2e75610f 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java
@@ -580,5 +580,9 @@ public class FHIRToolingClient {
   public void setUserAgent(String userAgent) {
     this.userAgent = userAgent;
   }
+
+  public String getServerVersion() {
+    return capabilities == null ? null : capabilities.getSoftware().getVersion();
+  }
 }
 
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileComparer.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileComparer.java
index ffe177eb9..7796cd470 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileComparer.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileComparer.java
@@ -34,7 +34,6 @@ package org.hl7.fhir.r4.conformance;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -70,6 +69,8 @@ import org.hl7.fhir.r4.terminologies.ValueSetExpander.ValueSetExpansionOutcome;
 import org.hl7.fhir.r4.utils.DefinitionNavigator;
 import org.hl7.fhir.r4.utils.ToolingExtensions;
 import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
@@ -1283,9 +1284,10 @@ public class ProfileComparer {
     File f = new File(local);
     if (f.exists())
       return TextFile.fileToString(f);
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    String result = TextFile.streamToString(c.getInputStream());
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(source);
+    res.checkThrowException();    
+    String result = TextFile.bytesToString(res.getContent());
     TextFile.stringToFile(result, f);
     return result;
   }
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
index 3c5ef33d7..0a402e4d8 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java
@@ -547,5 +547,9 @@ public class FHIRToolingClient {
   public void setUserAgent(String userAgent) {
     this.userAgent = userAgent;
   }
+
+  public String getServerVersion() {
+    return capabilities == null ? null : capabilities.getSoftware().getVersion();
+  }
 }
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
index 6813cfefe..f504f22d8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
@@ -335,7 +335,7 @@ public class ProfileUtilities extends TranslatingUtilities {
   private boolean autoFixSliceNames;
   private XVerExtensionManager xver;
   private boolean wantFixDifferentialFirstElementType;
-  private List<String> masterSourceFileNames;
+  private Set<String> masterSourceFileNames;
 
   public ProfileUtilities(IWorkerContext context, List<ValidationMessage> messages, ProfileKnowledgeProvider pkp, FHIRPathEngine fpe) {
     super();
@@ -2465,7 +2465,7 @@ public class ProfileUtilities extends TranslatingUtilities {
     return element;
   }
 
-  public static String processRelativeUrls(String markdown, String webUrl, String basePath, List<String> resourceNames, List<String> filenames) {
+  public static String processRelativeUrls(String markdown, String webUrl, String basePath, List<String> resourceNames, Set<String> filenames) {
     StringBuilder b = new StringBuilder();
     int i = 0;
     while (i < markdown.length()) {
@@ -2508,7 +2508,7 @@ public class ProfileUtilities extends TranslatingUtilities {
   }
 
 
-  public static boolean isLikelySourceURLReference(String url, List<String> resourceNames, List<String> filenames) {
+  public static boolean isLikelySourceURLReference(String url, List<String> resourceNames, Set<String> filenames) {
     if (resourceNames != null) {
       for (String n : resourceNames) {
         if (url.startsWith(n.toLowerCase()+".html")) {
@@ -6669,11 +6669,11 @@ public class ProfileUtilities extends TranslatingUtilities {
     return getElementById(structure, structure.getSnapshot().getElement(), element.getContentReference());
   }
 
-  public List<String> getMasterSourceFileNames() {
+  public Set<String> getMasterSourceFileNames() {
     return masterSourceFileNames;
   }
 
-  public void setMasterSourceFileNames(List<String> masterSourceFileNames) {
+  public void setMasterSourceFileNames(Set<String> masterSourceFileNames) {
     this.masterSourceFileNames = masterSourceFileNames;
   }
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/HTMLClientLogger.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/HTMLClientLogger.java
index 2d955c4c6..661282fad 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/HTMLClientLogger.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/HTMLClientLogger.java
@@ -44,6 +44,7 @@ public class HTMLClientLogger extends BaseLogger implements ToolingClientLogger
 
   private static final boolean DEBUG = true;
   
+  private boolean req = false;
   private PrintStream file;
   
   public HTMLClientLogger(String log) {
@@ -80,6 +81,7 @@ public class HTMLClientLogger extends BaseLogger implements ToolingClientLogger
       }
     }
     file.println("</pre>");
+    req = true;
   }
 
   @Override
@@ -87,8 +89,12 @@ public class HTMLClientLogger extends BaseLogger implements ToolingClientLogger
     if (DEBUG) {
       System.out.println(" txlog resp: " +outcome+" "+present(body));
     }
+    req = false;
     if (file == null)
       return;
+    if (!req) {
+      System.out.println("Record Response without request");
+    }
     file.println("<pre>");
     file.println(outcome);
     for (String s : headers)  
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
index a35c5d640..2208281c6 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
@@ -63,6 +63,8 @@ import org.hl7.fhir.utilities.validation.ValidationOptions;
 import org.hl7.fhir.utilities.xhtml.NodeType;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
 import org.hl7.fhir.utilities.xhtml.XhtmlParser;
+import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator;
+import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Piece;
 
 public class DataRenderer extends Renderer {
   
@@ -129,6 +131,56 @@ public class DataRenderer extends Renderer {
  
   // -- 3. General Purpose Terminology Support -----------------------------------------
 
+  private static String month(String m) {
+    switch (m) {
+    case "1" : return "Jan";
+    case "2" : return "Feb";
+    case "3" : return "Mar";
+    case "4" : return "Apr";
+    case "5" : return "May";
+    case "6" : return "Jun";
+    case "7" : return "Jul";
+    case "8" : return "Aug";
+    case "9" : return "Sep";
+    case "10" : return "Oct";
+    case "11" : return "Nov";
+    case "12" : return "Dec";
+    default: return null;
+    }
+  }
+  
+  public static String describeVersion(String version) {
+    if (version.startsWith("http://snomed.info/sct")) {
+      String[] p = version.split("\\/");
+      String ed = null;
+      String dt = "";
+
+      if (p[p.length-2].equals("version")) {
+        ed = p[p.length-3];
+        String y = p[p.length-3].substring(4, 8);
+        String m = p[p.length-3].substring(2, 4); 
+        dt = " rel. "+month(m)+" "+y;
+      } else {
+        ed = p[p.length-1];
+      }
+      switch (ed) {
+      case "900000000000207008": return "Intl"+dt; 
+      case "731000124108": return "US"+dt; 
+      case "32506021000036107": return "AU"+dt; 
+      case "449081005": return "ES"+dt; 
+      case "554471000005108": return "DK"+dt; 
+      case "11000146104": return "NL"+dt; 
+      case "45991000052106": return "SE"+dt; 
+      case "999000041000000102": return "UK"+dt; 
+      case "20611000087101": return "CA"+dt; 
+      case "11000172109": return "BE"+dt; 
+      default: return "??"+dt; 
+      }      
+    } else {
+      return version;
+    }
+  }
+  
   public static String describeSystem(String system) {
     if (system == null)
       return "[not stated]";
@@ -282,7 +334,7 @@ public class DataRenderer extends Renderer {
   // -- 5. Data type Rendering ---------------------------------------------- 
 
   public static String display(IWorkerContext context, DataType type) {
-    return new DataRenderer(new RenderingContext(context, null, null, "http://hl7.org/fhir/R4", "", null, ResourceRendererMode.RESOURCE)).display(type);
+    return new DataRenderer(new RenderingContext(context, null, null, "http://hl7.org/fhir/R4", "", null, ResourceRendererMode.END_USER)).display(type);
   }
   
   public String displayBase(Base b) {
@@ -412,6 +464,13 @@ public class DataRenderer extends Renderer {
     }
   }
 
+  public void renderDateTime(XhtmlNode x, String s) {
+    if (s != null) {
+      DateTimeType dt = new DateTimeType(s);
+      x.addText(dt.toHumanDisplay());
+    }
+  }
+
   protected void renderUri(XhtmlNode x, UriType uri) {
     if (uri.getValue().startsWith("mailto:")) {
       x.ah(uri.getValue()).addText(uri.getValue().substring(7));
@@ -481,15 +540,53 @@ public class DataRenderer extends Renderer {
 
   public String displayCoding(Coding c) {
     String s = "";
+    if (context.isTechnicalMode()) {
+      s = c.getDisplay();
+      if (Utilities.noString(s)) {
+        s = lookupCode(c.getSystem(), c.getVersion(), c.getCode());        
+      }
+      if (Utilities.noString(s)) {
+        s = displayCodeTriple(c.getSystem(), c.getVersion(), c.getCode());
+      } else if (c.hasSystem()) {
+        s = s + " ("+displayCodeTriple(c.getSystem(), c.getVersion(), c.getCode())+")";
+      } else if (c.hasCode()) {
+        s = s + " ("+c.getCode()+")";
+      }
+    } else {
     if (c.hasDisplayElement())
       return c.getDisplay();
     if (Utilities.noString(s))
       s = lookupCode(c.getSystem(), c.getVersion(), c.getCode());
     if (Utilities.noString(s))
       s = c.getCode();
+    }
     return s;
   }
 
+  private String displayCodeSource(String system, String version) {
+    String s = displaySystem(system);
+    if (version != null) {
+      s = s + "["+describeVersion(version)+"]";
+    }
+    return s;    
+  }
+  
+  private String displayCodeTriple(String system, String version, String code) {
+    if (system == null) {
+      if (code == null) {
+        return "";
+      } else {
+        return "#"+code;
+      }
+    } else {
+      String s = displayCodeSource(system, version);
+      if (code != null) {
+        s = s + "#"+code;
+      }
+      return s;
+    }
+  }
+
   public String displayCoding(List<Coding> list) {
     CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
     for (Coding c : list) {
@@ -502,6 +599,48 @@ public class DataRenderer extends Renderer {
     renderCoding(x, c, false);
   }
   
+  protected void renderCoding(HierarchicalTableGenerator gen, List<Piece> pieces, Coding c) {
+    if (c.isEmpty()) {
+      return;
+    }
+
+    String url = getLinkForSystem(c.getSystem(), c.getVersion());
+    String name = displayCodeSource(c.getSystem(), c.getVersion());
+    if (!Utilities.noString(url)) {
+      pieces.add(gen.new Piece(url, name, c.getSystem()+(c.hasVersion() ? "#"+c.getVersion() : "")));
+    } else { 
+      pieces.add(gen.new Piece(null, name, c.getSystem()+(c.hasVersion() ? "#"+c.getVersion() : "")));
+    }
+    pieces.add(gen.new Piece(null, "#"+c.getCode(), null));
+    String s = c.getDisplay();
+    if (Utilities.noString(s)) {
+      s = lookupCode(c.getSystem(), c.getVersion(), c.getCode());
+    }
+    if (!Utilities.noString(s)) {
+      pieces.add(gen.new Piece(null, " \""+s+"\"", null));
+    }
+  }
+  
+  private String getLinkForSystem(String system, String version) {
+    if ("http://snomed.info/sct".equals(system)) {
+      return "https://browser.ihtsdotools.org/";      
+    } else if ("http://loinc.org".equals(system)) {
+      return "https://loinc.org/";            
+    } else if ("http://unitsofmeasure.org".equals(system)) {
+      return "http://ucum.org";            
+    } else {
+      String url = system;
+      if (version != null) {
+        url = url + "|"+version;
+      }
+      CodeSystem cs = context.getWorker().fetchCodeSystem(url);
+      if (cs != null && cs.hasUserData("path")) {
+        return cs.getUserString("path");
+      }
+      return null;
+    }
+  }
+  
   protected void renderCodingWithDetails(XhtmlNode x, Coding c) {
     String s = "";
     if (c.hasDisplayElement())
@@ -512,7 +651,11 @@ public class DataRenderer extends Renderer {
 
     String sn = describeSystem(c.getSystem());
     if ("http://snomed.info/sct".equals(c.getSystem())) {
-      x.ah("https://browser.ihtsdotools.org/").tx(sn);      
+      if (c.hasCode()) {
+        x.ah("http://snomed.info/id/"+c.getCode()).tx(sn);        
+      } else {
+        x.ah("https://browser.ihtsdotools.org/").tx(sn);
+      }
     } else if ("http://loinc.org".equals(c.getSystem())) {
       x.ah("https://loinc.org/").tx(sn);            
     } else {
@@ -627,16 +770,27 @@ public class DataRenderer extends Renderer {
 
     if (showCodeDetails) {
       x.addText(s+" ");
-      XhtmlNode sp = x.span("background: LightGoldenRodYellow", null);
-      sp.tx("(Details ");
+      XhtmlNode sp = x.span("background: LightGoldenRodYellow; margin: 4px; border: 1px solid khaki", null);
+      sp.tx(" (");
       boolean first = true;
       for (Coding c : cc.getCoding()) {
         if (first) {
-          sp.tx(": ");
           first = false;
-        } else
+        } else {
           sp.tx("; ");
-        sp.tx("{"+TerminologyRenderer.describeSystem(c.getSystem())+" code '"+c.getCode()+"' = '"+lookupCode(c.getSystem(), c.getVersion(), c.getCode())+(c.hasDisplay() ? "', given as '"+c.getDisplay()+"'}" : ""));
+        }
+        String url = getLinkForSystem(c.getSystem(), c.getVersion());
+        if (url != null) {
+          sp.ah(url).tx(displayCodeSource(c.getSystem(), c.getVersion()));
+        } else {
+          sp.tx(displayCodeSource(c.getSystem(), c.getVersion()));
+        }
+        if (c.hasCode()) {
+          sp.tx("#"+c.getCode());
+        }
+        if (c.hasDisplay() && !s.equals(c.getDisplay())) {
+          sp.tx(" \""+c.getDisplay()+"\"");
+        }
       }
       sp.tx(")");
     } else {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java
index 6eb2606ef..2788fe78d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java
@@ -104,6 +104,9 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
     if (context.isAddGeneratedNarrativeHeader()) {
       x.para().b().tx("Generated Narrative");
     }
+    if (context.isTechnicalMode()) {
+      renderResourceHeader(r, x);
+    }
     try {
       StructureDefinition sd = r.getDefinition();
       if (sd == null) {
@@ -112,7 +115,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
         ElementDefinition ed = sd.getSnapshot().getElement().get(0);
         containedIds.clear();
         hasExtensions = false;
-        generateByProfile(r, sd, r.root(), sd.getSnapshot().getElement(), ed, context.getProfileUtilities().getChildList(sd, ed), x, r.fhirType(), false, 0);
+        generateByProfile(r, sd, r.root(), sd.getSnapshot().getElement(), ed, context.getProfileUtilities().getChildList(sd, ed), x, r.fhirType(), context.isTechnicalMode(), 0);
       }
     } catch (Exception e) {
       e.printStackTrace();
@@ -121,6 +124,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
     return hasExtensions;
   }
 
+
   @Override
   public String display(Resource r) throws UnsupportedEncodingException, IOException {
     return "todo";
@@ -212,7 +216,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
 //
 
   
-  public void generateResourceSummary(XhtmlNode x, ResourceWrapper res, boolean textAlready, boolean showCodeDetails) throws FHIRException, UnsupportedEncodingException, IOException {
+  public void generateResourceSummary(XhtmlNode x, ResourceWrapper res, boolean textAlready, boolean showCodeDetails, boolean canLink) throws FHIRException, UnsupportedEncodingException, IOException {
     if (!textAlready) {
       XhtmlNode div = res.getNarrative();
       if (div != null) {
@@ -231,9 +235,9 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
       boolean firstElement = true;
       boolean last = false;
       for (PropertyWrapper p : res.children()) {
-        if (!ignoreProperty(p)) {
+        if (!ignoreProperty(p) && !p.getElementDefinition().getBase().getPath().startsWith("Resource.")) {
           ElementDefinition child = getElementDefinition(profile.getSnapshot().getElement(), path+"."+p.getName(), p);
-          if (p.getValues().size() > 0 && p.getValues().get(0) != null && child != null && isPrimitive(child) && includeInSummary(child)) {
+          if (p.getValues().size() > 0 && p.getValues().get(0) != null && child != null && isPrimitive(child) && includeInSummary(child, p.getValues())) {
             if (firstElement)
               firstElement = false;
             else if (last)
@@ -245,7 +249,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
                 first = false;
               else if (last)
                 x.tx(", ");
-              last = displayLeaf(res, v, child, x, p.getName(), showCodeDetails, false) || last;
+              last = displayLeaf(res, v, child, x, p.getName(), showCodeDetails, canLink) || last;
             }
           }
         }
@@ -258,7 +262,10 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
     return Utilities.existsInList(p.getName(), "contained");
   }
 
-  private boolean includeInSummary(ElementDefinition child) {
+  private boolean includeInSummary(ElementDefinition child, List<BaseWrapper> list) throws UnsupportedEncodingException, FHIRException, IOException {
+    if (child.getName().endsWith("active") && list != null && list.size() > 0 && "true".equals(list.get(0).getBase().primitiveValue())) {
+      return false;
+    }
     if (child.getIsModifier())
       return true;
     if (child.getMustSupport())
@@ -432,7 +439,12 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
       x.addText(name+": "+((IdType) e).getValue());
       return true;
     } else if (e instanceof UriType) {
-      x.addText(name+": "+((UriType) e).getValue());
+      if (Utilities.isAbsoluteUrlLinkable(((UriType) e).getValue()) && allowLinks) {
+        x.tx(name+": ");
+        x.ah(((UriType) e).getValue()).addText(((UriType) e).getValue());
+      } else {
+        x.addText(name+": "+((UriType) e).getValue());
+      }
       return true;
     } else if (e instanceof DateTimeType) {
       x.addText(name+": "+((DateTimeType) e).toHumanDisplay());
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
index 3bb0e805c..6a404212b 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java
@@ -325,7 +325,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer {
         if (v.getValue().isPrimitive()) {
           defn.getPieces().add(gen.new Piece(null, v.getValue().primitiveValue(), null));
         } else {
-          defn.getPieces().add(gen.new Piece(null, "{todo}", null));          
+          renderCoding(gen, defn.getPieces(), v.getValueCoding());          
         }
       }
     }
@@ -499,7 +499,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer {
         if (v.getValue().isPrimitive()) {
           defn.getPieces().add(gen.new Piece(null, v.getValue().primitiveValue(), null));
         } else {
-          defn.getPieces().add(gen.new Piece(null, "{todo}", null));          
+          renderCoding(gen, defn.getPieces(), v.getValueCoding());          
         }
       }
     }
@@ -730,7 +730,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer {
         if (v.getValue().isPrimitive()) {
           vi.tx(v.getValue().primitiveValue());
         } else {
-          vi.tx("{todo}");          
+          renderCoding(vi, v.getValueCoding(), true);           
         }
       }
     }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/Renderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/Renderer.java
index fdab9eb80..430e25359 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/Renderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/Renderer.java
@@ -33,7 +33,7 @@ public class Renderer {
   }
 
   public Renderer(IWorkerContext worker) {
-    this.context = new RenderingContext(worker, new MarkDownProcessor(Dialect.COMMON_MARK), ValidationOptions.defaults(), "http://hl7.org/fhir/R5", "", null, ResourceRendererMode.RESOURCE);
+    this.context = new RenderingContext(worker, new MarkDownProcessor(Dialect.COMMON_MARK), ValidationOptions.defaults(), "http://hl7.org/fhir/R5", "", null, ResourceRendererMode.END_USER);
   }
 
 
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
index 8ae819302..820625889 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
@@ -11,6 +11,7 @@ import org.hl7.fhir.r5.elementmodel.Element;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent;
+import org.hl7.fhir.r5.model.Coding;
 import org.hl7.fhir.r5.model.Enumerations.PublicationStatus;
 import org.hl7.fhir.r5.model.CanonicalResource;
 import org.hl7.fhir.r5.model.CodeSystem;
@@ -31,6 +32,7 @@ import org.hl7.fhir.r5.terminologies.CodeSystemUtilities;
 import org.hl7.fhir.r5.utils.EOperationOutcome;
 import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.r5.utils.XVerExtensionManager;
+import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.xhtml.NodeType;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
 
@@ -195,22 +197,37 @@ public abstract class ResourceRenderer extends DataRenderer {
     } else {
       c = x.span(null, null);
     }
-    // what to display: if text is provided, then that. if the reference was resolved, then show the generated narrative
-    if (r.hasDisplayElement()) {
-      c.addText(r.getDisplay());
-      if (tr != null && tr.getResource() != null) {
-        c.tx(". Generated Summary: ");
-        new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), true, r.getReference().startsWith("#"));
+    if (tr != null && tr.getReference() != null && tr.getReference().startsWith("#")) {
+      c.tx("See above (");
+    }
+    // what to display: if text is provided, then that. if the reference was resolved, then show the name, or the generated narrative
+    String display = r.hasDisplayElement() ? r.getDisplay() : null;
+    String name = tr != null && tr.getResource() != null ? tr.getResource().getNameFromResource() : null;
+    
+    if (display == null && (tr == null || tr.getResource() == null)) {
+      c.addText(r.getReference());
+    } else if (context.isTechnicalMode()) {
+      c.addText(r.getReference());
+      if (display != null) {
+        c.addText(": "+display);
       }
-    } else if (tr != null && tr.getResource() != null) {
-      if (tr.getReference().startsWith("#")) {
-        // we already rendered this in this page
-        c.tx("See above ("+tr.getResource().fhirType()+"/"+tr.getResource().getId()+")");
-      } else {
-        new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), r.getReference().startsWith("#"), r.getReference().startsWith("#"));
+      if ((tr == null || !tr.getReference().startsWith("#")) && name != null) {
+        x.addText(" \""+name+"\"");
       }
     } else {
-      c.addText(r.getReference());
+      if (display != null) {
+        c.addText(display);
+      } else if (name != null) {
+        c.addText(name);
+      } else {
+        c.tx(". Generated Summary: ");
+        if (tr != null) {
+          new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), true, r.getReference().startsWith("#"), true);
+        }
+      }
+    }
+    if (tr != null && tr.getReference() != null && tr.getReference().startsWith("#")) {
+      c.tx(")");
     }
   }
 
@@ -236,10 +253,10 @@ public abstract class ResourceRenderer extends DataRenderer {
       c.addText(r.get("display").primitiveValue());
       if (tr != null && tr.getResource() != null) {
         c.tx(". Generated Summary: ");
-        new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), true, v.startsWith("#"));
+        new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), true, v.startsWith("#"), false);
       }
     } else if (tr != null && tr.getResource() != null) {
-      new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), v.startsWith("#"), v.startsWith("#"));
+      new ProfileDrivenRenderer(context).generateResourceSummary(c, tr.getResource(), v.startsWith("#"), v.startsWith("#"), false);
     } else {
       c.addText(v);
     }
@@ -371,4 +388,95 @@ public abstract class ResourceRenderer extends DataRenderer {
     return true;
   }
 
+  protected void renderResourceHeader(ResourceWrapper r, XhtmlNode x) throws UnsupportedEncodingException, FHIRException, IOException {
+    XhtmlNode div = x.div().style("display: inline-block").style("background-color: #d9e0e7").style("padding: 6px")
+         .style("margin: 4px").style("border: 1px solid #8da1b4")
+         .style("border-radius: 5px").style("line-height: 60%");
+
+    String id = getPrimitiveValue(r, "id"); 
+    String lang = getPrimitiveValue(r, "language"); 
+    String ir = getPrimitiveValue(r, "implicitRules"); 
+    BaseWrapper meta = r.getChildByName("meta").hasValues() ? r.getChildByName("meta").getValues().get(0) : null;
+    String versionId = getPrimitiveValue(meta, "versionId");
+    String lastUpdated = getPrimitiveValue(meta, "lastUpdated");
+    String source = getPrimitiveValue(meta, "source");
+    
+    if (id != null || lang != null || versionId != null || lastUpdated != null) {
+      XhtmlNode p = plateStyle(div.para());
+      p.tx("Resource ");
+      if (id != null) {
+        p.tx("\""+id+"\" ");
+      }
+      if (versionId != null) {
+        p.tx("Version \""+versionId+"\" ");
+      }
+      if (lastUpdated != null) {
+        p.tx("Updated \"");
+        renderDateTime(p, lastUpdated);
+        p.tx("\" ");
+      }
+      if (lang != null) {
+        p.tx(" (Language \""+lang+"\") ");
+      }
+    }
+    if (ir != null) {
+      plateStyle(div.para()).b().tx("Special rules apply: "+ir+"!");     
+    }
+    if (source != null) {
+      plateStyle(div.para()).tx("Information Source: "+source+"!");           
+    }
+    if (meta != null) {
+      PropertyWrapper pl = meta.getChildByName("profile");
+      if (pl.hasValues()) {
+        XhtmlNode p = plateStyle(div.para());
+        p.tx(Utilities.pluralize("Profile", pl.getValues().size())+": ");
+        boolean first = true;
+        for (BaseWrapper bw : pl.getValues()) {
+          if (first) first = false; else p.tx(", ");
+          renderCanonical(r, p, bw.getBase().primitiveValue());
+        }
+      }
+      PropertyWrapper tl = meta.getChildByName("tag");
+      if (tl.hasValues()) {
+        XhtmlNode p = plateStyle(div.para());
+        p.tx(Utilities.pluralize("Tag", tl.getValues().size())+": ");
+        boolean first = true;
+        for (BaseWrapper bw : tl.getValues()) {
+          if (first) first = false; else p.tx(", ");
+          String system = getPrimitiveValue(bw, "system");
+          String version = getPrimitiveValue(bw, "version");
+          String code = getPrimitiveValue(bw, "system");
+          String display = getPrimitiveValue(bw, "system");
+          renderCoding(p, new Coding(system, version, code, display));
+        }        
+      }
+      PropertyWrapper sl = meta.getChildByName("security");
+      if (sl.hasValues()) {
+        XhtmlNode p = plateStyle(div.para());
+        p.tx(Utilities.pluralize("Security Label", tl.getValues().size())+": ");
+        boolean first = true;
+        for (BaseWrapper bw : sl.getValues()) {
+          if (first) first = false; else p.tx(", ");
+          String system = getPrimitiveValue(bw, "system");
+          String version = getPrimitiveValue(bw, "version");
+          String code = getPrimitiveValue(bw, "system");
+          String display = getPrimitiveValue(bw, "system");
+          renderCoding(p, new Coding(system, version, code, display));
+        }        
+      }
+    }
+      
+  }
+
+  private XhtmlNode plateStyle(XhtmlNode para) {
+    return para.style("margin-bottom: 0px");
+  }
+
+  private String getPrimitiveValue(BaseWrapper b, String name) throws UnsupportedEncodingException, FHIRException, IOException {
+    return b != null && b.getChildByName(name).hasValues() ? b.getChildByName(name).getValues().get(0).getBase().primitiveValue() : null;
+  }
+
+  private String getPrimitiveValue(ResourceWrapper r, String name) throws UnsupportedEncodingException, FHIRException, IOException {
+    return r.getChildByName(name).hasValues() ? r.getChildByName(name).getValues().get(0).getBase().primitiveValue() : null;
+  }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
index 816249717..507b67db8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
@@ -712,7 +712,7 @@ public class ValueSetRenderer extends TerminologyRenderer {
   public String sctLink(String code) {
 //    if (snomedEdition != null)
 //      http://browser.ihtsdotools.org/?perspective=full&conceptId1=428041000124106&edition=us-edition&release=v20180301&server=https://prod-browser-exten.ihtsdotools.org/api/snomed&langRefset=900000000000509007
-    return "http://browser.ihtsdotools.org/?perspective=full&conceptId1="+code;
+    return "http://snomed.info/id/"+code;
   }
 
   private void addRefToCode(XhtmlNode td, String target, String vslink, String code) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/BaseWrappers.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/BaseWrappers.java
index 83101e229..34dc60bfb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/BaseWrappers.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/BaseWrappers.java
@@ -55,6 +55,7 @@ public class BaseWrappers {
     public PropertyWrapper getChildByName(String tail);
     public StructureDefinition getDefinition();
     public boolean hasNarrative();
+    public String getNameFromResource();
   }
 
   public interface BaseWrapper extends WrapperBase {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DOMWrappers.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DOMWrappers.java
index 6fbb5f457..3fe565098 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DOMWrappers.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DOMWrappers.java
@@ -10,6 +10,7 @@ import org.hl7.fhir.exceptions.FHIRFormatError;
 import org.hl7.fhir.r5.formats.FormatUtilities;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.ElementDefinition;
+import org.hl7.fhir.r5.model.Property;
 import org.hl7.fhir.r5.model.Narrative.NarrativeStatus;
 import org.hl7.fhir.r5.model.StructureDefinition;
 import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind;
@@ -267,6 +268,29 @@ public class DOMWrappers {
       return wrapped.getNodeName();
     }
 
+    @Override
+    public String getNameFromResource() {
+      Element e = XMLUtil.getNamedChild(wrapped, "name");
+      if (e != null) {
+        if (e.hasAttribute("value")) {
+          return e.getAttribute("value");
+        }
+        if (XMLUtil.hasNamedChild(e, "text")) {
+          return XMLUtil.getNamedChildValue(e, "text");
+        }
+        if (XMLUtil.hasNamedChild(e, "family") || XMLUtil.hasNamedChild(e, "given")) {
+          Element family = XMLUtil.getNamedChild(e, "family");
+          Element given = XMLUtil.getNamedChild(e, "given");
+          String s = given != null && given.hasAttribute("value") ? given.getAttribute("value") : "";
+          if (family != null && family.hasAttribute("value"))
+            s = s + " " + family.getAttribute("value").toUpperCase();
+          return s;
+        }
+        return null;
+      }
+      return null;
+    }
+
     @Override
     public List<PropertyWrapper> children() {
       if (list2 == null) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DirectWrappers.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DirectWrappers.java
index 5fe4dc859..8b036031f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DirectWrappers.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/DirectWrappers.java
@@ -208,6 +208,28 @@ public class DirectWrappers {
       return wrapped.getResourceType().toString();
     }
 
+    @Override
+    public String getNameFromResource() {
+      Property name = wrapped.getChildByName("name");
+      if (name != null && name.hasValues()) {
+        Base b = name.getValues().get(0);
+        if (b.isPrimitive()) {
+          return b.primitiveValue();          
+        } else if (b.fhirType().equals("HumanName")) {
+          Property family = b.getChildByName("family");
+          Property given = wrapped.getChildByName("given");
+          String s = given != null && given.hasValues() ? given.getValues().get(0).primitiveValue() : "";
+          if (family != null && family.hasValues())
+            s = s + " " + family.getValues().get(0).primitiveValue().toUpperCase();
+          return s;
+        } else {
+          // it might be a human name?
+          throw new Error("What to do?");
+        }
+      }
+      return null;
+    }
+
     @Override
     public List<PropertyWrapper> children() {
       List<PropertyWrapper> list = new ArrayList<PropertyWrapper>();
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ElementWrappers.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ElementWrappers.java
index 470899e92..d9ab450b5 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ElementWrappers.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/ElementWrappers.java
@@ -16,6 +16,7 @@ import org.hl7.fhir.r5.elementmodel.XmlParser;
 import org.hl7.fhir.r5.formats.IParser.OutputStyle;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.ElementDefinition;
+import org.hl7.fhir.r5.model.Property;
 import org.hl7.fhir.r5.model.Narrative.NarrativeStatus;
 import org.hl7.fhir.r5.model.StringType;
 import org.hl7.fhir.r5.model.StructureDefinition;
@@ -157,6 +158,27 @@ public class ElementWrappers {
       return wrapped.getName();
     }
 
+    @Override
+    public String getNameFromResource() {
+      Property name = wrapped.getChildByName("name");
+      if (name != null && name.hasValues()) {
+        Base b = name.getValues().get(0);
+        if (b.isPrimitive()) {
+          return b.primitiveValue();          
+        } else if (b.fhirType().equals("HumanName")) {
+          Property family = b.getChildByName("family");
+          Property given = wrapped.getChildByName("given");
+          String s = given != null && given.hasValues() ? given.getValues().get(0).primitiveValue() : "";
+          if (family != null && family.hasValues())
+            s = s + " " + family.getValues().get(0).primitiveValue().toUpperCase();
+          return s;
+        } else {
+          throw new Error("Now what? ("+b.fhirType()+")");
+        }
+      }
+      return null;
+    }
+    
     @Override
     public List<PropertyWrapper> children() {
       if (list2 == null) {
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
index 02cbe2969..c18561207 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
@@ -23,20 +23,38 @@ import org.hl7.fhir.utilities.validation.ValidationOptions;
 
 public class RenderingContext {
 
+  // provides liquid templates, if they are available for the content
   public interface ILiquidTemplateProvider {
     String findTemplate(RenderingContext rcontext, DomainResource r);
     String findTemplate(RenderingContext rcontext, String resourceName);
   }
 
+  // parses xml to an XML instance. Whatever codes provides this needs to provide something that parses the right version 
   public interface ITypeParser {
     Base parseType(String xml, String type) throws FHIRFormatError, IOException, FHIRException ;
   }
 
-  public enum ResourceRendererMode{
-    RESOURCE, IG
+  /**
+   * What kind of user the renderer is targeting - end users, or technical users
+   * 
+   * This affects the way codes and references are rendered
+   * 
+   * @author graha
+   *
+   */
+  public enum ResourceRendererMode {
+    /**
+     * The user has no interest in the contents of the FHIR resource, and just wants to see the data
+     * 
+     */
+    END_USER,
+    
+    /**
+     * The user wants to see the resource, but a technical view so they can see what's going on with the content
+     */
+    TECHNICAL
   }
 
-
   public enum QuestionnaireRendererMode {
     /**
      * A visual presentation of the questionnaire, with a set of property panes that can be toggled on and off.
@@ -405,4 +423,8 @@ public class RenderingContext {
     this.targetVersion = targetVersion;
   }
 
+  public boolean isTechnicalMode() {
+    return mode == ResourceRendererMode.TECHNICAL;
+  }
+
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyCacheManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyCacheManager.java
new file mode 100644
index 000000000..ee72500ab
--- /dev/null
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyCacheManager.java
@@ -0,0 +1,165 @@
+package org.hl7.fhir.r5.terminologies;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Base64;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
+import org.hl7.fhir.utilities.IniFile;
+import org.hl7.fhir.utilities.TextFile;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.VersionUtilities;
+
+public class TerminologyCacheManager {
+
+  // if either the CACHE_VERSION of the stated maj/min server versions change, the 
+  // cache will be blown. Note that the stated terminology server version is 
+  // the CapabilityStatement.software.version 
+  private static final String CACHE_VERSION = "1";
+
+  private String cacheFolder;
+  private String version;
+  private String ghOrg;
+  private String ghRepo;
+  private String ghBranch;
+
+  public TerminologyCacheManager(String serverVersion, String rootDir, String ghOrg, String ghRepo, String ghBranch) throws IOException {
+    super();
+    //    this.rootDir = rootDir;
+    this.ghOrg = ghOrg;
+    this.ghRepo = ghRepo;
+    this.ghBranch = ghBranch;
+
+    version = CACHE_VERSION+"/"+VersionUtilities.getMajMin(serverVersion);
+
+    if (Utilities.noString(ghOrg) || Utilities.noString(ghRepo) || Utilities.noString(ghBranch)) {
+      cacheFolder = Utilities.path(rootDir, "temp", "tx-cache");
+    } else {
+      cacheFolder = Utilities.path(System.getProperty("user.home"), ".fhir", "tx-cache", ghOrg, ghRepo, ghBranch);
+    }
+  }
+
+  public void initialize() throws IOException {
+    File f = new File(cacheFolder);
+    if (!f.exists()) {
+      Utilities.createDirectory(cacheFolder);      
+    }
+    if (!version.equals(getCacheVersion())) {
+      clearCache();
+      fillCache("http://tx.fhir.org/tx-cache/"+ghOrg+"/"+ghRepo+"/"+ghBranch+".zip");
+    }
+    if (!version.equals(getCacheVersion())) {
+      clearCache();
+      fillCache("http://tx.fhir.org/tx-cache/"+ghOrg+"/"+ghRepo+"/default.zip");
+    }
+    if (!version.equals(getCacheVersion())) {
+      clearCache();
+    }
+
+    IniFile ini = new IniFile(Utilities.path(cacheFolder, "cache.ini"));
+    ini.setStringProperty("version", "version", version, null);
+    ini.save();
+  }
+
+  private void fillCache(String source) throws IOException {
+    try {
+      System.out.println("Initialise terminology cache from "+source);
+
+      SimpleHTTPClient http = new SimpleHTTPClient();
+      HTTPResult res = http.get(source+"?nocache=" + System.currentTimeMillis());
+      res.checkThrowException();
+      unzip(new ByteArrayInputStream(res.getContent()), cacheFolder);
+    } catch (Exception e) {
+      System.out.println("No - can't initialise cache from "+source+": "+e.getMessage());
+    }
+  }
+
+  public static void unzip(InputStream is, String targetDir) throws IOException {
+    try (ZipInputStream zipIn = new ZipInputStream(is)) {
+      for (ZipEntry ze; (ze = zipIn.getNextEntry()) != null; ) {
+        String path = Utilities.path(targetDir, ze.getName());
+        if (!path.startsWith(targetDir)) {
+          // see: https://snyk.io/research/zip-slip-vulnerability
+          throw new RuntimeException("Entry with an illegal path: " + ze.getName());
+        }
+        if (ze.isDirectory()) {
+          Utilities.createDirectory(path);
+        } else {
+          Utilities.createDirectory(Utilities.getDirectoryForFile(path));
+          TextFile.streamToFile(zipIn, path);
+        }
+      }
+    }
+  }
+
+  private void clearCache() throws IOException {
+    Utilities.clearDirectory(cacheFolder);    
+  }
+
+  private String getCacheVersion() throws IOException {
+    IniFile ini = new IniFile(Utilities.path(cacheFolder, "cache.ini"));
+    return ini.getStringProperty("version", "version");
+  }
+
+  public String getFolder() {
+    return cacheFolder;
+  }
+
+  private void zipDirectory(OutputStream outputStream) throws IOException {
+    try (ZipOutputStream zs = new ZipOutputStream(outputStream)) {
+      Path pp = Paths.get(cacheFolder);
+      Files.walk(pp)
+      .forEach(path -> {
+        try {
+          if (Files.isDirectory(path)) {
+            zs.putNextEntry(new ZipEntry(pp.relativize(path).toString() + "/"));
+          } else {
+            ZipEntry zipEntry = new ZipEntry(pp.relativize(path).toString());
+            zs.putNextEntry(zipEntry);
+            Files.copy(path, zs);
+            zs.closeEntry();
+          }
+        } catch (IOException e) {
+          System.err.println(e);
+        }
+      });
+    }
+  }
+
+  
+  public void commit(String token) throws IOException {
+    // create a zip of all the files 
+    ByteArrayOutputStream bs = new ByteArrayOutputStream();
+    zipDirectory(bs);
+
+    // post it to
+    String url = "https://tx.fhir.org/post/tx-cache/"+ghOrg+"/"+ghRepo+"/"+ghBranch+".zip";
+    System.out.println("Sending tx-cache to "+url+" ("+Utilities.describeSize(bs.toByteArray().length)+")");
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.put(url, "application/zip", bs.toByteArray(), null); // accept doesn't matter
+    if (res.getCode() >= 300) {
+      System.out.println("sending cache failed: "+res.getCode());
+    } else {
+      System.out.println("Sent cache");      
+    }
+  }
+
+}
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java
index 2d4c4f291..18891abd1 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java
@@ -40,6 +40,7 @@ import java.util.Map;
 public interface TerminologyClient {
 
   String getAddress();
+  String getServerVersion();
   TerminologyCapabilities getTerminologyCapabilities() throws FHIRException;
   ValueSet expandValueset(ValueSet vs, Parameters p, Map<String, String> params) throws FHIRException;
   Parameters validateCS(Parameters pin) throws FHIRException;
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
index 64a9890fb..6ddc0c527 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
@@ -43,7 +43,7 @@ public class XVerExtensionManager {
   public XVerExtensionStatus status(String url) throws FHIRException {
     String v = url.substring(20, 23);
     if ("5.0".equals(v)) {
-      v = "4.5"; // for now
+      v = "4.6"; // for now
     }
     String e = url.substring(54);
     if (!lists.containsKey(v)) {
@@ -76,7 +76,7 @@ public class XVerExtensionManager {
   public StructureDefinition makeDefinition(String url) {
     String verSource = url.substring(20, 23);
     if ("5.0".equals(verSource)) {
-      verSource = "4.5"; // for now
+      verSource = "4.6"; // for now
     }
     String verTarget = VersionUtilities.getMajMin(context.getVersion());
     String e = url.substring(54);
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java
index 9369070ed..3fa633dc1 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java
@@ -581,6 +581,10 @@ public class FHIRToolingClient {
   public void setUserAgent(String userAgent) {
     this.userAgent = userAgent;
   }
+
+  public String getServerVersion() {
+    return capabilities == null ? null : capabilities.getSoftware().getVersion();
+  }
   
   
 }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/Client.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/Client.java
index 45a71b77b..02c18b66f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/Client.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/network/Client.java
@@ -23,6 +23,7 @@ public class Client {
   private FhirLoggingInterceptor fhirLoggingInterceptor;
   private int retryCount;
   private long timeout = DEFAULT_TIMEOUT;
+  private byte[] payload;
 
   public ToolingClientLogger getLogger() {
     return logger;
@@ -53,6 +54,7 @@ public class Client {
                                                                      String resourceFormat,
                                                                      String message,
                                                                      long timeout) throws IOException {
+    this.payload = null;
     Request.Builder request = new Request.Builder()
       .method("OPTIONS", null)
       .url(optionsUri.toURL());
@@ -65,6 +67,7 @@ public class Client {
                                                                          Headers headers,
                                                                          String message,
                                                                          long timeout) throws IOException {
+    this.payload = null;
     Request.Builder request = new Request.Builder()
       .url(resourceUri.toURL());
 
@@ -89,6 +92,7 @@ public class Client {
                                                                  String message,
                                                                  long timeout) throws IOException {
     if (payload == null) throw new EFhirClientException("PUT requests require a non-null payload");
+    this.payload = payload;
     RequestBody body = RequestBody.create(payload);
     Request.Builder request = new Request.Builder()
       .url(resourceUri.toURL())
@@ -112,6 +116,7 @@ public class Client {
                                                                   String message,
                                                                   long timeout) throws IOException {
     if (payload == null) throw new EFhirClientException("POST requests require a non-null payload");
+    this.payload = payload;
     RequestBody body = RequestBody.create(MediaType.parse(resourceFormat + ";charset=" + DEFAULT_CHARSET), payload);
     Request.Builder request = new Request.Builder()
       .url(resourceUri.toURL())
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
index 7c5b733dc..3547785e7 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGenerationTests.java
@@ -127,7 +127,7 @@ public class NarrativeGenerationTests {
   @ParameterizedTest(name = "{index}: file {0}")
   @MethodSource("data")
   public void test(String id, TestDetails test) throws Exception {
-    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
     rc.setDestDir("");
     rc.setHeader(test.isHeader());
     rc.setDefinitionsTarget("test.html");
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
index e152d0b87..cdc8c5c6b 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/NarrativeGeneratorTests.java
@@ -24,7 +24,7 @@ public class NarrativeGeneratorTests {
 
   @BeforeAll
   public static void setUp() throws FHIRException {
-    rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+    rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
   }
 
   @Test
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
index f9c5cb06e..a3620607b 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ResourceRoundTripTests.java
@@ -35,7 +35,7 @@ public class ResourceRoundTripTests {
   @Test
   public void test() throws IOException, FHIRException, EOperationOutcome {
     DomainResource res = (DomainResource) new XmlParser().parse(TestingUtilities.loadTestResourceStream("r5", "unicode.xml"));
-    RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
     RendererFactory.factory(res, rc).render(res);
     IOUtils.copy(TestingUtilities.loadTestResourceStream("r5", "unicode.xml"), new FileOutputStream(TestingUtilities.tempFile("gen", "unicode.xml")));
     new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(TestingUtilities.tempFile("gen", "unicode.out.xml")), res);
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
index cb3165bfe..066edc1bd 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/SnapShotGenerationTests.java
@@ -42,6 +42,7 @@ import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext;
 import org.hl7.fhir.r5.utils.IResourceValidator;
 import org.hl7.fhir.r5.utils.XVerExtensionManager;
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -546,8 +547,8 @@ public class SnapShotGenerationTests {
     pu.setThrowException(false);
     pu.setDebug(test.isDebug());
     pu.setIds(test.getSource(), false);
-    if (!TestingUtilities.context().hasPackage("hl7.fhir.xver-extensions", "0.0.4")) {
-      NpmPackage npm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage("hl7.fhir.xver-extensions", "0.0.4");
+    if (!TestingUtilities.context().hasPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER)) {
+      NpmPackage npm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER);
       TestingUtilities.context().loadFromPackage(npm, new TestLoader(new String[]{"StructureDefinition"}), new String[]{"StructureDefinition"});
     }
     pu.setXver(new XVerExtensionManager(TestingUtilities.context()));
@@ -575,7 +576,7 @@ public class SnapShotGenerationTests {
       throw e;
     }
     if (output.getDifferential().hasElement()) {
-      RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+      RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
       rc.setDestDir(Utilities.path("[tmp]", "snapshot"));
       rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.context(), null, new TestPKP()));
       RendererFactory.factory(output, rc).render(output);
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index f725b97a3..d398ec5f5 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -86,12 +86,14 @@
             <version>${validator_test_case_version}</version>
             <scope>test</scope>
         </dependency>
+        <!--
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
             <version>4.9.0</version>
             <scope>compile</scope>
         </dependency>
+        -->
     </dependencies>
 
     <build>
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
new file mode 100644
index 000000000..318affc26
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/SimpleHTTPClient.java
@@ -0,0 +1,201 @@
+package org.hl7.fhir.utilities;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
+import org.hl7.fhir.utilities.SimpleHTTPClient.Header;
+import org.hl7.fhir.utilities.npm.SSLCertTruster;
+
+public class SimpleHTTPClient {
+  
+  public class Header {
+    private String name;
+    private String value;
+    public Header(String name, String value) {
+      super();
+      this.name = name;
+      this.value = value;
+    }
+    public String getName() {
+      return name;
+    }
+    public String getValue() {
+      return value;
+    }
+  }
+
+  private static final int MAX_REDIRECTS = 5;
+
+  public class HTTPResult {
+    private int code;
+    private String contentType;
+    private byte[] content;
+    private String source;
+    
+    
+    public HTTPResult(String source, int code, String contentType, byte[] content) {
+      super();
+      this.source = source;
+      this.code = code;
+      this.contentType = contentType;
+      this.content = content;
+    }
+    
+    public int getCode() {
+      return code;
+    }
+    public String getContentType() {
+      return contentType;
+    }
+    public byte[] getContent() {
+      return content;
+    }
+
+    public String getSource() {
+      return source;
+    }
+
+    public void checkThrowException() throws IOException {
+      if (code >= 300) {
+        throw new IOException("Invalid HTTP response "+code+" from "+source);
+      }      
+    }    
+  }
+
+  private List<Header> headers = new ArrayList<>();
+  private String username;
+  private String password;
+  
+  public void addHeader(String name, String value) {
+    headers.add(new Header(name, value));
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  private boolean trustAll = false;
+  
+  public void trustAllhosts() {
+    trustAll  = true;
+    SSLCertTruster.trustAllHosts();    
+  }
+ 
+  public HTTPResult get(String url) throws IOException {
+    return get(url, null);    
+  }
+  
+  public HTTPResult get(String url, String accept) throws IOException {
+    URL u = new URL(url);
+    boolean isSSL = url.startsWith("https://");
+    
+    // handling redirects - setInstanceFollowRedirects(true) doesn't handle crossing http to https
+
+    Map<String, Integer> visited = new HashMap<>();
+    HttpURLConnection c = null;
+    boolean done = false;
+
+    while (!done) {
+      int times = visited.compute(url, (key, count) -> count == null ? 1 : count + 1);
+      if (times > MAX_REDIRECTS)
+        throw new IOException("Stuck in redirect loop");
+
+      u = new URL(url);
+      c = (HttpURLConnection) u.openConnection();
+      c.setRequestMethod("GET");
+      c.setRequestProperty("Accept", accept);
+      setHeaders(c);
+      c.setInstanceFollowRedirects(false); 
+      if (trustAll && url.startsWith("https://")) {
+        ((javax.net.ssl.HttpsURLConnection) c).setHostnameVerifier(SSLCertTruster.DO_NOT_VERIFY);
+      }
+
+      switch (c.getResponseCode()) {
+      case HttpURLConnection.HTTP_MOVED_PERM:
+      case HttpURLConnection.HTTP_MOVED_TEMP:
+        String location = c.getHeaderField("Location");
+        location = URLDecoder.decode(location, "UTF-8");
+        URL base = new URL(url);               
+        URL next = new URL(base, location);  // Deal with relative URLs
+        url      = next.toExternalForm();
+        continue;
+      default:
+        done = true;
+      }
+    }
+    
+    return new HTTPResult(url, c.getResponseCode(),  c.getRequestProperty("Content-Type"), TextFile.streamToBytes(c.getInputStream()));
+  }
+
+  private void setHeaders(HttpURLConnection c) {
+    for (Header h : headers) {
+      c.setRequestProperty(h.getName(), h.getValue());        
+    }
+    c.setConnectTimeout(15000);
+    c.setReadTimeout(15000);
+    if (username != null) {
+      String auth = username+":"+password;
+      byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(StandardCharsets.UTF_8));
+      String authHeaderValue = "Basic " + new String(encodedAuth);
+      c.setRequestProperty("Authorization", authHeaderValue);
+    }
+  }
+
+  public HTTPResult post(String url, String contentType, byte[] content, String accept) throws IOException {
+    URL u = new URL(url);
+    HttpURLConnection c = (HttpURLConnection) u.openConnection();
+    c.setDoOutput(true);
+    c.setDoInput(true);
+    c.setRequestMethod("POST");
+    c.setRequestProperty("Content-type", contentType);
+    if (accept != null) {
+      c.setRequestProperty("Accept", accept);
+    }
+    setHeaders(c);
+    c.getOutputStream().write(content);
+    c.getOutputStream().close();    
+    return new HTTPResult(url, c.getResponseCode(),  c.getRequestProperty("Content-Type"), TextFile.streamToBytes(c.getInputStream()));
+  }
+
+ 
+  public HTTPResult put(String url, String contentType, byte[] content, String accept) throws IOException {
+    URL u = new URL(url);
+    HttpURLConnection c = (HttpURLConnection) u.openConnection();
+    c.setDoOutput(true);
+    c.setDoInput(true);
+    c.setRequestMethod("PUT");
+    c.setRequestProperty("Content-type", contentType);
+    if (accept != null) {
+      c.setRequestProperty("Accept", accept);
+    }
+    setHeaders(c);
+    c.getOutputStream().write(content);
+    c.getOutputStream().close();    
+    return new HTTPResult(url, c.getResponseCode(),  c.getRequestProperty("Content-Type"), TextFile.streamToBytes(c.getInputStream()));
+  }
+
+
+}
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
index 1237d0157..80b48d90d 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
@@ -1501,5 +1501,14 @@ public class Utilities {
     return oid.matches(OID_REGEX);
   }
 
+  public static int findinList(String[] list, String val) {
+    for (int i = 0; i < list.length; i++) {
+      if (val.equals(list[i])) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
 
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JSONUtil.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JSONUtil.java
index c2ca45f2d..99e7fc77b 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JSONUtil.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JSONUtil.java
@@ -1,9 +1,7 @@
 package org.hl7.fhir.utilities.json;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -134,12 +132,6 @@ public class JSONUtil {
     }
   }
 
-  public static JsonObject fetchJson(String source) throws IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    return (JsonObject) new com.google.gson.JsonParser().parse(TextFile.streamToString(c.getInputStream()));
-  }
-
   public static String type(JsonElement e) {
     if (e == null) {
       return "(null)";
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java
index 6aed2851a..6fba41e07 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java
@@ -36,12 +36,12 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Stack;
 
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 
@@ -663,7 +663,7 @@ public class JsonTrackingParser {
     String jcnt = gson.toJson(json);
     TextFile.stringToFile(jcnt, file);    
   }
-  
+    
   public static void write(JsonObject json, String fileName) throws IOException {
     Gson gson = new GsonBuilder().setPrettyPrinting().create();
     String jcnt = gson.toJson(json);
@@ -675,6 +675,11 @@ public class JsonTrackingParser {
     return gson.toJson(json);    
   }
 
+  public static String writeDense(JsonObject json) {
+    Gson gson = new GsonBuilder().create();
+    return gson.toJson(json);    
+  }
+
   public static byte[] writeBytes(JsonObject json, boolean pretty) {
     if (pretty) {
       Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -686,10 +691,10 @@ public class JsonTrackingParser {
   }
   
   public static JsonObject fetchJson(String source) throws IOException {
-    URL url = new URL(source+"?nocache=" + System.currentTimeMillis());
-    HttpURLConnection c = (HttpURLConnection) url.openConnection();
-    c.setInstanceFollowRedirects(true);
-    return parseJson(c.getInputStream());
+    SimpleHTTPClient fetcher = new SimpleHTTPClient();
+    HTTPResult res = fetcher.get(source+"?nocache=" + System.currentTimeMillis());
+    res.checkThrowException();
+    return parseJson(res.getContent());
   }
   
 	
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java
new file mode 100644
index 000000000..b65e206e7
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java
@@ -0,0 +1,11 @@
+package org.hl7.fhir.utilities.npm;
+
+public class CommonPackages {
+
+  public static final String ID_XVER = "hl7.fhir.xver-extensions";
+  public static final String VER_XVER = "0.0.7";
+  
+  public static final String ID_PUBPACK = "hl7.fhir.pubpack";
+  public static final String VER_PUBPACK = "0.0.9";
+
+}
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java
index 750e6cbb6..c282ceea7 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java
@@ -36,6 +36,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.apache.commons.io.FileUtils;
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.IniFile;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
@@ -47,6 +49,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.*;
+
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -54,7 +58,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.sql.Timestamp;
@@ -146,12 +149,6 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
     return pi;
   }
 
-  private JsonObject fetchJson(String source) throws IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    return (JsonObject) new com.google.gson.JsonParser().parse(TextFile.streamToString(c.getInputStream()));
-  }
-
   private void clearCache() throws IOException {
     for (File f : new File(cacheFolder).listFiles()) {
       if (f.isDirectory()) {
@@ -229,7 +226,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
   public String getLatestVersion(String id) throws IOException {
     for (String nextPackageServer : getPackageServers()) {
       // special case:
-      if (!("hl7.fhir.pubpack".equals(id) && PRIMARY_SERVER.equals(nextPackageServer))) {
+      if (!(CommonPackages.ID_PUBPACK.equals(id) && PRIMARY_SERVER.equals(nextPackageServer))) {
         CachingPackageClient pc = new CachingPackageClient(nextPackageServer);
         try {
           return pc.getLatestVersion(id);
@@ -517,9 +514,10 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
 
   private InputStream fetchFromUrlSpecific(String source, boolean optional) throws FHIRException {
     try {
-      URL url = new URL(source);
-      URLConnection c = url.openConnection();
-      return c.getInputStream();
+      SimpleHTTPClient http = new SimpleHTTPClient();
+      HTTPResult res = http.get(source);
+      res.checkThrowException();
+      return new ByteArrayInputStream(res.getContent());
     } catch (Exception e) {
       if (optional)
         return null;
@@ -627,7 +625,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
     // special case: current versions roll over, and we have to check their currency
     try {
       String url = ciList.get(id);
-      JsonObject json = fetchJson(Utilities.pathURL(url, "package.manifest.json"));
+      JsonObject json = JsonTrackingParser.fetchJson(Utilities.pathURL(url, "package.manifest.json"));
       String currDate = JSONUtil.str(json, "date");
       String packDate = p.date();
       if (!currDate.equals(packDate))
@@ -651,13 +649,12 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
   }
 
   private void loadFromBuildServer() throws IOException {
-    URL url = new URL("https://build.fhir.org/ig/qas.json?nocache=" + System.currentTimeMillis());
-    SSLCertTruster.trustAllHosts();
-    HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-    connection.setHostnameVerifier(SSLCertTruster.DO_NOT_VERIFY);
-    connection.setRequestMethod("GET");
-    InputStream json = connection.getInputStream();
-    buildInfo = (JsonArray) new com.google.gson.JsonParser().parse(TextFile.streamToString(json));
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    http.trustAllhosts();
+    HTTPResult res = http.get("https://build.fhir.org/ig/qas.json?nocache=" + System.currentTimeMillis());
+    res.checkThrowException();
+    TextFile.bytesToFile(res.getContent(), "c:\\temp\\qa.json");
+    buildInfo = (JsonArray) new com.google.gson.JsonParser().parse(TextFile.bytesToString(res.getContent()));
 
     List<BuildRecord> builds = new ArrayList<>();
 
@@ -714,7 +711,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
     String aurl = pu;
     JsonObject json;
     try {
-      json = fetchJson(pu);
+      json = JsonTrackingParser.fetchJson(pu);
     } catch (Exception e) {
       String pv = Utilities.pathURL(url, v, "package.tgz");
       try {
@@ -755,7 +752,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
       throw new FHIRException("Unable to resolve package id " + id);
     }
     String pu = Utilities.pathURL(url, "package-list.json");
-    JsonObject json = fetchJson(pu);
+    JsonObject json = JsonTrackingParser.fetchJson(pu);
     if (!id.equals(JSONUtil.str(json, "package-id")))
       throw new FHIRException("Package ids do not match in " + pu + ": " + id + " vs " + JSONUtil.str(json, "package-id"));
     for (JsonElement e : json.getAsJsonArray("list")) {
@@ -769,7 +766,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
   }
 
   private String getUrlForPackage(String id) {
-    if ("hl7.fhir.xver-extensions".equals(id)) {
+    if (CommonPackages.ID_XVER.equals(id)) {
       return "http://fhir.org/packages/hl7.fhir.xver-extensions";
     }
     return null;
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java
index e377232f2..8d974c6be 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/NpmPackage.java
@@ -727,16 +727,19 @@ public class NpmPackage {
     if ("hl7.fhir.core".equals(JSONUtil.str(npm, "name")))
       return JSONUtil.str(npm, "version");
     else if (JSONUtil.str(npm, "name").startsWith("hl7.fhir.r2.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r2b.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r3.") || 
-          JSONUtil.str(npm, "name").startsWith("hl7.fhir.r4.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r4b.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r5."))
+        JSONUtil.str(npm, "name").startsWith("hl7.fhir.r4.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r4b.") || JSONUtil.str(npm, "name").startsWith("hl7.fhir.r5."))
       return JSONUtil.str(npm, "version");
-    else {        
-      JsonObject dep = npm.getAsJsonObject("dependencies");
-      if (dep != null) {
-        for (Entry<String, JsonElement> e : dep.entrySet()) {
-          if (Utilities.existsInList(e.getKey(), "hl7.fhir.r2.core", "hl7.fhir.r2b.core", "hl7.fhir.r3.core", "hl7.fhir.r4.core"))
-            return e.getValue().getAsString();
-          if (Utilities.existsInList(e.getKey(), "hl7.fhir.core")) // while all packages are updated
-            return e.getValue().getAsString();
+    else {
+      JsonObject dep = null;
+      if (npm.has("dependencies") && npm.get("dependencies").isJsonObject()) {
+        dep = npm.getAsJsonObject("dependencies");
+        if (dep != null) {
+          for (Entry<String, JsonElement> e : dep.entrySet()) {
+            if (Utilities.existsInList(e.getKey(), "hl7.fhir.r2.core", "hl7.fhir.r2b.core", "hl7.fhir.r3.core", "hl7.fhir.r4.core"))
+              return e.getValue().getAsString();
+            if (Utilities.existsInList(e.getKey(), "hl7.fhir.core")) // while all packages are updated
+              return e.getValue().getAsString();
+          }
         }
       }
       if (npm.has("fhirVersions")) {
@@ -955,8 +958,13 @@ public class NpmPackage {
   public String fhirVersionList() {
     if (npm.has("fhirVersions")) {
       CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
-      for (JsonElement n : npm.getAsJsonArray("fhirVersions")) {
-        b.append(n.getAsString());
+      if (npm.get("fhirVersions").isJsonArray()) {
+        for (JsonElement n : npm.getAsJsonArray("fhirVersions")) {
+          b.append(n.getAsString());
+        }
+      }
+      if (npm.get("fhirVersions").isJsonPrimitive()) {
+        b.append(npm.get("fhirVersions").getAsString());
       }
       return b.toString();
     } else
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
index 131a0a4e9..cf97aae8f 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageClient.java
@@ -4,17 +4,19 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
 import org.hl7.fhir.utilities.json.JSONUtil;
 import org.hl7.fhir.utilities.json.JsonTrackingParser;
 
+import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -135,12 +137,10 @@ public class PackageClient {
   }
  
   private InputStream fetchUrl(String source, String accept) throws IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    if (accept != null) {
-      c.setRequestProperty("accept", accept);
-    }
-    return c.getInputStream();
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(source, accept);
+    res.checkThrowException();
+    return new ByteArrayInputStream(res.getContent());
   }
   
   private JsonObject fetchJson(String source) throws IOException {
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java
new file mode 100644
index 000000000..12235b514
--- /dev/null
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageScanner.java
@@ -0,0 +1,75 @@
+package org.hl7.fhir.utilities.npm;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.hl7.fhir.utilities.TextFile;
+import org.hl7.fhir.utilities.json.JSONUtil;
+import org.hl7.fhir.utilities.json.JsonTrackingParser;
+
+import com.google.gson.JsonObject;
+
+public class PackageScanner {
+
+  
+  public static void main(String[] args) throws IOException {
+    List<String> output = new ArrayList<>();
+    Set<String> packages = new HashSet<>();
+
+    processServer("http://packages.fhir.org", output, packages);
+    processServer("http://packages2.fhir.org/packages", output, packages);
+    
+    StringBuilder b = new StringBuilder();
+    for (String s : output) {
+      b.append(s);
+      b.append("\r\n");
+      System.out.println(s);
+    }
+    TextFile.stringToFile(b.toString(), "c:\\temp\\packages.csv");
+  }
+
+  public static void processServer(String server, List<String> output, Set<String> packages) throws IOException {
+    System.out.println("Server: "+server);
+    PackageClient client = new PackageClient(server);
+    List<PackageInfo> list = client.search(null, null, null, false);
+    output.add("id\tversion\tcanonica\tfhir version\tfhir-versions\tkind\ttype\tsource");
+    for (PackageInfo pi : list) {
+      System.out.print("  fetch: "+pi.getId());
+      List<PackageInfo> versions = null;
+      while (versions == null) {
+        System.out.print("-");
+        try {
+          versions = client.getVersions(pi.getId());
+        } catch (Exception e) {
+          // nothing
+        }
+      }
+      for (PackageInfo piv : versions) {
+        if (!packages.contains(pi.getId()+"#"+piv.getVersion())) {
+          packages.add(pi.getId()+"#"+piv.getVersion());
+          try {
+            System.out.print(".");
+            InputStream cnt = client.fetch(pi.getId(), piv.getVersion());
+            NpmPackage pck = NpmPackage.fromPackage(cnt);
+            JsonObject json = pck.getNpm();
+            String fv;
+            try {
+              fv = pck.fhirVersion();
+            } catch (Exception e) {
+              fv = "--";
+            }
+            output.add(pck.name()+"\t"+pck.version()+"\t"+pck.canonical()+"\t"+fv+'\t'+pck.fhirVersionList()+'\t'+JSONUtil.str(json, "kind")+'\t'+JSONUtil.str(json, "type")+'\t'+JsonTrackingParser.writeDense(json));          } catch (Exception e) {
+            System.out.println("Error acessing "+pi.getId()+"#"+piv.getVersion()+": "+e.getMessage());
+            e.printStackTrace();
+          }
+        }
+      }
+      System.out.println("!");
+    }
+  }
+
+}
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/SSLCertTruster.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/SSLCertTruster.java
index 3a147d703..fcd8f9c1e 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/SSLCertTruster.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/SSLCertTruster.java
@@ -13,7 +13,7 @@ import java.security.cert.X509Certificate;
 public class SSLCertTruster {
 
   // always verify the host - dont check for certificate
-  final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
+  public final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
     public boolean verify(String hostname, SSLSession session) {
       return true;
     }
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
index 6fabdd35c..c18d55df6 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
@@ -3,19 +3,19 @@ package org.hl7.fhir.utilities.xhtml;
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
-  
+
   Redistribution and use in source and binary forms, with or without modification, 
   are permitted provided that the following conditions are met:
-    
-   * Redistributions of source code must retain the above copyright notice, this 
+
+ * Redistributions of source code must retain the above copyright notice, this 
      list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright notice, 
+ * Redistributions in binary form must reproduce the above copyright notice, 
      this list of conditions and the following disclaimer in the documentation 
      and/or other materials provided with the distribution.
-   * Neither the name of HL7 nor the names of its contributors may be used to 
+ * Neither the name of HL7 nor the names of its contributors may be used to 
      endorse or promote products derived from this software without specific 
      prior written permission.
-  
+
   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
@@ -26,7 +26,7 @@ package org.hl7.fhir.utilities.xhtml;
   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
   POSSIBILITY OF SUCH DAMAGE.
-  
+
  */
 
 
@@ -116,148 +116,150 @@ public class XhtmlParser {
     public String toString() {
       return ns+"::"+name;
     }
-    
+
   }
 
   private Set<String> elements = new HashSet<String>();
   private Set<String> attributes = new HashSet<String>();  
   private Map<String, String> entities = new HashMap<>();
-  
-  
+
+
   public XhtmlParser() {
-  super();
-  policy = ParserSecurityPolicy.Accept; // for general parsing
-  
-  // set up sets
-  elements.add("p");
-  elements.add("br");
-  elements.add("div");
-  elements.add("h1");
-  elements.add("h2");
-  elements.add("h3");
-  elements.add("h4");
-  elements.add("h5");
-  elements.add("h6");
-  elements.add("a");
-  elements.add("span");
-  elements.add("b");
-  elements.add("em");
-  elements.add("i");
-  elements.add("strong");
-  elements.add("small");
-  elements.add("big");
-  elements.add("tt");
-  elements.add("small");
-  elements.add("dfn");
-  elements.add("q");
-  elements.add("var");
-  elements.add("abbr");
-  elements.add("acronym");
-  elements.add("cite");
-  elements.add("blockquote");
-  elements.add("hr");
-  elements.add("address");
-  elements.add("bdo");
-  elements.add("kbd");
-  elements.add("q");
-  elements.add("sub");
-  elements.add("sup");
-  elements.add("ul");
-  elements.add("ol");
-  elements.add("li");
-  elements.add("dl");
-  elements.add("dt");
-  elements.add("dd");
-  elements.add("pre");
-  elements.add("table");
-  elements.add("caption");
-  elements.add("colgroup");
-  elements.add("col");
-  elements.add("thead");
-  elements.add("tr");
-  elements.add("tfoot");
-  elements.add("tbody");
-  elements.add("th");
-  elements.add("td");
-  elements.add("code");
-  elements.add("samp");
-  elements.add("img");
-  elements.add("map");
-  elements.add("area");
-  
-  attributes.add("title");
-  attributes.add("style");
-  attributes.add("class");
-  attributes.add("id");
-  attributes.add("lang");
-  attributes.add("xml:lang");
-  attributes.add("dir");
-  attributes.add("accesskey");
-  attributes.add("tabindex");
+    super();
+    policy = ParserSecurityPolicy.Accept; // for general parsing
+
+    // set up sets
+    elements.add("p");
+    elements.add("br");
+    elements.add("div");
+    elements.add("h1");
+    elements.add("h2");
+    elements.add("h3");
+    elements.add("h4");
+    elements.add("h5");
+    elements.add("h6");
+    elements.add("a");
+    elements.add("span");
+    elements.add("b");
+    elements.add("em");
+    elements.add("i");
+    elements.add("strong");
+    elements.add("small");
+    elements.add("big");
+    elements.add("tt");
+    elements.add("small");
+    elements.add("dfn");
+    elements.add("q");
+    elements.add("var");
+    elements.add("abbr");
+    elements.add("acronym");
+    elements.add("cite");
+    elements.add("blockquote");
+    elements.add("hr");
+    elements.add("address");
+    elements.add("bdo");
+    elements.add("kbd");
+    elements.add("q");
+    elements.add("sub");
+    elements.add("sup");
+    elements.add("ul");
+    elements.add("ol");
+    elements.add("li");
+    elements.add("dl");
+    elements.add("dt");
+    elements.add("dd");
+    elements.add("pre");
+    elements.add("table");
+    elements.add("caption");
+    elements.add("colgroup");
+    elements.add("col");
+    elements.add("thead");
+    elements.add("tr");
+    elements.add("tfoot");
+    elements.add("tbody");
+    elements.add("th");
+    elements.add("td");
+    elements.add("code");
+    elements.add("samp");
+    elements.add("img");
+    elements.add("map");
+    elements.add("area");
+
+    attributes.add("title");
+    attributes.add("style");
+    attributes.add("class");
+    attributes.add("id");
+    attributes.add("lang");
+    attributes.add("xml:lang");
+    attributes.add("dir");
+    attributes.add("accesskey");
+    attributes.add("tabindex");
     // tables:
-  attributes.add("span");
-  attributes.add("width");
-  attributes.add("align");
-  attributes.add("valign");
-  attributes.add("char");
-  attributes.add("charoff");
-  attributes.add("abbr");
-  attributes.add("axis");
-  attributes.add("headers");
-  attributes.add("scope");
-  attributes.add("rowspan");
-  attributes.add("colspan");
+    attributes.add("span");
+    attributes.add("width");
+    attributes.add("align");
+    attributes.add("valign");
+    attributes.add("char");
+    attributes.add("charoff");
+    attributes.add("abbr");
+    attributes.add("axis");
+    attributes.add("headers");
+    attributes.add("scope");
+    attributes.add("rowspan");
+    attributes.add("colspan");
 
-  attributes.add("a.href");
-  attributes.add("a.name");
-  attributes.add("img.src");
-  attributes.add("img.border");
-  attributes.add("div.xmlns");
-  attributes.add("blockquote.cite");
-  attributes.add("q.cite");
-  attributes.add("a.charset");
-  attributes.add("a.type");
-  attributes.add("a.name");
-  attributes.add("a.href");
-  attributes.add("a.hreflang");
-  attributes.add("a.rel");
-  attributes.add("a.rev");
-  attributes.add("a.shape");
-  attributes.add("a.coords");
-  attributes.add("img.src");
-  attributes.add("img.alt");
-  attributes.add("img.longdesc");
-  attributes.add("img.height");
-  attributes.add("img.width");
-  attributes.add("img.usemap");
-  attributes.add("img.ismap");
-  attributes.add("map.name");
-  attributes.add("area.shape");
-  attributes.add("area.coords");
-  attributes.add("area.href");
-  attributes.add("area.nohref");
-  attributes.add("area.alt");
-  attributes.add("table.summary");
-  attributes.add("table.width");
-  attributes.add("table.border");
-  attributes.add("table.frame");
-  attributes.add("table.rules");
-  attributes.add("table.cellspacing");
-  attributes.add("table.cellpadding");
-}
+    attributes.add("a.href");
+    attributes.add("a.name");
+    attributes.add("img.src");
+    attributes.add("img.border");
+    attributes.add("div.xmlns");
+    attributes.add("blockquote.cite");
+    attributes.add("q.cite");
+    attributes.add("a.charset");
+    attributes.add("a.type");
+    attributes.add("a.name");
+    attributes.add("a.href");
+    attributes.add("a.hreflang");
+    attributes.add("a.rel");
+    attributes.add("a.rev");
+    attributes.add("a.shape");
+    attributes.add("a.coords");
+    attributes.add("img.src");
+    attributes.add("img.alt");
+    attributes.add("img.longdesc");
+    attributes.add("img.height");
+    attributes.add("img.width");
+    attributes.add("img.usemap");
+    attributes.add("img.ismap");
+    attributes.add("map.name");
+    attributes.add("area.shape");
+    attributes.add("area.coords");
+    attributes.add("area.href");
+    attributes.add("area.nohref");
+    attributes.add("area.alt");
+    attributes.add("table.summary");
+    attributes.add("table.width");
+    attributes.add("table.border");
+    attributes.add("table.frame");
+    attributes.add("table.rules");
+    attributes.add("table.cellspacing");
+    attributes.add("table.cellpadding");
 
-public enum ParserSecurityPolicy {
+    defineEntities();
+  }
+
+  public enum ParserSecurityPolicy {
     Accept,
     Drop,
     Reject
   }
 
   private ParserSecurityPolicy policy;
-  
+
   private boolean trimWhitespace;
   private boolean mustBeWellFormed = true;
   private boolean validatorMode;
-  
+
   public boolean isTrimWhitespace() {
     return trimWhitespace;
   }
@@ -274,7 +276,7 @@ public enum ParserSecurityPolicy {
     this.mustBeWellFormed = mustBeWellFormed;
     return this;
   }
-  
+
 
   public boolean isValidatorMode() {
     return validatorMode;
@@ -286,17 +288,17 @@ public enum ParserSecurityPolicy {
   }
 
   public ParserSecurityPolicy getPolicy() {
-   return policy;
+    return policy;
   }
 
   public void setPolicy(ParserSecurityPolicy policy) {
-  this.policy = policy; 
+    this.policy = policy; 
   }
 
   public XhtmlNode parseHtmlNode(Element node) throws FHIRFormatError  {
     return parseHtmlNode(node, null);
   }
-  
+
   public XhtmlNode parseHtmlNode(Element node, String defaultNS) throws FHIRFormatError  {
     XhtmlNode res = parseNode(node, defaultNS);
     if (res.getNsDecl() == null)
@@ -352,7 +354,7 @@ public enum ParserSecurityPolicy {
   private XhtmlNode parseNode(XmlPullParser xpp) throws XmlPullParserException, IOException, FHIRFormatError  {
     XhtmlNode res = new XhtmlNode(NodeType.Element);
     res.setName(xpp.getName());
-    
+
     for (int i = 0; i < xpp.getAttributeCount(); i++) {
       String an = "xml".equals(xpp.getAttributePrefix(i)) ? "xml:"+xpp.getAttributeName(i) : xpp.getAttributeName(i);
       String av = xpp.getAttributeValue(i);
@@ -382,38 +384,38 @@ public enum ParserSecurityPolicy {
   private boolean attributeIsOk(String elem, String attr, String value) throws FHIRFormatError  {
     if (validatorMode)
       return true;
-  boolean ok = attributes.contains(attr) || attributes.contains(elem+"."+attr);
-  if (ok)
-    return true;
-  else switch (policy) {
+    boolean ok = attributes.contains(attr) || attributes.contains(elem+"."+attr);
+    if (ok)
+      return true;
+    else switch (policy) {
     case Accept: return true;
     case Drop: return false;
     case Reject: throw new FHIRFormatError("Illegal HTML attribute "+elem+"."+attr);
-  }
+    }
 
-  if ((elem+"."+attr).equals("img.src") && !(value.startsWith("#") || value.startsWith("http:") || value.startsWith("https:"))) {
-    switch (policy) {
+    if ((elem+"."+attr).equals("img.src") && !(value.startsWith("#") || value.startsWith("http:") || value.startsWith("https:"))) {
+      switch (policy) {
       case Accept: return true;
       case Drop: return false;
       case Reject: throw new FHIRFormatError("Illegal Image Reference "+value);
+      }
     }
-  }
-  return false;
+    return false;
   }
 
-private boolean elementIsOk(String name) throws FHIRFormatError  {
+  private boolean elementIsOk(String name) throws FHIRFormatError  {
     if (validatorMode)
       return true;
     boolean ok = elements.contains(name);
-  if (ok)
+    if (ok)
       return true;
-  else switch (policy) {
+    else switch (policy) {
     case Accept: return true;
     case Drop: return false;
     case Reject: throw new FHIRFormatError("Illegal HTML element "+name);
+    }
+    return false;
   }
-  return false;
-}
 
   private String descLoc() {
     return " at line "+Integer.toString(line)+" column "+Integer.toString(col);
@@ -427,17 +429,17 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
   private int col = 0;
   private char lastChar;
   private Location lastLoc;
-  
+
   public XhtmlDocument parse(String source, String entryName) throws FHIRFormatError, IOException  {
     rdr = new StringReader(source);
     return parse(entryName);
   }
-  
+
   public XhtmlDocument parse(InputStream input, String entryName) throws FHIRFormatError, IOException  {
     rdr = new InputStreamReader(input, StandardCharsets.UTF_8);
     return parse(entryName);
   }
-   
+
   private XhtmlDocument parse(String entryName) throws FHIRFormatError, IOException 
   {
     XhtmlDocument result = new XhtmlDocument();
@@ -465,7 +467,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     }
     return result;
   }
-  
+
   private Location markLocation() {
     Location res = lastLoc;
     lastLoc = new Location(line, col);
@@ -475,7 +477,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
   private NSMap checkNamespaces(QName n, XhtmlNode node, NSMap nsm, boolean root) {
     // what we do here is strip out any stated namespace attributes, putting them in the namesapce map
     // then we figure out what the namespace of this element is, and state it explicitly if it's not the default
-    
+
     NSMap result = new NSMap(nsm);
     List<String> nsattrs = new ArrayList<String>();
     for (String an : node.getAttributes().keySet()) {
@@ -525,8 +527,8 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
         if (peekChar() == '!') {
           String sc = readToCommentEnd();
           // moved the validator
-//          if (sc.startsWith("DOCTYPE"))
-//            throw new FHIRFormatError("Malformed XHTML: Found a DocType declaration, and these are not allowed (XXE security vulnerability protection)");
+          //          if (sc.startsWith("DOCTYPE"))
+          //            throw new FHIRFormatError("Malformed XHTML: Found a DocType declaration, and these are not allowed (XXE security vulnerability protection)");
           node.addComment(sc).setLocation(markLocation());
         } else if (peekChar() == '?')
           node.addComment(readToTagEnd()).setLocation(markLocation());
@@ -599,10 +601,10 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
         throw new FHIRFormatError("unexpected non-end of element "+name+" "+descLoc());
       readChar();
     } else {
-       parseElementInner(node, newParents, nsm, "script".equals(name.getName()));
+      parseElementInner(node, newParents, nsm, "script".equals(name.getName()));
     }
   }
-  
+
   private void parseAttributes(XhtmlNode node) throws FHIRFormatError, IOException 
   {
     while (Character.isWhitespace(peekChar()))
@@ -655,7 +657,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     return b.toString();
   }
 
-  
+
   private void skipWhiteSpaceAndComments(XhtmlNode focus) throws IOException, FHIRFormatError  {
     while (Character.isWhitespace(peekChar()) || (peekChar() == 0xfeff))
       readChar();
@@ -684,18 +686,18 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
         pushChar(ch);
     }
   }  
-  
+
   private void skipWhiteSpace() throws IOException {
     if (trimWhitespace)
       while (Character.isWhitespace(peekChar()) || (peekChar() == 0xfeff))
         readChar();
   }
-  
+
   private void skipWhiteSpaceInternal() throws IOException {
     while (Character.isWhitespace(peekChar()) || (peekChar() == 0xfeff))
       readChar();
   }
-  
+
   private void pushChar(char ch) {
     cache = Character.toString(ch)+cache;    
   }
@@ -759,7 +761,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
   private String readToDocTypeEnd() throws IOException, FHIRFormatError 
   {
     StringBuilder s = new StringBuilder();
-      
+
     boolean done = false;
     while (!done) {
       char c = peekChar();
@@ -779,7 +781,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     if (peekChar() == '!')
       readChar();
     StringBuilder s = new StringBuilder();
-      
+
     boolean simple = true;
     if (peekChar() == '-') {
       readChar();
@@ -789,9 +791,9 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       else
         readChar();
     }
-    
+
     boolean doctypeEntities = false;
-    
+
     boolean done = false;
     while (!done) {
       char c = peekChar();
@@ -846,7 +848,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       String v = ed.substring(0, ed.length()-1);
       entities.put(n, v);
     }
-    
+
   }
 
   private boolean isNameChar(char ch)
@@ -870,7 +872,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     readChar();
     return s.toString();
   }
-  
+
 
   private String readUntil(String sc) throws IOException
   {
@@ -880,14 +882,25 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     readChar();
     return s.toString();
   }
-  
+
   private void parseLiteral(StringBuilder s) throws IOException, FHIRFormatError {
     // UInt16 w;
     readChar();
     String c = readUntil(";&'\"><");
     if (c.isEmpty())
       throw new FHIRFormatError("Invalid literal declaration following text: " + s);
-    if (c.equals("apos"))
+    else if (c.charAt(0) == '#') {
+      if (isInteger(c.substring(1), 10))
+        s.append((char) Integer.parseInt(c.substring(1)));
+      else if (c.charAt(1) == 'x' && isInteger(c.substring(2), 16))
+        s.append((char) Integer.parseInt(c.substring(2), 16));
+    } else if (entities.containsKey(c)) {
+      s.append(entities.get(c));
+      // what's going on here? 
+      // the contents that follow already existed, and then I added the routine to populate the entities 
+      // which was generated from other code. The code that follows is probably redundant, but I haven't
+      // cross checked it. some is welcome to do so... (GG 8-Nov 2021)
+    } else if (c.equals("apos"))
       s.append('\'');
     else if (c.equals("quot"))
       s.append('"');
@@ -899,8 +912,6 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       s.append((char) 8216); // right single quotation, U+2019 ISOnum 
     else if (c.equals("rsquo"))
       s.append((char) 8217); // right single quotation, U+2019 ISOnum 
-      //s.append((char)0x60); // right single quote
-	  //s.append('’');
     else if (c.equals("gt"))
       s.append('>');
     else if (c.equals("lt"))
@@ -911,12 +922,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       s.append((char) 174);
     else if (c.equals("sect"))
       s.append((char) 0xA7);
-    else if (c.charAt(0) == '#') {
-      if (isInteger(c.substring(1), 10))
-        s.append((char) Integer.parseInt(c.substring(1)));
-      else if (c.charAt(1) == 'x' && isInteger(c.substring(2), 16))
-        s.append((char) Integer.parseInt(c.substring(2), 16));
-    } else if (c.equals("fnof"))
+    else if (c.equals("fnof"))
       s.append((char) 402); // latin small f with hook = function = florin, U+0192 ISOtech -->
     else if (c.equals("Alpha"))
       s.append((char) 913); // greek capital letter alpha, U+0391
@@ -1172,8 +1178,8 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       s.append((char) 8221); 
     else if (c.equals("rdquo"))
       s.append((char) 201D); 
-    else if (entities.containsKey(c))
-      s.append(entities.get(c));
+    else if (c.equals("frac14"))
+      s.append((char) 188); 
     else if (!mustBeWellFormed) {
       // we guess that this is an accidentally unescaped &
       s.append("&"+c);
@@ -1181,7 +1187,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
       throw new FHIRFormatError("unable to parse character reference '" + c + "'' (last text = '" + lastText + "'" + descLoc());
     }
   }
-  
+
   private boolean isInteger(String s, int base) {
     try {
       Integer.parseInt(s, base);
@@ -1195,12 +1201,12 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     rdr = new StringReader(source);
     return parseFragment();
   }
-  
+
   public XhtmlNode parseFragment(InputStream input) throws IOException, FHIRException  {
     rdr = new InputStreamReader(input);
     return parseFragment();
   }
-  
+
   private XhtmlNode parseFragment() throws IOException, FHIRException 
   {
     skipWhiteSpace();
@@ -1222,7 +1228,7 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     if (colonIndex != -1) {
       n = n.substring(colonIndex + 1);
     }
-    
+
     result.setName(n);
     unwindPoint = null;
     List<XhtmlNode> p = new ArrayList<>();
@@ -1231,5 +1237,2132 @@ private boolean elementIsOk(String name) throws FHIRFormatError  {
     return result;
   }
 
-  
+  private void defineEntities() {
+    entities.put("&AElig;", "\u00C6");
+    entities.put("&AMP;", "\u0026");
+    entities.put("&Aacute;", "\u00C1");
+    entities.put("&Abreve;", "\u0102");
+    entities.put("&Acirc;", "\u00C2");
+    entities.put("&Acy;", "\u0410");
+    entities.put("&Afr;", "\uD835\uDD04");
+    entities.put("&Agrave;", "\u00C0");
+    entities.put("&Alpha;", "\u0391");
+    entities.put("&Amacr;", "\u0100");
+    entities.put("&And;", "\u2A53");
+    entities.put("&Aogon;", "\u0104");
+    entities.put("&Aopf;", "\uD835\uDD38");
+    entities.put("&ApplyFunction;", "\u2061");
+    entities.put("&Aring;", "\u00C5");
+    entities.put("&Ascr;", "\uD835\uDC9C");
+    entities.put("&Assign;", "\u2254");
+    entities.put("&Atilde;", "\u00C3");
+    entities.put("&Auml;", "\u00C4");
+    entities.put("&Backslash;", "\u2216");
+    entities.put("&Barv;", "\u2AE7");
+    entities.put("&Barwed;", "\u2306");
+    entities.put("&Bcy;", "\u0411");
+    entities.put("&Because;", "\u2235");
+    entities.put("&Bernoullis;", "\u212C");
+    entities.put("&Beta;", "\u0392");
+    entities.put("&Bfr;", "\uD835\uDD05");
+    entities.put("&Bopf;", "\uD835\uDD39");
+    entities.put("&Breve;", "\u02D8");
+    entities.put("&Bscr;", "\u212C");
+    entities.put("&Bumpeq;", "\u224E");
+    entities.put("&CHcy;", "\u0427");
+    entities.put("&COPY;", "\u00A9");
+    entities.put("&Cacute;", "\u0106");
+    entities.put("&Cap;", "\u22D2");
+    entities.put("&CapitalDifferentialD;", "\u2145");
+    entities.put("&Cayleys;", "\u212D");
+    entities.put("&Ccaron;", "\u010C");
+    entities.put("&Ccedil;", "\u00C7");
+    entities.put("&Ccirc;", "\u0108");
+    entities.put("&Cconint;", "\u2230");
+    entities.put("&Cdot;", "\u010A");
+    entities.put("&Cedilla;", "\u00B8");
+    entities.put("&CenterDot;", "\u00B7");
+    entities.put("&Cfr;", "\u212D");
+    entities.put("&Chi;", "\u03A7");
+    entities.put("&CircleDot;", "\u2299");
+    entities.put("&CircleMinus;", "\u2296");
+    entities.put("&CirclePlus;", "\u2295");
+    entities.put("&CircleTimes;", "\u2297");
+    entities.put("&ClockwiseContourIntegral;", "\u2232");
+    entities.put("&CloseCurlyDoubleQuote;", "\u201D");
+    entities.put("&CloseCurlyQuote;", "\u2019");
+    entities.put("&Colon;", "\u2237");
+    entities.put("&Colone;", "\u2A74");
+    entities.put("&Congruent;", "\u2261");
+    entities.put("&Conint;", "\u222F");
+    entities.put("&ContourIntegral;", "\u222E");
+    entities.put("&Copf;", "\u2102");
+    entities.put("&Coproduct;", "\u2210");
+    entities.put("&CounterClockwiseContourIntegral;", "\u2233");
+    entities.put("&Cross;", "\u2A2F");
+    entities.put("&Cscr;", "\uD835\uDC9E");
+    entities.put("&Cup;", "\u22D3");
+    entities.put("&CupCap;", "\u224D");
+    entities.put("&DD;", "\u2145");
+    entities.put("&DDotrahd;", "\u2911");
+    entities.put("&DJcy;", "\u0402");
+    entities.put("&DScy;", "\u0405");
+    entities.put("&DZcy;", "\u040F");
+    entities.put("&Dagger;", "\u2021");
+    entities.put("&Darr;", "\u21A1");
+    entities.put("&Dashv;", "\u2AE4");
+    entities.put("&Dcaron;", "\u010E");
+    entities.put("&Dcy;", "\u0414");
+    entities.put("&Del;", "\u2207");
+    entities.put("&Delta;", "\u0394");
+    entities.put("&Dfr;", "\uD835\uDD07");
+    entities.put("&DiacriticalAcute;", "\u00B4");
+    entities.put("&DiacriticalDot;", "\u02D9");
+    entities.put("&DiacriticalDoubleAcute;", "\u02DD");
+    entities.put("&DiacriticalGrave;", "\u0060");
+    entities.put("&DiacriticalTilde;", "\u02DC");
+    entities.put("&Diamond;", "\u22C4");
+    entities.put("&DifferentialD;", "\u2146");
+    entities.put("&Dopf;", "\uD835\uDD3B");
+    entities.put("&Dot;", "\u00A8");
+    entities.put("&DotDot;", "\u20DC");
+    entities.put("&DotEqual;", "\u2250");
+    entities.put("&DoubleContourIntegral;", "\u222F");
+    entities.put("&DoubleDot;", "\u00A8");
+    entities.put("&DoubleDownArrow;", "\u21D3");
+    entities.put("&DoubleLeftArrow;", "\u21D0");
+    entities.put("&DoubleLeftRightArrow;", "\u21D4");
+    entities.put("&DoubleLeftTee;", "\u2AE4");
+    entities.put("&DoubleLongLeftArrow;", "\u27F8");
+    entities.put("&DoubleLongLeftRightArrow;", "\u27FA");
+    entities.put("&DoubleLongRightArrow;", "\u27F9");
+    entities.put("&DoubleRightArrow;", "\u21D2");
+    entities.put("&DoubleRightTee;", "\u22A8");
+    entities.put("&DoubleUpArrow;", "\u21D1");
+    entities.put("&DoubleUpDownArrow;", "\u21D5");
+    entities.put("&DoubleVerticalBar;", "\u2225");
+    entities.put("&DownArrow;", "\u2193");
+    entities.put("&DownArrowBar;", "\u2913");
+    entities.put("&DownArrowUpArrow;", "\u21F5");
+    entities.put("&DownBreve;", "\u0311");
+    entities.put("&DownLeftRightVector;", "\u2950");
+    entities.put("&DownLeftTeeVector;", "\u295E");
+    entities.put("&DownLeftVector;", "\u21BD");
+    entities.put("&DownLeftVectorBar;", "\u2956");
+    entities.put("&DownRightTeeVector;", "\u295F");
+    entities.put("&DownRightVector;", "\u21C1");
+    entities.put("&DownRightVectorBar;", "\u2957");
+    entities.put("&DownTee;", "\u22A4");
+    entities.put("&DownTeeArrow;", "\u21A7");
+    entities.put("&Downarrow;", "\u21D3");
+    entities.put("&Dscr;", "\uD835\uDC9F");
+    entities.put("&Dstrok;", "\u0110");
+    entities.put("&ENG;", "\u014A");
+    entities.put("&ETH;", "\u00D0");
+    entities.put("&Eacute;", "\u00C9");
+    entities.put("&Ecaron;", "\u011A");
+    entities.put("&Ecirc;", "\u00CA");
+    entities.put("&Ecy;", "\u042D");
+    entities.put("&Edot;", "\u0116");
+    entities.put("&Efr;", "\uD835\uDD08");
+    entities.put("&Egrave;", "\u00C8");
+    entities.put("&Element;", "\u2208");
+    entities.put("&Emacr;", "\u0112");
+    entities.put("&EmptySmallSquare;", "\u25FB");
+    entities.put("&EmptyVerySmallSquare;", "\u25AB");
+    entities.put("&Eogon;", "\u0118");
+    entities.put("&Eopf;", "\uD835\uDD3C");
+    entities.put("&Epsilon;", "\u0395");
+    entities.put("&Equal;", "\u2A75");
+    entities.put("&EqualTilde;", "\u2242");
+    entities.put("&Equilibrium;", "\u21CC");
+    entities.put("&Escr;", "\u2130");
+    entities.put("&Esim;", "\u2A73");
+    entities.put("&Eta;", "\u0397");
+    entities.put("&Euml;", "\u00CB");
+    entities.put("&Exists;", "\u2203");
+    entities.put("&ExponentialE;", "\u2147");
+    entities.put("&Fcy;", "\u0424");
+    entities.put("&Ffr;", "\uD835\uDD09");
+    entities.put("&FilledSmallSquare;", "\u25FC");
+    entities.put("&FilledVerySmallSquare;", "\u25AA");
+    entities.put("&Fopf;", "\uD835\uDD3D");
+    entities.put("&ForAll;", "\u2200");
+    entities.put("&Fouriertrf;", "\u2131");
+    entities.put("&Fscr;", "\u2131");
+    entities.put("&GJcy;", "\u0403");
+    entities.put("&GT;", "\u003E");
+    entities.put("&Gamma;", "\u0393");
+    entities.put("&Gammad;", "\u03DC");
+    entities.put("&Gbreve;", "\u011E");
+    entities.put("&Gcedil;", "\u0122");
+    entities.put("&Gcirc;", "\u011C");
+    entities.put("&Gcy;", "\u0413");
+    entities.put("&Gdot;", "\u0120");
+    entities.put("&Gfr;", "\uD835\uDD0A");
+    entities.put("&Gg;", "\u22D9");
+    entities.put("&Gopf;", "\uD835\uDD3E");
+    entities.put("&GreaterEqual;", "\u2265");
+    entities.put("&GreaterEqualLess;", "\u22DB");
+    entities.put("&GreaterFullEqual;", "\u2267");
+    entities.put("&GreaterGreater;", "\u2AA2");
+    entities.put("&GreaterLess;", "\u2277");
+    entities.put("&GreaterSlantEqual;", "\u2A7E");
+    entities.put("&GreaterTilde;", "\u2273");
+    entities.put("&Gscr;", "\uD835\uDCA2");
+    entities.put("&Gt;", "\u226B");
+    entities.put("&HARDcy;", "\u042A");
+    entities.put("&Hacek;", "\u02C7");
+    entities.put("&Hat;", "\u005E");
+    entities.put("&Hcirc;", "\u0124");
+    entities.put("&Hfr;", "\u210C");
+    entities.put("&HilbertSpace;", "\u210B");
+    entities.put("&Hopf;", "\u210D");
+    entities.put("&HorizontalLine;", "\u2500");
+    entities.put("&Hscr;", "\u210B");
+    entities.put("&Hstrok;", "\u0126");
+    entities.put("&HumpDownHump;", "\u224E");
+    entities.put("&HumpEqual;", "\u224F");
+    entities.put("&IEcy;", "\u0415");
+    entities.put("&IJlig;", "\u0132");
+    entities.put("&IOcy;", "\u0401");
+    entities.put("&Iacute;", "\u00CD");
+    entities.put("&Icirc;", "\u00CE");
+    entities.put("&Icy;", "\u0418");
+    entities.put("&Idot;", "\u0130");
+    entities.put("&Ifr;", "\u2111");
+    entities.put("&Igrave;", "\u00CC");
+    entities.put("&Im;", "\u2111");
+    entities.put("&Imacr;", "\u012A");
+    entities.put("&ImaginaryI;", "\u2148");
+    entities.put("&Implies;", "\u21D2");
+    entities.put("&Int;", "\u222C");
+    entities.put("&Integral;", "\u222B");
+    entities.put("&Intersection;", "\u22C2");
+    entities.put("&InvisibleComma;", "\u2063");
+    entities.put("&InvisibleTimes;", "\u2062");
+    entities.put("&Iogon;", "\u012E");
+    entities.put("&Iopf;", "\uD835\uDD40");
+    entities.put("&Iota;", "\u0399");
+    entities.put("&Iscr;", "\u2110");
+    entities.put("&Itilde;", "\u0128");
+    entities.put("&Iukcy;", "\u0406");
+    entities.put("&Iuml;", "\u00CF");
+    entities.put("&Jcirc;", "\u0134");
+    entities.put("&Jcy;", "\u0419");
+    entities.put("&Jfr;", "\uD835\uDD0D");
+    entities.put("&Jopf;", "\uD835\uDD41");
+    entities.put("&Jscr;", "\uD835\uDCA5");
+    entities.put("&Jsercy;", "\u0408");
+    entities.put("&Jukcy;", "\u0404");
+    entities.put("&KHcy;", "\u0425");
+    entities.put("&KJcy;", "\u040C");
+    entities.put("&Kappa;", "\u039A");
+    entities.put("&Kcedil;", "\u0136");
+    entities.put("&Kcy;", "\u041A");
+    entities.put("&Kfr;", "\uD835\uDD0E");
+    entities.put("&Kopf;", "\uD835\uDD42");
+    entities.put("&Kscr;", "\uD835\uDCA6");
+    entities.put("&LJcy;", "\u0409");
+    entities.put("&LT;", "\u003C");
+    entities.put("&Lacute;", "\u0139");
+    entities.put("&Lambda;", "\u039B");
+    entities.put("&Lang;", "\u27EA");
+    entities.put("&Laplacetrf;", "\u2112");
+    entities.put("&Larr;", "\u219E");
+    entities.put("&Lcaron;", "\u013D");
+    entities.put("&Lcedil;", "\u013B");
+    entities.put("&Lcy;", "\u041B");
+    entities.put("&LeftAngleBracket;", "\u27E8");
+    entities.put("&LeftArrow;", "\u2190");
+    entities.put("&LeftArrowBar;", "\u21E4");
+    entities.put("&LeftArrowRightArrow;", "\u21C6");
+    entities.put("&LeftCeiling;", "\u2308");
+    entities.put("&LeftDoubleBracket;", "\u27E6");
+    entities.put("&LeftDownTeeVector;", "\u2961");
+    entities.put("&LeftDownVector;", "\u21C3");
+    entities.put("&LeftDownVectorBar;", "\u2959");
+    entities.put("&LeftFloor;", "\u230A");
+    entities.put("&LeftRightArrow;", "\u2194");
+    entities.put("&LeftRightVector;", "\u294E");
+    entities.put("&LeftTee;", "\u22A3");
+    entities.put("&LeftTeeArrow;", "\u21A4");
+    entities.put("&LeftTeeVector;", "\u295A");
+    entities.put("&LeftTriangle;", "\u22B2");
+    entities.put("&LeftTriangleBar;", "\u29CF");
+    entities.put("&LeftTriangleEqual;", "\u22B4");
+    entities.put("&LeftUpDownVector;", "\u2951");
+    entities.put("&LeftUpTeeVector;", "\u2960");
+    entities.put("&LeftUpVector;", "\u21BF");
+    entities.put("&LeftUpVectorBar;", "\u2958");
+    entities.put("&LeftVector;", "\u21BC");
+    entities.put("&LeftVectorBar;", "\u2952");
+    entities.put("&Leftarrow;", "\u21D0");
+    entities.put("&Leftrightarrow;", "\u21D4");
+    entities.put("&LessEqualGreater;", "\u22DA");
+    entities.put("&LessFullEqual;", "\u2266");
+    entities.put("&LessGreater;", "\u2276");
+    entities.put("&LessLess;", "\u2AA1");
+    entities.put("&LessSlantEqual;", "\u2A7D");
+    entities.put("&LessTilde;", "\u2272");
+    entities.put("&Lfr;", "\uD835\uDD0F");
+    entities.put("&Ll;", "\u22D8");
+    entities.put("&Lleftarrow;", "\u21DA");
+    entities.put("&Lmidot;", "\u013F");
+    entities.put("&LongLeftArrow;", "\u27F5");
+    entities.put("&LongLeftRightArrow;", "\u27F7");
+    entities.put("&LongRightArrow;", "\u27F6");
+    entities.put("&Longleftarrow;", "\u27F8");
+    entities.put("&Longleftrightarrow;", "\u27FA");
+    entities.put("&Longrightarrow;", "\u27F9");
+    entities.put("&Lopf;", "\uD835\uDD43");
+    entities.put("&LowerLeftArrow;", "\u2199");
+    entities.put("&LowerRightArrow;", "\u2198");
+    entities.put("&Lscr;", "\u2112");
+    entities.put("&Lsh;", "\u21B0");
+    entities.put("&Lstrok;", "\u0141");
+    entities.put("&Lt;", "\u226A");
+    entities.put("&Map;", "\u2905");
+    entities.put("&Mcy;", "\u041C");
+    entities.put("&MediumSpace;", "\u205F");
+    entities.put("&Mellintrf;", "\u2133");
+    entities.put("&Mfr;", "\uD835\uDD10");
+    entities.put("&MinusPlus;", "\u2213");
+    entities.put("&Mopf;", "\uD835\uDD44");
+    entities.put("&Mscr;", "\u2133");
+    entities.put("&Mu;", "\u039C");
+    entities.put("&NJcy;", "\u040A");
+    entities.put("&Nacute;", "\u0143");
+    entities.put("&Ncaron;", "\u0147");
+    entities.put("&Ncedil;", "\u0145");
+    entities.put("&Ncy;", "\u041D");
+    entities.put("&NegativeMediumSpace;", "\u200B");
+    entities.put("&NegativeThickSpace;", "\u200B");
+    entities.put("&NegativeThinSpace;", "\u200B");
+    entities.put("&NegativeVeryThinSpace;", "\u200B");
+    entities.put("&NestedGreaterGreater;", "\u226B");
+    entities.put("&NestedLessLess;", "\u226A");
+    entities.put("&NewLine;", "\n");
+    entities.put("&Nfr;", "\uD835\uDD11");
+    entities.put("&NoBreak;", "\u2060");
+    entities.put("&NonBreakingSpace;", "\u00A0");
+    entities.put("&Nopf;", "\u2115");
+    entities.put("&Not;", "\u2AEC");
+    entities.put("&NotCongruent;", "\u2262");
+    entities.put("&NotCupCap;", "\u226D");
+    entities.put("&NotDoubleVerticalBar;", "\u2226");
+    entities.put("&NotElement;", "\u2209");
+    entities.put("&NotEqual;", "\u2260");
+    entities.put("&NotEqualTilde;", "\u2242\u0338");
+    entities.put("&NotExists;", "\u2204");
+    entities.put("&NotGreater;", "\u226F");
+    entities.put("&NotGreaterEqual;", "\u2271");
+    entities.put("&NotGreaterFullEqual;", "\u2267\u0033");
+    entities.put("&NotGreaterGreater;", "\u226B\u0033");
+    entities.put("&NotGreaterLess;", "\u2279");
+    entities.put("&NotGreaterSlantEqual;", "\u2A7E\u0338");
+    entities.put("&NotGreaterTilde;", "\u2275");
+    entities.put("&NotHumpDownHump;", "\u224E\u0338");
+    entities.put("&NotHumpEqual;", "\u224F\u0338");
+    entities.put("&NotLeftTriangle;", "\u22EA");
+    entities.put("&NotLeftTriangleBar;", "\u29CF\u0338");
+    entities.put("&NotLeftTriangleEqual;", "\u22EC");
+    entities.put("&NotLess;", "\u226E");
+    entities.put("&NotLessEqual;", "\u2270");
+    entities.put("&NotLessGreater;", "\u2278");
+    entities.put("&NotLessLess;", "\u226A\u0338");
+    entities.put("&NotLessSlantEqual;", "\u2A7D\u0338");
+    entities.put("&NotLessTilde;", "\u2274");
+    entities.put("&NotNestedGreaterGreater;", "\u2AA2\u0338");
+    entities.put("&NotNestedLessLess;", "\u2AA1\u0338");
+    entities.put("&NotPrecedes;", "\u2280");
+    entities.put("&NotPrecedesEqual;", "\u2AAF\u0338");
+    entities.put("&NotPrecedesSlantEqual;", "\u22E0");
+    entities.put("&NotReverseElement;", "\u220C");
+    entities.put("&NotRightTriangle;", "\u22EB");
+    entities.put("&NotRightTriangleBar;", "\u29D0\u0338");
+    entities.put("&NotRightTriangleEqual;", "\u22ED");
+    entities.put("&NotSquareSubset;", "\u228F\u0338");
+    entities.put("&NotSquareSubsetEqual;", "\u22E2");
+    entities.put("&NotSquareSuperset;", "\u2290\u0338");
+    entities.put("&NotSquareSupersetEqual;", "\u22E3");
+    entities.put("&NotSubset;", "\u2282\u20D2");
+    entities.put("&NotSubsetEqual;", "\u2288");
+    entities.put("&NotSucceeds;", "\u2281");
+    entities.put("&NotSucceedsEqual;", "\u2AB0\u0338");
+    entities.put("&NotSucceedsSlantEqual;", "\u22E1");
+    entities.put("&NotSucceedsTilde;", "\u227F\u0338");
+    entities.put("&NotSuperset;", "\u2283\u20D2");
+    entities.put("&NotSupersetEqual;", "\u2289");
+    entities.put("&NotTilde;", "\u2241");
+    entities.put("&NotTildeEqual;", "\u2244");
+    entities.put("&NotTildeFullEqual;", "\u2247");
+    entities.put("&NotTildeTilde;", "\u2249");
+    entities.put("&NotVerticalBar;", "\u2224");
+    entities.put("&Nscr;", "\uD835\uDCA9");
+    entities.put("&Ntilde;", "\u00D1");
+    entities.put("&Nu;", "\u039D");
+    entities.put("&OElig;", "\u0152");
+    entities.put("&Oacute;", "\u00D3");
+    entities.put("&Ocirc;", "\u00D4");
+    entities.put("&Ocy;", "\u041E");
+    entities.put("&Odblac;", "\u0150");
+    entities.put("&Ofr;", "\uD835\uDD12");
+    entities.put("&Ograve;", "\u00D2");
+    entities.put("&Omacr;", "\u014C");
+    entities.put("&Omega;", "\u03A9");
+    entities.put("&Omicron;", "\u039F");
+    entities.put("&Oopf;", "\uD835\uDD46");
+    entities.put("&OpenCurlyDoubleQuote;", "\u201C");
+    entities.put("&OpenCurlyQuote;", "\u2018");
+    entities.put("&Or;", "\u2A54");
+    entities.put("&Oscr;", "\uD835\uDCAA");
+    entities.put("&Oslash;", "\u00D8");
+    entities.put("&Otilde;", "\u00D5");
+    entities.put("&Otimes;", "\u2A37");
+    entities.put("&Ouml;", "\u00D6");
+    entities.put("&OverBar;", "\u203E");
+    entities.put("&OverBrace;", "\u23DE");
+    entities.put("&OverBracket;", "\u23B4");
+    entities.put("&OverParenthesis;", "\u23DC");
+    entities.put("&PartialD;", "\u2202");
+    entities.put("&Pcy;", "\u041F");
+    entities.put("&Pfr;", "\uD835\uDD13");
+    entities.put("&Phi;", "\u03A6");
+    entities.put("&Pi;", "\u03A0");
+    entities.put("&PlusMinus;", "\u00B1");
+    entities.put("&Poincareplane;", "\u210C");
+    entities.put("&Popf;", "\u2119");
+    entities.put("&Pr;", "\u2ABB");
+    entities.put("&Precedes;", "\u227A");
+    entities.put("&PrecedesEqual;", "\u2AAF");
+    entities.put("&PrecedesSlantEqual;", "\u227C");
+    entities.put("&PrecedesTilde;", "\u227E");
+    entities.put("&Prime;", "\u2033");
+    entities.put("&Product;", "\u220F");
+    entities.put("&Proportion;", "\u2237");
+    entities.put("&Proportional;", "\u221D");
+    entities.put("&Pscr;", "\uD835\uDCAB");
+    entities.put("&Psi;", "\u03A8");
+    entities.put("&QUOT;", "\\u0022");
+    entities.put("&Qfr;", "\uD835\uDD14");
+    entities.put("&Qopf;", "\u211A");
+    entities.put("&Qscr;", "\uD835\uDCAC");
+    entities.put("&RBarr;", "\u2910");
+    entities.put("&REG;", "\u00AE");
+    entities.put("&Racute;", "\u0154");
+    entities.put("&Rang;", "\u27EB");
+    entities.put("&Rarr;", "\u21A0");
+    entities.put("&Rarrtl;", "\u2916");
+    entities.put("&Rcaron;", "\u0158");
+    entities.put("&Rcedil;", "\u0156");
+    entities.put("&Rcy;", "\u0420");
+    entities.put("&Re;", "\u211C");
+    entities.put("&ReverseElement;", "\u220B");
+    entities.put("&ReverseEquilibrium;", "\u21CB");
+    entities.put("&ReverseUpEquilibrium;", "\u296F");
+    entities.put("&Rfr;", "\u211C");
+    entities.put("&Rho;", "\u03A1");
+    entities.put("&RightAngleBracket;", "\u27E9");
+    entities.put("&RightArrow;", "\u2192");
+    entities.put("&RightArrowBar;", "\u21E5");
+    entities.put("&RightArrowLeftArrow;", "\u21C4");
+    entities.put("&RightCeiling;", "\u2309");
+    entities.put("&RightDoubleBracket;", "\u27E7");
+    entities.put("&RightDownTeeVector;", "\u295D");
+    entities.put("&RightDownVector;", "\u21C2");
+    entities.put("&RightDownVectorBar;", "\u2955");
+    entities.put("&RightFloor;", "\u230B");
+    entities.put("&RightTee;", "\u22A2");
+    entities.put("&RightTeeArrow;", "\u21A6");
+    entities.put("&RightTeeVector;", "\u295B");
+    entities.put("&RightTriangle;", "\u22B3");
+    entities.put("&RightTriangleBar;", "\u29D0");
+    entities.put("&RightTriangleEqual;", "\u22B5");
+    entities.put("&RightUpDownVector;", "\u294F");
+    entities.put("&RightUpTeeVector;", "\u295C");
+    entities.put("&RightUpVector;", "\u21BE");
+    entities.put("&RightUpVectorBar;", "\u2954");
+    entities.put("&RightVector;", "\u21C0");
+    entities.put("&RightVectorBar;", "\u2953");
+    entities.put("&Rightarrow;", "\u21D2");
+    entities.put("&Ropf;", "\u211D");
+    entities.put("&RoundImplies;", "\u2970");
+    entities.put("&Rrightarrow;", "\u21DB");
+    entities.put("&Rscr;", "\u211B");
+    entities.put("&Rsh;", "\u21B1");
+    entities.put("&RuleDelayed;", "\u29F4");
+    entities.put("&SHCHcy;", "\u0429");
+    entities.put("&SHcy;", "\u0428");
+    entities.put("&SOFTcy;", "\u042C");
+    entities.put("&Sacute;", "\u015A");
+    entities.put("&Sc;", "\u2ABC");
+    entities.put("&Scaron;", "\u0160");
+    entities.put("&Scedil;", "\u015E");
+    entities.put("&Scirc;", "\u015C");
+    entities.put("&Scy;", "\u0421");
+    entities.put("&Sfr;", "\uD835\uDD16");
+    entities.put("&ShortDownArrow;", "\u2193");
+    entities.put("&ShortLeftArrow;", "\u2190");
+    entities.put("&ShortRightArrow;", "\u2192");
+    entities.put("&ShortUpArrow;", "\u2191");
+    entities.put("&Sigma;", "\u03A3");
+    entities.put("&SmallCircle;", "\u2218");
+    entities.put("&Sopf;", "\uD835\uDD4A");
+    entities.put("&Sqrt;", "\u221A");
+    entities.put("&Square;", "\u25A1");
+    entities.put("&SquareIntersection;", "\u2293");
+    entities.put("&SquareSubset;", "\u228F");
+    entities.put("&SquareSubsetEqual;", "\u2291");
+    entities.put("&SquareSuperset;", "\u2290");
+    entities.put("&SquareSupersetEqual;", "\u2292");
+    entities.put("&SquareUnion;", "\u2294");
+    entities.put("&Sscr;", "\uD835\uDCAE");
+    entities.put("&Star;", "\u22C6");
+    entities.put("&Sub;", "\u22D0");
+    entities.put("&Subset;", "\u22D0");
+    entities.put("&SubsetEqual;", "\u2286");
+    entities.put("&Succeeds;", "\u227B");
+    entities.put("&SucceedsEqual;", "\u2AB0");
+    entities.put("&SucceedsSlantEqual;", "\u227D");
+    entities.put("&SucceedsTilde;", "\u227F");
+    entities.put("&SuchThat;", "\u220B");
+    entities.put("&Sum;", "\u2211");
+    entities.put("&Sup;", "\u22D1");
+    entities.put("&Superset;", "\u2283");
+    entities.put("&SupersetEqual;", "\u2287");
+    entities.put("&Supset;", "\u22D1");
+    entities.put("&THORN;", "\u00DE");
+    entities.put("&TRADE;", "\u2122");
+    entities.put("&TSHcy;", "\u040B");
+    entities.put("&TScy;", "\u0426");
+    entities.put("&Tab;", "\u0009");
+    entities.put("&Tau;", "\u03A4");
+    entities.put("&Tcaron;", "\u0164");
+    entities.put("&Tcedil;", "\u0162");
+    entities.put("&Tcy;", "\u0422");
+    entities.put("&Tfr;", "\uD835\uDD17");
+    entities.put("&Therefore;", "\u2234");
+    entities.put("&Theta;", "\u0398");
+    entities.put("&ThickSpace;", "\u205F\u200A");
+    entities.put("&ThinSpace;", "\u2009");
+    entities.put("&Tilde;", "\u223C");
+    entities.put("&TildeEqual;", "\u2243");
+    entities.put("&TildeFullEqual;", "\u2245");
+    entities.put("&TildeTilde;", "\u2248");
+    entities.put("&Topf;", "\uD835\uDD4B");
+    entities.put("&TripleDot;", "\u20DB");
+    entities.put("&Tscr;", "\uD835\uDCAF");
+    entities.put("&Tstrok;", "\u0166");
+    entities.put("&Uacute;", "\u00DA");
+    entities.put("&Uarr;", "\u219F");
+    entities.put("&Uarrocir;", "\u2949");
+    entities.put("&Ubrcy;", "\u040E");
+    entities.put("&Ubreve;", "\u016C");
+    entities.put("&Ucirc;", "\u00DB");
+    entities.put("&Ucy;", "\u0423");
+    entities.put("&Udblac;", "\u0170");
+    entities.put("&Ufr;", "\uD835\uDD18");
+    entities.put("&Ugrave;", "\u00D9");
+    entities.put("&Umacr;", "\u016A");
+    entities.put("&UnderBar;", "\u005F");
+    entities.put("&UnderBrace;", "\u23DF");
+    entities.put("&UnderBracket;", "\u23B5");
+    entities.put("&UnderParenthesis;", "\u23DD");
+    entities.put("&Union;", "\u22C3");
+    entities.put("&UnionPlus;", "\u228E");
+    entities.put("&Uogon;", "\u0172");
+    entities.put("&Uopf;", "\uD835\uDD4C");
+    entities.put("&UpArrow;", "\u2191");
+    entities.put("&UpArrowBar;", "\u2912");
+    entities.put("&UpArrowDownArrow;", "\u21C5");
+    entities.put("&UpDownArrow;", "\u2195");
+    entities.put("&UpEquilibrium;", "\u296E");
+    entities.put("&UpTee;", "\u22A5");
+    entities.put("&UpTeeArrow;", "\u21A5");
+    entities.put("&Uparrow;", "\u21D1");
+    entities.put("&Updownarrow;", "\u21D5");
+    entities.put("&UpperLeftArrow;", "\u2196");
+    entities.put("&UpperRightArrow;", "\u2197");
+    entities.put("&Upsi;", "\u03D2");
+    entities.put("&Upsilon;", "\u03A5");
+    entities.put("&Uring;", "\u016E");
+    entities.put("&Uscr;", "\uD835\uDCB0");
+    entities.put("&Utilde;", "\u0168");
+    entities.put("&Uuml;", "\u00DC");
+    entities.put("&VDash;", "\u22AB");
+    entities.put("&Vbar;", "\u2AEB");
+    entities.put("&Vcy;", "\u0412");
+    entities.put("&Vdash;", "\u22A9");
+    entities.put("&Vdashl;", "\u2AE6");
+    entities.put("&Vee;", "\u22C1");
+    entities.put("&Verbar;", "\u2016");
+    entities.put("&Vert;", "\u2016");
+    entities.put("&VerticalBar;", "\u2223");
+    entities.put("&VerticalLine;", "\u007C");
+    entities.put("&VerticalSeparator;", "\u2758");
+    entities.put("&VerticalTilde;", "\u2240");
+    entities.put("&VeryThinSpace;", "\u200A");
+    entities.put("&Vfr;", "\uD835\uDD19");
+    entities.put("&Vopf;", "\uD835\uDD4D");
+    entities.put("&Vscr;", "\uD835\uDCB1");
+    entities.put("&Vvdash;", "\u22AA");
+    entities.put("&Wcirc;", "\u0174");
+    entities.put("&Wedge;", "\u22C0");
+    entities.put("&Wfr;", "\uD835\uDD1A");
+    entities.put("&Wopf;", "\uD835\uDD4E");
+    entities.put("&Wscr;", "\uD835\uDCB2");
+    entities.put("&Xfr;", "\uD835\uDD1B");
+    entities.put("&Xi;", "\u039E");
+    entities.put("&Xopf;", "\uD835\uDD4F");
+    entities.put("&Xscr;", "\uD835\uDCB3");
+    entities.put("&YAcy;", "\u042F");
+    entities.put("&YIcy;", "\u0407");
+    entities.put("&YUcy;", "\u042E");
+    entities.put("&Yacute;", "\u00DD");
+    entities.put("&Ycirc;", "\u0176");
+    entities.put("&Ycy;", "\u042B");
+    entities.put("&Yfr;", "\uD835\uDD1C");
+    entities.put("&Yopf;", "\uD835\uDD50");
+    entities.put("&Yscr;", "\uD835\uDCB4");
+    entities.put("&Yuml;", "\u0178");
+    entities.put("&ZHcy;", "\u0416");
+    entities.put("&Zacute;", "\u0179");
+    entities.put("&Zcaron;", "\u017D");
+    entities.put("&Zcy;", "\u0417");
+    entities.put("&Zdot;", "\u017B");
+    entities.put("&ZeroWidthSpace;", "\u200B");
+    entities.put("&Zeta;", "\u0396");
+    entities.put("&Zfr;", "\u2128");
+    entities.put("&Zopf;", "\u2124");
+    entities.put("&Zscr;", "\uD835\uDCB5");
+    entities.put("&aacute;", "\u00E1");
+    entities.put("&abreve;", "\u0103");
+    entities.put("&ac;", "\u223E");
+    entities.put("&acE;", "\u223E\u0333");
+    entities.put("&acd;", "\u223F");
+    entities.put("&acirc;", "\u00E2");
+    entities.put("&acute;", "\u00B4");
+    entities.put("&acy;", "\u0430");
+    entities.put("&aelig;", "\u00E6");
+    entities.put("&af;", "\u2061");
+    entities.put("&afr;", "\uD835\uDD1E");
+    entities.put("&agrave;", "\u00E0");
+    entities.put("&alefsym;", "\u2135");
+    entities.put("&aleph;", "\u2135");
+    entities.put("&alpha;", "\u03B1");
+    entities.put("&amacr;", "\u0101");
+    entities.put("&amalg;", "\u2A3F");
+    entities.put("&amp;", "\u0026");
+    entities.put("&and;", "\u2227");
+    entities.put("&andand;", "\u2A55");
+    entities.put("&andd;", "\u2A5C");
+    entities.put("&andslope;", "\u2A58");
+    entities.put("&andv;", "\u2A5A");
+    entities.put("&ang;", "\u2220");
+    entities.put("&ange;", "\u29A4");
+    entities.put("&angle;", "\u2220");
+    entities.put("&angmsd;", "\u2221");
+    entities.put("&angmsdaa;", "\u29A8");
+    entities.put("&angmsdab;", "\u29A9");
+    entities.put("&angmsdac;", "\u29AA");
+    entities.put("&angmsdad;", "\u29AB");
+    entities.put("&angmsdae;", "\u29AC");
+    entities.put("&angmsdaf;", "\u29AD");
+    entities.put("&angmsdag;", "\u29AE");
+    entities.put("&angmsdah;", "\u29AF");
+    entities.put("&angrt;", "\u221F");
+    entities.put("&angrtvb;", "\u22BE");
+    entities.put("&angrtvbd;", "\u299D");
+    entities.put("&angsph;", "\u2222");
+    entities.put("&angst;", "\u00C5");
+    entities.put("&angzarr;", "\u237C");
+    entities.put("&aogon;", "\u0105");
+    entities.put("&aopf;", "\uD835\uDD52");
+    entities.put("&ap;", "\u2248");
+    entities.put("&apE;", "\u2A70");
+    entities.put("&apacir;", "\u2A6F");
+    entities.put("&ape;", "\u224A");
+    entities.put("&apid;", "\u224B");
+    entities.put("&apos;", "\u0027");
+    entities.put("&approx;", "\u2248");
+    entities.put("&approxeq;", "\u224A");
+    entities.put("&aring;", "\u00E5");
+    entities.put("&ascr;", "\uD835\uDCB6");
+    entities.put("&ast;", "\u002A");
+    entities.put("&asymp;", "\u2248");
+    entities.put("&asympeq;", "\u224D");
+    entities.put("&atilde;", "\u00E3");
+    entities.put("&auml;", "\u00E4");
+    entities.put("&awconint;", "\u2233");
+    entities.put("&awint;", "\u2A11");
+    entities.put("&bNot;", "\u2AED");
+    entities.put("&backcong;", "\u224C");
+    entities.put("&backepsilon;", "\u03F6");
+    entities.put("&backprime;", "\u2035");
+    entities.put("&backsim;", "\u223D");
+    entities.put("&backsimeq;", "\u22CD");
+    entities.put("&barvee;", "\u22BD");
+    entities.put("&barwed;", "\u2305");
+    entities.put("&barwedge;", "\u2305");
+    entities.put("&bbrk;", "\u23B5");
+    entities.put("&bbrktbrk;", "\u23B6");
+    entities.put("&bcong;", "\u224C");
+    entities.put("&bcy;", "\u0431");
+    entities.put("&bdquo;", "\u201E");
+    entities.put("&becaus;", "\u2235");
+    entities.put("&because;", "\u2235");
+    entities.put("&bemptyv;", "\u29B0");
+    entities.put("&bepsi;", "\u03F6");
+    entities.put("&bernou;", "\u212C");
+    entities.put("&beta;", "\u03B2");
+    entities.put("&beth;", "\u2136");
+    entities.put("&between;", "\u226C");
+    entities.put("&bfr;", "\uD835\uDD1F");
+    entities.put("&bigcap;", "\u22C2");
+    entities.put("&bigcirc;", "\u25EF");
+    entities.put("&bigcup;", "\u22C3");
+    entities.put("&bigodot;", "\u2A00");
+    entities.put("&bigoplus;", "\u2A01");
+    entities.put("&bigotimes;", "\u2A02");
+    entities.put("&bigsqcup;", "\u2A06");
+    entities.put("&bigstar;", "\u2605");
+    entities.put("&bigtriangledown;", "\u25BD");
+    entities.put("&bigtriangleup;", "\u25B3");
+    entities.put("&biguplus;", "\u2A04");
+    entities.put("&bigvee;", "\u22C1");
+    entities.put("&bigwedge;", "\u22C0");
+    entities.put("&bkarow;", "\u290D");
+    entities.put("&blacklozenge;", "\u29EB");
+    entities.put("&blacksquare;", "\u25AA");
+    entities.put("&blacktriangle;", "\u25B4");
+    entities.put("&blacktriangledown;", "\u25BE");
+    entities.put("&blacktriangleleft;", "\u25C2");
+    entities.put("&blacktriangleright;", "\u25B8");
+    entities.put("&blank;", "\u2423");
+    entities.put("&blk12;", "\u2592");
+    entities.put("&blk14;", "\u2591");
+    entities.put("&blk34;", "\u2593");
+    entities.put("&block;", "\u2588");
+    entities.put("&bne;", "\u003D\u20E5");
+    entities.put("&bnequiv;", "\u2261\u20E5");
+    entities.put("&bnot;", "\u2310");
+    entities.put("&bopf;", "\uD835\uDD53");
+    entities.put("&bot;", "\u22A5");
+    entities.put("&bottom;", "\u22A5");
+    entities.put("&bowtie;", "\u22C8");
+    entities.put("&boxDL;", "\u2557");
+    entities.put("&boxDR;", "\u2554");
+    entities.put("&boxDl;", "\u2556");
+    entities.put("&boxDr;", "\u2553");
+    entities.put("&boxH;", "\u2550");
+    entities.put("&boxHD;", "\u2566");
+    entities.put("&boxHU;", "\u2569");
+    entities.put("&boxHd;", "\u2564");
+    entities.put("&boxHu;", "\u2567");
+    entities.put("&boxUL;", "\u255D");
+    entities.put("&boxUR;", "\u255A");
+    entities.put("&boxUl;", "\u255C");
+    entities.put("&boxUr;", "\u2559");
+    entities.put("&boxV;", "\u2551");
+    entities.put("&boxVH;", "\u256C");
+    entities.put("&boxVL;", "\u2563");
+    entities.put("&boxVR;", "\u2560");
+    entities.put("&boxVh;", "\u256B");
+    entities.put("&boxVl;", "\u2562");
+    entities.put("&boxVr;", "\u255F");
+    entities.put("&boxbox;", "\u29C9");
+    entities.put("&boxdL;", "\u2555");
+    entities.put("&boxdR;", "\u2552");
+    entities.put("&boxdl;", "\u2510");
+    entities.put("&boxdr;", "\u250C");
+    entities.put("&boxh;", "\u2500");
+    entities.put("&boxhD;", "\u2565");
+    entities.put("&boxhU;", "\u2568");
+    entities.put("&boxhd;", "\u252C");
+    entities.put("&boxhu;", "\u2534");
+    entities.put("&boxminus;", "\u229F");
+    entities.put("&boxplus;", "\u229E");
+    entities.put("&boxtimes;", "\u22A0");
+    entities.put("&boxuL;", "\u255B");
+    entities.put("&boxuR;", "\u2558");
+    entities.put("&boxul;", "\u2518");
+    entities.put("&boxur;", "\u2514");
+    entities.put("&boxv;", "\u2502");
+    entities.put("&boxvH;", "\u256A");
+    entities.put("&boxvL;", "\u2561");
+    entities.put("&boxvR;", "\u255E");
+    entities.put("&boxvh;", "\u253C");
+    entities.put("&boxvl;", "\u2524");
+    entities.put("&boxvr;", "\u251C");
+    entities.put("&bprime;", "\u2035");
+    entities.put("&breve;", "\u02D8");
+    entities.put("&brvbar;", "\u00A6");
+    entities.put("&bscr;", "\uD835\uDCB7");
+    entities.put("&bsemi;", "\u204F");
+    entities.put("&bsim;", "\u223D");
+    entities.put("&bsime;", "\u22CD");
+    entities.put("&bsol;", "\\u005C");
+    entities.put("&bsolb;", "\u29C5");
+    entities.put("&bsolhsub;", "\u27C8");
+    entities.put("&bull;", "\u2022");
+    entities.put("&bullet;", "\u2022");
+    entities.put("&bump;", "\u224E");
+    entities.put("&bumpE;", "\u2AAE");
+    entities.put("&bumpe;", "\u224F");
+    entities.put("&bumpeq;", "\u224F");
+    entities.put("&cacute;", "\u0107");
+    entities.put("&cap;", "\u2229");
+    entities.put("&capand;", "\u2A44");
+    entities.put("&capbrcup;", "\u2A49");
+    entities.put("&capcap;", "\u2A4B");
+    entities.put("&capcup;", "\u2A47");
+    entities.put("&capdot;", "\u2A40");
+    entities.put("&caps;", "\u2229\uFE00");
+    entities.put("&caret;", "\u2041");
+    entities.put("&caron;", "\u02C7");
+    entities.put("&ccaps;", "\u2A4D");
+    entities.put("&ccaron;", "\u010D");
+    entities.put("&ccedil;", "\u00E7");
+    entities.put("&ccirc;", "\u0109");
+    entities.put("&ccups;", "\u2A4C");
+    entities.put("&ccupssm;", "\u2A50");
+    entities.put("&cdot;", "\u010B");
+    entities.put("&cedil;", "\u00B8");
+    entities.put("&cemptyv;", "\u29B2");
+    entities.put("&cent;", "\u00A2");
+    entities.put("&centerdot;", "\u00B7");
+    entities.put("&cfr;", "\uD835\uDD20");
+    entities.put("&chcy;", "\u0447");
+    entities.put("&check;", "\u2713");
+    entities.put("&checkmark;", "\u2713");
+    entities.put("&chi;", "\u03C7");
+    entities.put("&cir;", "\u25CB");
+    entities.put("&cirE;", "\u29C3");
+    entities.put("&circ;", "\u02C6");
+    entities.put("&circeq;", "\u2257");
+    entities.put("&circlearrowleft;", "\u21BA");
+    entities.put("&circlearrowright;", "\u21BB");
+    entities.put("&circledR;", "\u00AE");
+    entities.put("&circledS;", "\u24C8");
+    entities.put("&circledast;", "\u229B");
+    entities.put("&circledcirc;", "\u229A");
+    entities.put("&circleddash;", "\u229D");
+    entities.put("&cire;", "\u2257");
+    entities.put("&cirfnint;", "\u2A10");
+    entities.put("&cirmid;", "\u2AEF");
+    entities.put("&cirscir;", "\u29C2");
+    entities.put("&clubs;", "\u2663");
+    entities.put("&clubsuit;", "\u2663");
+    entities.put("&colon;", "\u003A");
+    entities.put("&colone;", "\u2254");
+    entities.put("&coloneq;", "\u2254");
+    entities.put("&comma;", "\u002C");
+    entities.put("&commat;", "\u0040");
+    entities.put("&comp;", "\u2201");
+    entities.put("&compfn;", "\u2218");
+    entities.put("&complement;", "\u2201");
+    entities.put("&complexes;", "\u2102");
+    entities.put("&cong;", "\u2245");
+    entities.put("&congdot;", "\u2A6D");
+    entities.put("&conint;", "\u222E");
+    entities.put("&copf;", "\uD835\uDD54");
+    entities.put("&coprod;", "\u2210");
+    entities.put("&copy;", "\u00A9");
+    entities.put("&copysr;", "\u2117");
+    entities.put("&crarr;", "\u21B5");
+    entities.put("&cross;", "\u2717");
+    entities.put("&cscr;", "\uD835\uDCB8");
+    entities.put("&csub;", "\u2ACF");
+    entities.put("&csube;", "\u2AD1");
+    entities.put("&csup;", "\u2AD0");
+    entities.put("&csupe;", "\u2AD2");
+    entities.put("&ctdot;", "\u22EF");
+    entities.put("&cudarrl;", "\u2938");
+    entities.put("&cudarrr;", "\u2935");
+    entities.put("&cuepr;", "\u22DE");
+    entities.put("&cuesc;", "\u22DF");
+    entities.put("&cularr;", "\u21B6");
+    entities.put("&cularrp;", "\u293D");
+    entities.put("&cup;", "\u222A");
+    entities.put("&cupbrcap;", "\u2A48");
+    entities.put("&cupcap;", "\u2A46");
+    entities.put("&cupcup;", "\u2A4A");
+    entities.put("&cupdot;", "\u228D");
+    entities.put("&cupor;", "\u2A45");
+    entities.put("&cups;", "\u222A\uFE00");
+    entities.put("&curarr;", "\u21B7");
+    entities.put("&curarrm;", "\u293C");
+    entities.put("&curlyeqprec;", "\u22DE");
+    entities.put("&curlyeqsucc;", "\u22DF");
+    entities.put("&curlyvee;", "\u22CE");
+    entities.put("&curlywedge;", "\u22CF");
+    entities.put("&curren;", "\u00A4");
+    entities.put("&curvearrowleft;", "\u21B6");
+    entities.put("&curvearrowright;", "\u21B7");
+    entities.put("&cuvee;", "\u22CE");
+    entities.put("&cuwed;", "\u22CF");
+    entities.put("&cwconint;", "\u2232");
+    entities.put("&cwint;", "\u2231");
+    entities.put("&cylcty;", "\u232D");
+    entities.put("&dArr;", "\u21D3");
+    entities.put("&dHar;", "\u2965");
+    entities.put("&dagger;", "\u2020");
+    entities.put("&daleth;", "\u2138");
+    entities.put("&darr;", "\u2193");
+    entities.put("&dash;", "\u2010");
+    entities.put("&dashv;", "\u22A3");
+    entities.put("&dbkarow;", "\u290F");
+    entities.put("&dblac;", "\u02DD");
+    entities.put("&dcaron;", "\u010F");
+    entities.put("&dcy;", "\u0434");
+    entities.put("&dd;", "\u2146");
+    entities.put("&ddagger;", "\u2021");
+    entities.put("&ddarr;", "\u21CA");
+    entities.put("&ddotseq;", "\u2A77");
+    entities.put("&deg;", "\u00B0");
+    entities.put("&delta;", "\u03B4");
+    entities.put("&demptyv;", "\u29B1");
+    entities.put("&dfisht;", "\u297F");
+    entities.put("&dfr;", "\uD835\uDD21");
+    entities.put("&dharl;", "\u21C3");
+    entities.put("&dharr;", "\u21C2");
+    entities.put("&diam;", "\u22C4");
+    entities.put("&diamond;", "\u22C4");
+    entities.put("&diamondsuit;", "\u2666");
+    entities.put("&diams;", "\u2666");
+    entities.put("&die;", "\u00A8");
+    entities.put("&digamma;", "\u03DD");
+    entities.put("&disin;", "\u22F2");
+    entities.put("&div;", "\u00F7");
+    entities.put("&divide;", "\u00F7");
+    entities.put("&divideontimes;", "\u22C7");
+    entities.put("&divonx;", "\u22C7");
+    entities.put("&djcy;", "\u0452");
+    entities.put("&dlcorn;", "\u231E");
+    entities.put("&dlcrop;", "\u230D");
+    entities.put("&dollar;", "\u0024");
+    entities.put("&dopf;", "\uD835\uDD55");
+    entities.put("&dot;", "\u02D9");
+    entities.put("&doteq;", "\u2250");
+    entities.put("&doteqdot;", "\u2251");
+    entities.put("&dotminus;", "\u2238");
+    entities.put("&dotplus;", "\u2214");
+    entities.put("&dotsquare;", "\u22A1");
+    entities.put("&doublebarwedge;", "\u2306");
+    entities.put("&downarrow;", "\u2193");
+    entities.put("&downdownarrows;", "\u21CA");
+    entities.put("&downharpoonleft;", "\u21C3");
+    entities.put("&downharpoonright;", "\u21C2");
+    entities.put("&drbkarow;", "\u2910");
+    entities.put("&drcorn;", "\u231F");
+    entities.put("&drcrop;", "\u230C");
+    entities.put("&dscr;", "\uD835\uDCB9");
+    entities.put("&dscy;", "\u0455");
+    entities.put("&dsol;", "\u29F6");
+    entities.put("&dstrok;", "\u0111");
+    entities.put("&dtdot;", "\u22F1");
+    entities.put("&dtri;", "\u25BF");
+    entities.put("&dtrif;", "\u25BE");
+    entities.put("&duarr;", "\u21F5");
+    entities.put("&duhar;", "\u296F");
+    entities.put("&dwangle;", "\u29A6");
+    entities.put("&dzcy;", "\u045F");
+    entities.put("&dzigrarr;", "\u27FF");
+    entities.put("&eDDot;", "\u2A77");
+    entities.put("&eDot;", "\u2251");
+    entities.put("&eacute;", "\u00E9");
+    entities.put("&easter;", "\u2A6E");
+    entities.put("&ecaron;", "\u011B");
+    entities.put("&ecir;", "\u2256");
+    entities.put("&ecirc;", "\u00EA");
+    entities.put("&ecolon;", "\u2255");
+    entities.put("&ecy;", "\u044D");
+    entities.put("&edot;", "\u0117");
+    entities.put("&ee;", "\u2147");
+    entities.put("&efDot;", "\u2252");
+    entities.put("&efr;", "\uD835\uDD22");
+    entities.put("&eg;", "\u2A9A");
+    entities.put("&egrave;", "\u00E8");
+    entities.put("&egs;", "\u2A96");
+    entities.put("&egsdot;", "\u2A98");
+    entities.put("&el;", "\u2A99");
+    entities.put("&elinters;", "\u23E7");
+    entities.put("&ell;", "\u2113");
+    entities.put("&els;", "\u2A95");
+    entities.put("&elsdot;", "\u2A97");
+    entities.put("&emacr;", "\u0113");
+    entities.put("&empty;", "\u2205");
+    entities.put("&emptyset;", "\u2205");
+    entities.put("&emptyv;", "\u2205");
+    entities.put("&emsp13;", "\u2004");
+    entities.put("&emsp14;", "\u2005");
+    entities.put("&emsp;", "\u2003");
+    entities.put("&eng;", "\u014B");
+    entities.put("&ensp;", "\u2002");
+    entities.put("&eogon;", "\u0119");
+    entities.put("&eopf;", "\uD835\uDD56");
+    entities.put("&epar;", "\u22D5");
+    entities.put("&eparsl;", "\u29E3");
+    entities.put("&eplus;", "\u2A71");
+    entities.put("&epsi;", "\u03B5");
+    entities.put("&epsilon;", "\u03B5");
+    entities.put("&epsiv;", "\u03F5");
+    entities.put("&eqcirc;", "\u2256");
+    entities.put("&eqcolon;", "\u2255");
+    entities.put("&eqsim;", "\u2242");
+    entities.put("&eqslantgtr;", "\u2A96");
+    entities.put("&eqslantless;", "\u2A95");
+    entities.put("&equals;", "\u003D");
+    entities.put("&equest;", "\u225F");
+    entities.put("&equiv;", "\u2261");
+    entities.put("&equivDD;", "\u2A78");
+    entities.put("&eqvparsl;", "\u29E5");
+    entities.put("&erDot;", "\u2253");
+    entities.put("&erarr;", "\u2971");
+    entities.put("&escr;", "\u212F");
+    entities.put("&esdot;", "\u2250");
+    entities.put("&esim;", "\u2242");
+    entities.put("&eta;", "\u03B7");
+    entities.put("&eth;", "\u00F0");
+    entities.put("&euml;", "\u00EB");
+    entities.put("&euro;", "\u20AC");
+    entities.put("&excl;", "\u0021");
+    entities.put("&exist;", "\u2203");
+    entities.put("&expectation;", "\u2130");
+    entities.put("&exponentiale;", "\u2147");
+    entities.put("&fallingdotseq;", "\u2252");
+    entities.put("&fcy;", "\u0444");
+    entities.put("&female;", "\u2640");
+    entities.put("&ffilig;", "\uFB03");
+    entities.put("&fflig;", "\uFB00");
+    entities.put("&ffllig;", "\uFB04");
+    entities.put("&ffr;", "\uD835\uDD23");
+    entities.put("&filig;", "\uFB01");
+    entities.put("&fjlig;", "\u0066\u006A");
+    entities.put("&flat;", "\u266D");
+    entities.put("&fllig;", "\uFB02");
+    entities.put("&fltns;", "\u25B1");
+    entities.put("&fnof;", "\u0192");
+    entities.put("&fopf;", "\uD835\uDD57");
+    entities.put("&forall;", "\u2200");
+    entities.put("&fork;", "\u22D4");
+    entities.put("&forkv;", "\u2AD9");
+    entities.put("&fpartint;", "\u2A0D");
+    entities.put("&frac12;", "\u00BD");
+    entities.put("&frac13;", "\u2153");
+    entities.put("&frac14;", "\u00BC");
+    entities.put("&frac15;", "\u2155");
+    entities.put("&frac16;", "\u2159");
+    entities.put("&frac18;", "\u215B");
+    entities.put("&frac23;", "\u2154");
+    entities.put("&frac25;", "\u2156");
+    entities.put("&frac34;", "\u00BE");
+    entities.put("&frac35;", "\u2157");
+    entities.put("&frac38;", "\u215C");
+    entities.put("&frac45;", "\u2158");
+    entities.put("&frac56;", "\u215A");
+    entities.put("&frac58;", "\u215D");
+    entities.put("&frac78;", "\u215E");
+    entities.put("&frasl;", "\u2044");
+    entities.put("&frown;", "\u2322");
+    entities.put("&fscr;", "\uD835\uDCBB");
+    entities.put("&gE;", "\u2267");
+    entities.put("&gEl;", "\u2A8C");
+    entities.put("&gacute;", "\u01F5");
+    entities.put("&gamma;", "\u03B3");
+    entities.put("&gammad;", "\u03DD");
+    entities.put("&gap;", "\u2A86");
+    entities.put("&gbreve;", "\u011F");
+    entities.put("&gcirc;", "\u011D");
+    entities.put("&gcy;", "\u0433");
+    entities.put("&gdot;", "\u0121");
+    entities.put("&ge;", "\u2265");
+    entities.put("&gel;", "\u22DB");
+    entities.put("&geq;", "\u2265");
+    entities.put("&geqq;", "\u2267");
+    entities.put("&geqslant;", "\u2A7E");
+    entities.put("&ges;", "\u2A7E");
+    entities.put("&gescc;", "\u2AA9");
+    entities.put("&gesdot;", "\u2A80");
+    entities.put("&gesdoto;", "\u2A82");
+    entities.put("&gesdotol;", "\u2A84");
+    entities.put("&gesl;", "\u22DB\uFE00");
+    entities.put("&gesles;", "\u2A94");
+    entities.put("&gfr;", "\uD835\uDD24");
+    entities.put("&gg;", "\u226B");
+    entities.put("&ggg;", "\u22D9");
+    entities.put("&gimel;", "\u2137");
+    entities.put("&gjcy;", "\u0453");
+    entities.put("&gl;", "\u2277");
+    entities.put("&glE;", "\u2A92");
+    entities.put("&gla;", "\u2AA5");
+    entities.put("&glj;", "\u2AA4");
+    entities.put("&gnE;", "\u2269");
+    entities.put("&gnap;", "\u2A8A");
+    entities.put("&gnapprox;", "\u2A8A");
+    entities.put("&gne;", "\u2A88");
+    entities.put("&gneq;", "\u2A88");
+    entities.put("&gneqq;", "\u2269");
+    entities.put("&gnsim;", "\u22E7");
+    entities.put("&gopf;", "\uD835\uDD58");
+    entities.put("&grave;", "\u0060");
+    entities.put("&gscr;", "\u210A");
+    entities.put("&gsim;", "\u2273");
+    entities.put("&gsime;", "\u2A8E");
+    entities.put("&gsiml;", "\u2A90");
+    entities.put("&gt;", "\u003E");
+    entities.put("&gtcc;", "\u2AA7");
+    entities.put("&gtcir;", "\u2A7A");
+    entities.put("&gtdot;", "\u22D7");
+    entities.put("&gtlPar;", "\u2995");
+    entities.put("&gtquest;", "\u2A7C");
+    entities.put("&gtrapprox;", "\u2A86");
+    entities.put("&gtrarr;", "\u2978");
+    entities.put("&gtrdot;", "\u22D7");
+    entities.put("&gtreqless;", "\u22DB");
+    entities.put("&gtreqqless;", "\u2A8C");
+    entities.put("&gtrless;", "\u2277");
+    entities.put("&gtrsim;", "\u2273");
+    entities.put("&gvertneqq;", "\u2269\uFE00");
+    entities.put("&gvnE;", "\u2269\uFE00");
+    entities.put("&hArr;", "\u21D4");
+    entities.put("&hairsp;", "\u200A");
+    entities.put("&half;", "\u00BD");
+    entities.put("&hamilt;", "\u210B");
+    entities.put("&hardcy;", "\u044A");
+    entities.put("&harr;", "\u2194");
+    entities.put("&harrcir;", "\u2948");
+    entities.put("&harrw;", "\u21AD");
+    entities.put("&hbar;", "\u210F");
+    entities.put("&hcirc;", "\u0125");
+    entities.put("&hearts;", "\u2665");
+    entities.put("&heartsuit;", "\u2665");
+    entities.put("&hellip;", "\u2026");
+    entities.put("&hercon;", "\u22B9");
+    entities.put("&hfr;", "\uD835\uDD25");
+    entities.put("&hksearow;", "\u2925");
+    entities.put("&hkswarow;", "\u2926");
+    entities.put("&hoarr;", "\u21FF");
+    entities.put("&homtht;", "\u223B");
+    entities.put("&hookleftarrow;", "\u21A9");
+    entities.put("&hookrightarrow;", "\u21AA");
+    entities.put("&hopf;", "\uD835\uDD59");
+    entities.put("&horbar;", "\u2015");
+    entities.put("&hscr;", "\uD835\uDCBD");
+    entities.put("&hslash;", "\u210F");
+    entities.put("&hstrok;", "\u0127");
+    entities.put("&hybull;", "\u2043");
+    entities.put("&hyphen;", "\u2010");
+    entities.put("&iacute;", "\u00ED");
+    entities.put("&ic;", "\u2063");
+    entities.put("&icirc;", "\u00EE");
+    entities.put("&icy;", "\u0438");
+    entities.put("&iecy;", "\u0435");
+    entities.put("&iexcl;", "\u00A1");
+    entities.put("&iff;", "\u21D4");
+    entities.put("&ifr;", "\uD835\uDD26");
+    entities.put("&igrave;", "\u00EC");
+    entities.put("&ii;", "\u2148");
+    entities.put("&iiiint;", "\u2A0C");
+    entities.put("&iiint;", "\u222D");
+    entities.put("&iinfin;", "\u29DC");
+    entities.put("&iiota;", "\u2129");
+    entities.put("&ijlig;", "\u0133");
+    entities.put("&imacr;", "\u012B");
+    entities.put("&image;", "\u2111");
+    entities.put("&imagline;", "\u2110");
+    entities.put("&imagpart;", "\u2111");
+    entities.put("&imath;", "\u0131");
+    entities.put("&imof;", "\u22B7");
+    entities.put("&imped;", "\u01B5");
+    entities.put("&in;", "\u2208");
+    entities.put("&incare;", "\u2105");
+    entities.put("&infin;", "\u221E");
+    entities.put("&infintie;", "\u29DD");
+    entities.put("&inodot;", "\u0131");
+    entities.put("&int;", "\u222B");
+    entities.put("&intcal;", "\u22BA");
+    entities.put("&integers;", "\u2124");
+    entities.put("&intercal;", "\u22BA");
+    entities.put("&intlarhk;", "\u2A17");
+    entities.put("&intprod;", "\u2A3C");
+    entities.put("&iocy;", "\u0451");
+    entities.put("&iogon;", "\u012F");
+    entities.put("&iopf;", "\uD835\uDD5A");
+    entities.put("&iota;", "\u03B9");
+    entities.put("&iprod;", "\u2A3C");
+    entities.put("&iquest;", "\u00BF");
+    entities.put("&iscr;", "\uD835\uDCBE");
+    entities.put("&isin;", "\u2208");
+    entities.put("&isinE;", "\u22F9");
+    entities.put("&isindot;", "\u22F5");
+    entities.put("&isins;", "\u22F4");
+    entities.put("&isinsv;", "\u22F3");
+    entities.put("&isinv;", "\u2208");
+    entities.put("&it;", "\u2062");
+    entities.put("&itilde;", "\u0129");
+    entities.put("&iukcy;", "\u0456");
+    entities.put("&iuml;", "\u00EF");
+    entities.put("&jcirc;", "\u0135");
+    entities.put("&jcy;", "\u0439");
+    entities.put("&jfr;", "\uD835\uDD27");
+    entities.put("&jmath;", "\u0237");
+    entities.put("&jopf;", "\uD835\uDD5B");
+    entities.put("&jscr;", "\uD835\uDCBF");
+    entities.put("&jsercy;", "\u0458");
+    entities.put("&jukcy;", "\u0454");
+    entities.put("&kappa;", "\u03BA");
+    entities.put("&kappav;", "\u03F0");
+    entities.put("&kcedil;", "\u0137");
+    entities.put("&kcy;", "\u043A");
+    entities.put("&kfr;", "\uD835\uDD28");
+    entities.put("&kgreen;", "\u0138");
+    entities.put("&khcy;", "\u0445");
+    entities.put("&kjcy;", "\u045C");
+    entities.put("&kopf;", "\uD835\uDD5C");
+    entities.put("&kscr;", "\uD835\uDCC0");
+    entities.put("&lAarr;", "\u21DA");
+    entities.put("&lArr;", "\u21D0");
+    entities.put("&lAtail;", "\u291B");
+    entities.put("&lBarr;", "\u290E");
+    entities.put("&lE;", "\u2266");
+    entities.put("&lEg;", "\u2A8B");
+    entities.put("&lHar;", "\u2962");
+    entities.put("&lacute;", "\u013A");
+    entities.put("&laemptyv;", "\u29B4");
+    entities.put("&lagran;", "\u2112");
+    entities.put("&lambda;", "\u03BB");
+    entities.put("&lang;", "\u27E8");
+    entities.put("&langd;", "\u2991");
+    entities.put("&langle;", "\u27E8");
+    entities.put("&lap;", "\u2A85");
+    entities.put("&laquo;", "\u00AB");
+    entities.put("&larr;", "\u2190");
+    entities.put("&larrb;", "\u21E4");
+    entities.put("&larrbfs;", "\u291F");
+    entities.put("&larrfs;", "\u291D");
+    entities.put("&larrhk;", "\u21A9");
+    entities.put("&larrlp;", "\u21AB");
+    entities.put("&larrpl;", "\u2939");
+    entities.put("&larrsim;", "\u2973");
+    entities.put("&larrtl;", "\u21A2");
+    entities.put("&lat;", "\u2AAB");
+    entities.put("&latail;", "\u2919");
+    entities.put("&late;", "\u2AAD");
+    entities.put("&lates;", "\u2AAD\uFE00");
+    entities.put("&lbarr;", "\u290C");
+    entities.put("&lbbrk;", "\u2772");
+    entities.put("&lbrace;", "\u007B");
+    entities.put("&lbrack;", "\u005B");
+    entities.put("&lbrke;", "\u298B");
+    entities.put("&lbrksld;", "\u298F");
+    entities.put("&lbrkslu;", "\u298D");
+    entities.put("&lcaron;", "\u013E");
+    entities.put("&lcedil;", "\u013C");
+    entities.put("&lceil;", "\u2308");
+    entities.put("&lcub;", "\u007B");
+    entities.put("&lcy;", "\u043B");
+    entities.put("&ldca;", "\u2936");
+    entities.put("&ldquo;", "\u201C");
+    entities.put("&ldquor;", "\u201E");
+    entities.put("&ldrdhar;", "\u2967");
+    entities.put("&ldrushar;", "\u294B");
+    entities.put("&ldsh;", "\u21B2");
+    entities.put("&le;", "\u2264");
+    entities.put("&leftarrow;", "\u2190");
+    entities.put("&leftarrowtail;", "\u21A2");
+    entities.put("&leftharpoondown;", "\u21BD");
+    entities.put("&leftharpoonup;", "\u21BC");
+    entities.put("&leftleftarrows;", "\u21C7");
+    entities.put("&leftrightarrow;", "\u2194");
+    entities.put("&leftrightarrows;", "\u21C6");
+    entities.put("&leftrightharpoons;", "\u21CB");
+    entities.put("&leftrightsquigarrow;", "\u21AD");
+    entities.put("&leftthreetimes;", "\u22CB");
+    entities.put("&leg;", "\u22DA");
+    entities.put("&leq;", "\u2264");
+    entities.put("&leqq;", "\u2266");
+    entities.put("&leqslant;", "\u2A7D");
+    entities.put("&les;", "\u2A7D");
+    entities.put("&lescc;", "\u2AA8");
+    entities.put("&lesdot;", "\u2A7F");
+    entities.put("&lesdoto;", "\u2A81");
+    entities.put("&lesdotor;", "\u2A83");
+    entities.put("&lesg;", "\u22DA\uFE00");
+    entities.put("&lesges;", "\u2A93");
+    entities.put("&lessapprox;", "\u2A85");
+    entities.put("&lessdot;", "\u22D6");
+    entities.put("&lesseqgtr;", "\u22DA");
+    entities.put("&lesseqqgtr;", "\u2A8B");
+    entities.put("&lessgtr;", "\u2276");
+    entities.put("&lesssim;", "\u2272");
+    entities.put("&lfisht;", "\u297C");
+    entities.put("&lfloor;", "\u230A");
+    entities.put("&lfr;", "\uD835\uDD29");
+    entities.put("&lg;", "\u2276");
+    entities.put("&lgE;", "\u2A91");
+    entities.put("&lhard;", "\u21BD");
+    entities.put("&lharu;", "\u21BC");
+    entities.put("&lharul;", "\u296A");
+    entities.put("&lhblk;", "\u2584");
+    entities.put("&ljcy;", "\u0459");
+    entities.put("&ll;", "\u226A");
+    entities.put("&llarr;", "\u21C7");
+    entities.put("&llcorner;", "\u231E");
+    entities.put("&llhard;", "\u296B");
+    entities.put("&lltri;", "\u25FA");
+    entities.put("&lmidot;", "\u0140");
+    entities.put("&lmoust;", "\u23B0");
+    entities.put("&lmoustache;", "\u23B0");
+    entities.put("&lnE;", "\u2268");
+    entities.put("&lnap;", "\u2A89");
+    entities.put("&lnapprox;", "\u2A89");
+    entities.put("&lne;", "\u2A87");
+    entities.put("&lneq;", "\u2A87");
+    entities.put("&lneqq;", "\u2268");
+    entities.put("&lnsim;", "\u22E6");
+    entities.put("&loang;", "\u27EC");
+    entities.put("&loarr;", "\u21FD");
+    entities.put("&lobrk;", "\u27E6");
+    entities.put("&longleftarrow;", "\u27F5");
+    entities.put("&longleftrightarrow;", "\u27F7");
+    entities.put("&longmapsto;", "\u27FC");
+    entities.put("&longrightarrow;", "\u27F6");
+    entities.put("&looparrowleft;", "\u21AB");
+    entities.put("&looparrowright;", "\u21AC");
+    entities.put("&lopar;", "\u2985");
+    entities.put("&lopf;", "\uD835\uDD5D");
+    entities.put("&loplus;", "\u2A2D");
+    entities.put("&lotimes;", "\u2A34");
+    entities.put("&lowast;", "\u2217");
+    entities.put("&lowbar;", "\u005F");
+    entities.put("&loz;", "\u25CA");
+    entities.put("&lozenge;", "\u25CA");
+    entities.put("&lozf;", "\u29EB");
+    entities.put("&lpar;", "\u0028");
+    entities.put("&lparlt;", "\u2993");
+    entities.put("&lrarr;", "\u21C6");
+    entities.put("&lrcorner;", "\u231F");
+    entities.put("&lrhar;", "\u21CB");
+    entities.put("&lrhard;", "\u296D");
+    entities.put("&lrm;", "\u200E");
+    entities.put("&lrtri;", "\u22BF");
+    entities.put("&lsaquo;", "\u2039");
+    entities.put("&lscr;", "\uD835\uDCC1");
+    entities.put("&lsh;", "\u21B0");
+    entities.put("&lsim;", "\u2272");
+    entities.put("&lsime;", "\u2A8D");
+    entities.put("&lsimg;", "\u2A8F");
+    entities.put("&lsqb;", "\u005B");
+    entities.put("&lsquo;", "\u2018");
+    entities.put("&lsquor;", "\u201A");
+    entities.put("&lstrok;", "\u0142");
+    entities.put("&lt;", "\u003C");
+    entities.put("&ltcc;", "\u2AA6");
+    entities.put("&ltcir;", "\u2A79");
+    entities.put("&ltdot;", "\u22D6");
+    entities.put("&lthree;", "\u22CB");
+    entities.put("&ltimes;", "\u22C9");
+    entities.put("&ltlarr;", "\u2976");
+    entities.put("&ltquest;", "\u2A7B");
+    entities.put("&ltrPar;", "\u2996");
+    entities.put("&ltri;", "\u25C3");
+    entities.put("&ltrie;", "\u22B4");
+    entities.put("&ltrif;", "\u25C2");
+    entities.put("&lurdshar;", "\u294A");
+    entities.put("&luruhar;", "\u2966");
+    entities.put("&lvertneqq;", "\u2268\uFE00");
+    entities.put("&lvnE;", "\u2268\uFE00");
+    entities.put("&mDDot;", "\u223A");
+    entities.put("&macr;", "\u00AF");
+    entities.put("&male;", "\u2642");
+    entities.put("&malt;", "\u2720");
+    entities.put("&maltese;", "\u2720");
+    entities.put("&map;", "\u21A6");
+    entities.put("&mapsto;", "\u21A6");
+    entities.put("&mapstodown;", "\u21A7");
+    entities.put("&mapstoleft;", "\u21A4");
+    entities.put("&mapstoup;", "\u21A5");
+    entities.put("&marker;", "\u25AE");
+    entities.put("&mcomma;", "\u2A29");
+    entities.put("&mcy;", "\u043C");
+    entities.put("&mdash;", "\u2014");
+    entities.put("&measuredangle;", "\u2221");
+    entities.put("&mfr;", "\uD835\uDD2A");
+    entities.put("&mho;", "\u2127");
+    entities.put("&micro;", "\u00B5");
+    entities.put("&mid;", "\u2223");
+    entities.put("&midast;", "\u002A");
+    entities.put("&midcir;", "\u2AF0");
+    entities.put("&middot;", "\u00B7");
+    entities.put("&minus;", "\u2212");
+    entities.put("&minusb;", "\u229F");
+    entities.put("&minusd;", "\u2238");
+    entities.put("&minusdu;", "\u2A2A");
+    entities.put("&mlcp;", "\u2ADB");
+    entities.put("&mldr;", "\u2026");
+    entities.put("&mnplus;", "\u2213");
+    entities.put("&models;", "\u22A7");
+    entities.put("&mopf;", "\uD835\uDD5E");
+    entities.put("&mp;", "\u2213");
+    entities.put("&mscr;", "\uD835\uDCC2");
+    entities.put("&mstpos;", "\u223E");
+    entities.put("&mu;", "\u03BC");
+    entities.put("&multimap;", "\u22B8");
+    entities.put("&mumap;", "\u22B8");
+    entities.put("&nGg;", "\u22D9\u0338");
+    entities.put("&nGt;", "\u226B\u20D2");
+    entities.put("&nGtv;", "\u226B\u0338");
+    entities.put("&nLeftarrow;", "\u21CD");
+    entities.put("&nLeftrightarrow;", "\u21CE");
+    entities.put("&nLl;", "\u22D8\u0338");
+    entities.put("&nLt;", "\u226A\u20D2");
+    entities.put("&nLtv;", "\u226A\u0338");
+    entities.put("&nRightarrow;", "\u21CF");
+    entities.put("&nVDash;", "\u22AF");
+    entities.put("&nVdash;", "\u22AE");
+    entities.put("&nabla;", "\u2207");
+    entities.put("&nacute;", "\u0144");
+    entities.put("&nang;", "\u2220\u20D2");
+    entities.put("&nap;", "\u2249");
+    entities.put("&napE;", "\u2A70\u0338");
+    entities.put("&napid;", "\u224B\u0338");
+    entities.put("&napos;", "\u0149");
+    entities.put("&napprox;", "\u2249");
+    entities.put("&natur;", "\u266E");
+    entities.put("&natural;", "\u266E");
+    entities.put("&naturals;", "\u2115");
+    entities.put("&nbsp;", "\u00A0");
+    entities.put("&nbump;", "\u224E\u0338");
+    entities.put("&nbumpe;", "\u224F\u0338");
+    entities.put("&ncap;", "\u2A43");
+    entities.put("&ncaron;", "\u0148");
+    entities.put("&ncedil;", "\u0146");
+    entities.put("&ncong;", "\u2247");
+    entities.put("&ncongdot;", "\u2A6D\u0338");
+    entities.put("&ncup;", "\u2A42");
+    entities.put("&ncy;", "\u043D");
+    entities.put("&ndash;", "\u2013");
+    entities.put("&ne;", "\u2260");
+    entities.put("&neArr;", "\u21D7");
+    entities.put("&nearhk;", "\u2924");
+    entities.put("&nearr;", "\u2197");
+    entities.put("&nearrow;", "\u2197");
+    entities.put("&nedot;", "\u2250\u0338");
+    entities.put("&nequiv;", "\u2262");
+    entities.put("&nesear;", "\u2928");
+    entities.put("&nesim;", "\u2242\u0338");
+    entities.put("&nexist;", "\u2204");
+    entities.put("&nexists;", "\u2204");
+    entities.put("&nfr;", "\uD835\uDD2B");
+    entities.put("&ngE;", "\u2267\u0338");
+    entities.put("&nge;", "\u2271");
+    entities.put("&ngeq;", "\u2271");
+    entities.put("&ngeqq;", "\u2267\u0338");
+    entities.put("&ngeqslant;", "\u2A7E\u0338");
+    entities.put("&nges;", "\u2A7E\u0338");
+    entities.put("&ngsim;", "\u2275");
+    entities.put("&ngt;", "\u226F");
+    entities.put("&ngtr;", "\u226F");
+    entities.put("&nhArr;", "\u21CE");
+    entities.put("&nharr;", "\u21AE");
+    entities.put("&nhpar;", "\u2AF2");
+    entities.put("&ni;", "\u220B");
+    entities.put("&nis;", "\u22FC");
+    entities.put("&nisd;", "\u22FA");
+    entities.put("&niv;", "\u220B");
+    entities.put("&njcy;", "\u045A");
+    entities.put("&nlArr;", "\u21CD");
+    entities.put("&nlE;", "\u2266\u0338");
+    entities.put("&nlarr;", "\u219A");
+    entities.put("&nldr;", "\u2025");
+    entities.put("&nle;", "\u2270");
+    entities.put("&nleftarrow;", "\u219A");
+    entities.put("&nleftrightarrow;", "\u21AE");
+    entities.put("&nleq;", "\u2270");
+    entities.put("&nleqq;", "\u2266\u0338");
+    entities.put("&nleqslant;", "\u2A7D\u0338");
+    entities.put("&nles;", "\u2A7D\u0338");
+    entities.put("&nless;", "\u226E");
+    entities.put("&nlsim;", "\u2274");
+    entities.put("&nlt;", "\u226E");
+    entities.put("&nltri;", "\u22EA");
+    entities.put("&nltrie;", "\u22EC");
+    entities.put("&nmid;", "\u2224");
+    entities.put("&nopf;", "\uD835\uDD5F");
+    entities.put("&not;", "\u00AC");
+    entities.put("&notin;", "\u2209");
+    entities.put("&notinE;", "\u22F9\u0338");
+    entities.put("&notindot;", "\u22F5\u0338");
+    entities.put("&notinva;", "\u2209");
+    entities.put("&notinvb;", "\u22F7");
+    entities.put("&notinvc;", "\u22F6");
+    entities.put("&notni;", "\u220C");
+    entities.put("&notniva;", "\u220C");
+    entities.put("&notnivb;", "\u22FE");
+    entities.put("&notnivc;", "\u22FD");
+    entities.put("&npar;", "\u2226");
+    entities.put("&nparallel;", "\u2226");
+    entities.put("&nparsl;", "\u2AFD\u20E5");
+    entities.put("&npart;", "\u2202\u0338");
+    entities.put("&npolint;", "\u2A14");
+    entities.put("&npr;", "\u2280");
+    entities.put("&nprcue;", "\u22E0");
+    entities.put("&npre;", "\u2AAF\u0338");
+    entities.put("&nprec;", "\u2280");
+    entities.put("&npreceq;", "\u2AAF\u0338");
+    entities.put("&nrArr;", "\u21CF");
+    entities.put("&nrarr;", "\u219B");
+    entities.put("&nrarrc;", "\u2933\u0338");
+    entities.put("&nrarrw;", "\u219D\u0338");
+    entities.put("&nrightarrow;", "\u219B");
+    entities.put("&nrtri;", "\u22EB");
+    entities.put("&nrtrie;", "\u22ED");
+    entities.put("&nsc;", "\u2281");
+    entities.put("&nsccue;", "\u22E1");
+    entities.put("&nsce;", "\u2AB0\u0338");
+    entities.put("&nscr;", "\uD835\uDCC3");
+    entities.put("&nshortmid;", "\u2224");
+    entities.put("&nshortparallel;", "\u2226");
+    entities.put("&nsim;", "\u2241");
+    entities.put("&nsime;", "\u2244");
+    entities.put("&nsimeq;", "\u2244");
+    entities.put("&nsmid;", "\u2224");
+    entities.put("&nspar;", "\u2226");
+    entities.put("&nsqsube;", "\u22E2");
+    entities.put("&nsqsupe;", "\u22E3");
+    entities.put("&nsub;", "\u2284");
+    entities.put("&nsubE;", "\u2AC5\u0338");
+    entities.put("&nsube;", "\u2288");
+    entities.put("&nsubset;", "\u2282\u20D2");
+    entities.put("&nsubseteq;", "\u2288");
+    entities.put("&nsubseteqq;", "\u2AC5\u0338");
+    entities.put("&nsucc;", "\u2281");
+    entities.put("&nsucceq;", "\u2AB0\u0338");
+    entities.put("&nsup;", "\u2285");
+    entities.put("&nsupE;", "\u2AC6\u0338");
+    entities.put("&nsupe;", "\u2289");
+    entities.put("&nsupset;", "\u2283\u20D2");
+    entities.put("&nsupseteq;", "\u2289");
+    entities.put("&nsupseteqq;", "\u2AC6\u0338");
+    entities.put("&ntgl;", "\u2279");
+    entities.put("&ntilde;", "\u00F1");
+    entities.put("&ntlg;", "\u2278");
+    entities.put("&ntriangleleft;", "\u22EA");
+    entities.put("&ntrianglelefteq;", "\u22EC");
+    entities.put("&ntriangleright;", "\u22EB");
+    entities.put("&ntrianglerighteq;", "\u22ED");
+    entities.put("&nu;", "\u03BD");
+    entities.put("&num;", "\u0023");
+    entities.put("&numero;", "\u2116");
+    entities.put("&numsp;", "\u2007");
+    entities.put("&nvDash;", "\u22AD");
+    entities.put("&nvHarr;", "\u2904");
+    entities.put("&nvap;", "\u224D\u20D2");
+    entities.put("&nvdash;", "\u22AC");
+    entities.put("&nvge;", "\u2265\u20D2");
+    entities.put("&nvgt;", "\u003E\u20D2");
+    entities.put("&nvinfin;", "\u29DE");
+    entities.put("&nvlArr;", "\u2902");
+    entities.put("&nvle;", "\u2264\u20D2");
+    entities.put("&nvlt;", "\u003C\u20D2");
+    entities.put("&nvltrie;", "\u22B4\u20D2");
+    entities.put("&nvrArr;", "\u2903");
+    entities.put("&nvrtrie;", "\u22B5\u20D2");
+    entities.put("&nvsim;", "\u223C\u20D2");
+    entities.put("&nwArr;", "\u21D6");
+    entities.put("&nwarhk;", "\u2923");
+    entities.put("&nwarr;", "\u2196");
+    entities.put("&nwarrow;", "\u2196");
+    entities.put("&nwnear;", "\u2927");
+    entities.put("&oS;", "\u24C8");
+    entities.put("&oacute;", "\u00F3");
+    entities.put("&oast;", "\u229B");
+    entities.put("&ocir;", "\u229A");
+    entities.put("&ocirc;", "\u00F4");
+    entities.put("&ocy;", "\u043E");
+    entities.put("&odash;", "\u229D");
+    entities.put("&odblac;", "\u0151");
+    entities.put("&odiv;", "\u2A38");
+    entities.put("&odot;", "\u2299");
+    entities.put("&odsold;", "\u29BC");
+    entities.put("&oelig;", "\u0153");
+    entities.put("&ofcir;", "\u29BF");
+    entities.put("&ofr;", "\uD835\uDD2C");
+    entities.put("&ogon;", "\u02DB");
+    entities.put("&ograve;", "\u00F2");
+    entities.put("&ogt;", "\u29C1");
+    entities.put("&ohbar;", "\u29B5");
+    entities.put("&ohm;", "\u03A9");
+    entities.put("&oint;", "\u222E");
+    entities.put("&olarr;", "\u21BA");
+    entities.put("&olcir;", "\u29BE");
+    entities.put("&olcross;", "\u29BB");
+    entities.put("&oline;", "\u203E");
+    entities.put("&olt;", "\u29C0");
+    entities.put("&omacr;", "\u014D");
+    entities.put("&omega;", "\u03C9");
+    entities.put("&omicron;", "\u03BF");
+    entities.put("&omid;", "\u29B6");
+    entities.put("&ominus;", "\u2296");
+    entities.put("&oopf;", "\uD835\uDD60");
+    entities.put("&opar;", "\u29B7");
+    entities.put("&operp;", "\u29B9");
+    entities.put("&oplus;", "\u2295");
+    entities.put("&or;", "\u2228");
+    entities.put("&orarr;", "\u21BB");
+    entities.put("&ord;", "\u2A5D");
+    entities.put("&order;", "\u2134");
+    entities.put("&orderof;", "\u2134");
+    entities.put("&ordf;", "\u00AA");
+    entities.put("&ordm;", "\u00BA");
+    entities.put("&origof;", "\u22B6");
+    entities.put("&oror;", "\u2A56");
+    entities.put("&orslope;", "\u2A57");
+    entities.put("&orv;", "\u2A5B");
+    entities.put("&oscr;", "\u2134");
+    entities.put("&oslash;", "\u00F8");
+    entities.put("&osol;", "\u2298");
+    entities.put("&otilde;", "\u00F5");
+    entities.put("&otimes;", "\u2297");
+    entities.put("&otimesas;", "\u2A36");
+    entities.put("&ouml;", "\u00F6");
+    entities.put("&ovbar;", "\u233D");
+    entities.put("&par;", "\u2225");
+    entities.put("&para;", "\u00B6");
+    entities.put("&parallel;", "\u2225");
+    entities.put("&parsim;", "\u2AF3");
+    entities.put("&parsl;", "\u2AFD");
+    entities.put("&part;", "\u2202");
+    entities.put("&pcy;", "\u043F");
+    entities.put("&percnt;", "\u0025");
+    entities.put("&period;", "\u002E");
+    entities.put("&permil;", "\u2030");
+    entities.put("&perp;", "\u22A5");
+    entities.put("&pertenk;", "\u2031");
+    entities.put("&pfr;", "\uD835\uDD2D");
+    entities.put("&phi;", "\u03C6");
+    entities.put("&phiv;", "\u03D5");
+    entities.put("&phmmat;", "\u2133");
+    entities.put("&phone;", "\u260E");
+    entities.put("&pi;", "\u03C0");
+    entities.put("&pitchfork;", "\u22D4");
+    entities.put("&piv;", "\u03D6");
+    entities.put("&planck;", "\u210F");
+    entities.put("&planckh;", "\u210E");
+    entities.put("&plankv;", "\u210F");
+    entities.put("&plus;", "\u002B");
+    entities.put("&plusacir;", "\u2A23");
+    entities.put("&plusb;", "\u229E");
+    entities.put("&pluscir;", "\u2A22");
+    entities.put("&plusdo;", "\u2214");
+    entities.put("&plusdu;", "\u2A25");
+    entities.put("&pluse;", "\u2A72");
+    entities.put("&plusmn;", "\u00B1");
+    entities.put("&plussim;", "\u2A26");
+    entities.put("&plustwo;", "\u2A27");
+    entities.put("&pm;", "\u00B1");
+    entities.put("&pointint;", "\u2A15");
+    entities.put("&popf;", "\uD835\uDD61");
+    entities.put("&pound;", "\u00A3");
+    entities.put("&pr;", "\u227A");
+    entities.put("&prE;", "\u2AB3");
+    entities.put("&prap;", "\u2AB7");
+    entities.put("&prcue;", "\u227C");
+    entities.put("&pre;", "\u2AAF");
+    entities.put("&prec;", "\u227A");
+    entities.put("&precapprox;", "\u2AB7");
+    entities.put("&preccurlyeq;", "\u227C");
+    entities.put("&preceq;", "\u2AAF");
+    entities.put("&precnapprox;", "\u2AB9");
+    entities.put("&precneqq;", "\u2AB5");
+    entities.put("&precnsim;", "\u22E8");
+    entities.put("&precsim;", "\u227E");
+    entities.put("&prime;", "\u2032");
+    entities.put("&primes;", "\u2119");
+    entities.put("&prnE;", "\u2AB5");
+    entities.put("&prnap;", "\u2AB9");
+    entities.put("&prnsim;", "\u22E8");
+    entities.put("&prod;", "\u220F");
+    entities.put("&profalar;", "\u232E");
+    entities.put("&profline;", "\u2312");
+    entities.put("&profsurf;", "\u2313");
+    entities.put("&prop;", "\u221D");
+    entities.put("&propto;", "\u221D");
+    entities.put("&prsim;", "\u227E");
+    entities.put("&prurel;", "\u22B0");
+    entities.put("&pscr;", "\uD835\uDCC5");
+    entities.put("&psi;", "\u03C8");
+    entities.put("&puncsp;", "\u2008");
+    entities.put("&qfr;", "\uD835\uDD2E");
+    entities.put("&qint;", "\u2A0C");
+    entities.put("&qopf;", "\uD835\uDD62");
+    entities.put("&qprime;", "\u2057");
+    entities.put("&qscr;", "\uD835\uDCC6");
+    entities.put("&quaternions;", "\u210D");
+    entities.put("&quatint;", "\u2A16");
+    entities.put("&quest;", "\u003F");
+    entities.put("&questeq;", "\u225F");
+    entities.put("&quot;", "\\u0022");
+    entities.put("&rAarr;", "\u21DB");
+    entities.put("&rArr;", "\u21D2");
+    entities.put("&rAtail;", "\u291C");
+    entities.put("&rBarr;", "\u290F");
+    entities.put("&rHar;", "\u2964");
+    entities.put("&race;", "\u223D\u0331");
+    entities.put("&racute;", "\u0155");
+    entities.put("&radic;", "\u221A");
+    entities.put("&raemptyv;", "\u29B3");
+    entities.put("&rang;", "\u27E9");
+    entities.put("&rangd;", "\u2992");
+    entities.put("&range;", "\u29A5");
+    entities.put("&rangle;", "\u27E9");
+    entities.put("&raquo;", "\u00BB");
+    entities.put("&rarr;", "\u2192");
+    entities.put("&rarrap;", "\u2975");
+    entities.put("&rarrb;", "\u21E5");
+    entities.put("&rarrbfs;", "\u2920");
+    entities.put("&rarrc;", "\u2933");
+    entities.put("&rarrfs;", "\u291E");
+    entities.put("&rarrhk;", "\u21AA");
+    entities.put("&rarrlp;", "\u21AC");
+    entities.put("&rarrpl;", "\u2945");
+    entities.put("&rarrsim;", "\u2974");
+    entities.put("&rarrtl;", "\u21A3");
+    entities.put("&rarrw;", "\u219D");
+    entities.put("&ratail;", "\u291A");
+    entities.put("&ratio;", "\u2236");
+    entities.put("&rationals;", "\u211A");
+    entities.put("&rbarr;", "\u290D");
+    entities.put("&rbbrk;", "\u2773");
+    entities.put("&rbrace;", "\u007D");
+    entities.put("&rbrack;", "\u005D");
+    entities.put("&rbrke;", "\u298C");
+    entities.put("&rbrksld;", "\u298E");
+    entities.put("&rbrkslu;", "\u2990");
+    entities.put("&rcaron;", "\u0159");
+    entities.put("&rcedil;", "\u0157");
+    entities.put("&rceil;", "\u2309");
+    entities.put("&rcub;", "\u007D");
+    entities.put("&rcy;", "\u0440");
+    entities.put("&rdca;", "\u2937");
+    entities.put("&rdldhar;", "\u2969");
+    entities.put("&rdquo;", "\u201D");
+    entities.put("&rdquor;", "\u201D");
+    entities.put("&rdsh;", "\u21B3");
+    entities.put("&real;", "\u211C");
+    entities.put("&realine;", "\u211B");
+    entities.put("&realpart;", "\u211C");
+    entities.put("&reals;", "\u211D");
+    entities.put("&rect;", "\u25AD");
+    entities.put("&reg;", "\u00AE");
+    entities.put("&rfisht;", "\u297D");
+    entities.put("&rfloor;", "\u230B");
+    entities.put("&rfr;", "\uD835\uDD2F");
+    entities.put("&rhard;", "\u21C1");
+    entities.put("&rharu;", "\u21C0");
+    entities.put("&rharul;", "\u296C");
+    entities.put("&rho;", "\u03C1");
+    entities.put("&rhov;", "\u03F1");
+    entities.put("&rightarrow;", "\u2192");
+    entities.put("&rightarrowtail;", "\u21A3");
+    entities.put("&rightharpoondown;", "\u21C1");
+    entities.put("&rightharpoonup;", "\u21C0");
+    entities.put("&rightleftarrows;", "\u21C4");
+    entities.put("&rightleftharpoons;", "\u21CC");
+    entities.put("&rightrightarrows;", "\u21C9");
+    entities.put("&rightsquigarrow;", "\u219D");
+    entities.put("&rightthreetimes;", "\u22CC");
+    entities.put("&ring;", "\u02DA");
+    entities.put("&risingdotseq;", "\u2253");
+    entities.put("&rlarr;", "\u21C4");
+    entities.put("&rlhar;", "\u21CC");
+    entities.put("&rlm;", "\u200F");
+    entities.put("&rmoust;", "\u23B1");
+    entities.put("&rmoustache;", "\u23B1");
+    entities.put("&rnmid;", "\u2AEE");
+    entities.put("&roang;", "\u27ED");
+    entities.put("&roarr;", "\u21FE");
+    entities.put("&robrk;", "\u27E7");
+    entities.put("&ropar;", "\u2986");
+    entities.put("&ropf;", "\uD835\uDD63");
+    entities.put("&roplus;", "\u2A2E");
+    entities.put("&rotimes;", "\u2A35");
+    entities.put("&rpar;", "\u0029");
+    entities.put("&rpargt;", "\u2994");
+    entities.put("&rppolint;", "\u2A12");
+    entities.put("&rrarr;", "\u21C9");
+    entities.put("&rsaquo;", "\u203A");
+    entities.put("&rscr;", "\uD835\uDCC7");
+    entities.put("&rsh;", "\u21B1");
+    entities.put("&rsqb;", "\u005D");
+    entities.put("&rsquo;", "\u2019");
+    entities.put("&rsquor;", "\u2019");
+    entities.put("&rthree;", "\u22CC");
+    entities.put("&rtimes;", "\u22CA");
+    entities.put("&rtri;", "\u25B9");
+    entities.put("&rtrie;", "\u22B5");
+    entities.put("&rtrif;", "\u25B8");
+    entities.put("&rtriltri;", "\u29CE");
+    entities.put("&ruluhar;", "\u2968");
+    entities.put("&rx;", "\u211E");
+    entities.put("&sacute;", "\u015B");
+    entities.put("&sbquo;", "\u201A");
+    entities.put("&sc;", "\u227B");
+    entities.put("&scE;", "\u2AB4");
+    entities.put("&scap;", "\u2AB8");
+    entities.put("&scaron;", "\u0161");
+    entities.put("&sccue;", "\u227D");
+    entities.put("&sce;", "\u2AB0");
+    entities.put("&scedil;", "\u015F");
+    entities.put("&scirc;", "\u015D");
+    entities.put("&scnE;", "\u2AB6");
+    entities.put("&scnap;", "\u2ABA");
+    entities.put("&scnsim;", "\u22E9");
+    entities.put("&scpolint;", "\u2A13");
+    entities.put("&scsim;", "\u227F");
+    entities.put("&scy;", "\u0441");
+    entities.put("&sdot;", "\u22C5");
+    entities.put("&sdotb;", "\u22A1");
+    entities.put("&sdote;", "\u2A66");
+    entities.put("&seArr;", "\u21D8");
+    entities.put("&searhk;", "\u2925");
+    entities.put("&searr;", "\u2198");
+    entities.put("&searrow;", "\u2198");
+    entities.put("&sect;", "\u00A7");
+    entities.put("&semi;", "\u003B");
+    entities.put("&seswar;", "\u2929");
+    entities.put("&setminus;", "\u2216");
+    entities.put("&setmn;", "\u2216");
+    entities.put("&sext;", "\u2736");
+    entities.put("&sfr;", "\uD835\uDD30");
+    entities.put("&sfrown;", "\u2322");
+    entities.put("&sharp;", "\u266F");
+    entities.put("&shchcy;", "\u0449");
+    entities.put("&shcy;", "\u0448");
+    entities.put("&shortmid;", "\u2223");
+    entities.put("&shortparallel;", "\u2225");
+    entities.put("&shy;", "\u00AD");
+    entities.put("&sigma;", "\u03C3");
+    entities.put("&sigmaf;", "\u03C2");
+    entities.put("&sigmav;", "\u03C2");
+    entities.put("&sim;", "\u223C");
+    entities.put("&simdot;", "\u2A6A");
+    entities.put("&sime;", "\u2243");
+    entities.put("&simeq;", "\u2243");
+    entities.put("&simg;", "\u2A9E");
+    entities.put("&simgE;", "\u2AA0");
+    entities.put("&siml;", "\u2A9D");
+    entities.put("&simlE;", "\u2A9F");
+    entities.put("&simne;", "\u2246");
+    entities.put("&simplus;", "\u2A24");
+    entities.put("&simrarr;", "\u2972");
+    entities.put("&slarr;", "\u2190");
+    entities.put("&smallsetminus;", "\u2216");
+    entities.put("&smashp;", "\u2A33");
+    entities.put("&smeparsl;", "\u29E4");
+    entities.put("&smid;", "\u2223");
+    entities.put("&smile;", "\u2323");
+    entities.put("&smt;", "\u2AAA");
+    entities.put("&smte;", "\u2AAC");
+    entities.put("&smtes;", "\u2AAC\uFE00");
+    entities.put("&softcy;", "\u044C");
+    entities.put("&sol;", "\u002F");
+    entities.put("&solb;", "\u29C4");
+    entities.put("&solbar;", "\u233F");
+    entities.put("&sopf;", "\uD835\uDD64");
+    entities.put("&spades;", "\u2660");
+    entities.put("&spadesuit;", "\u2660");
+    entities.put("&spar;", "\u2225");
+    entities.put("&sqcap;", "\u2293");
+    entities.put("&sqcaps;", "\u2293\uFE00");
+    entities.put("&sqcup;", "\u2294");
+    entities.put("&sqcups;", "\u2294\uFE00");
+    entities.put("&sqsub;", "\u228F");
+    entities.put("&sqsube;", "\u2291");
+    entities.put("&sqsubset;", "\u228F");
+    entities.put("&sqsubseteq;", "\u2291");
+    entities.put("&sqsup;", "\u2290");
+    entities.put("&sqsupe;", "\u2292");
+    entities.put("&sqsupset;", "\u2290");
+    entities.put("&sqsupseteq;", "\u2292");
+    entities.put("&squ;", "\u25A1");
+    entities.put("&square;", "\u25A1");
+    entities.put("&squarf;", "\u25AA");
+    entities.put("&squf;", "\u25AA");
+    entities.put("&srarr;", "\u2192");
+    entities.put("&sscr;", "\uD835\uDCC8");
+    entities.put("&ssetmn;", "\u2216");
+    entities.put("&ssmile;", "\u2323");
+    entities.put("&sstarf;", "\u22C6");
+    entities.put("&star;", "\u2606");
+    entities.put("&starf;", "\u2605");
+    entities.put("&straightepsilon;", "\u03F5");
+    entities.put("&straightphi;", "\u03D5");
+    entities.put("&strns;", "\u00AF");
+    entities.put("&sub;", "\u2282");
+    entities.put("&subE;", "\u2AC5");
+    entities.put("&subdot;", "\u2ABD");
+    entities.put("&sube;", "\u2286");
+    entities.put("&subedot;", "\u2AC3");
+    entities.put("&submult;", "\u2AC1");
+    entities.put("&subnE;", "\u2ACB");
+    entities.put("&subne;", "\u228A");
+    entities.put("&subplus;", "\u2ABF");
+    entities.put("&subrarr;", "\u2979");
+    entities.put("&subset;", "\u2282");
+    entities.put("&subseteq;", "\u2286");
+    entities.put("&subseteqq;", "\u2AC5");
+    entities.put("&subsetneq;", "\u228A");
+    entities.put("&subsetneqq;", "\u2ACB");
+    entities.put("&subsim;", "\u2AC7");
+    entities.put("&subsub;", "\u2AD5");
+    entities.put("&subsup;", "\u2AD3");
+    entities.put("&succ;", "\u227B");
+    entities.put("&succapprox;", "\u2AB8");
+    entities.put("&succcurlyeq;", "\u227D");
+    entities.put("&succeq;", "\u2AB0");
+    entities.put("&succnapprox;", "\u2ABA");
+    entities.put("&succneqq;", "\u2AB6");
+    entities.put("&succnsim;", "\u22E9");
+    entities.put("&succsim;", "\u227F");
+    entities.put("&sum;", "\u2211");
+    entities.put("&sung;", "\u266A");
+    entities.put("&sup1;", "\u00B9");
+    entities.put("&sup2;", "\u00B2");
+    entities.put("&sup3;", "\u00B3");
+    entities.put("&sup;", "\u2283");
+    entities.put("&supE;", "\u2AC6");
+    entities.put("&supdot;", "\u2ABE");
+    entities.put("&supdsub;", "\u2AD8");
+    entities.put("&supe;", "\u2287");
+    entities.put("&supedot;", "\u2AC4");
+    entities.put("&suphsol;", "\u27C9");
+    entities.put("&suphsub;", "\u2AD7");
+    entities.put("&suplarr;", "\u297B");
+    entities.put("&supmult;", "\u2AC2");
+    entities.put("&supnE;", "\u2ACC");
+    entities.put("&supne;", "\u228B");
+    entities.put("&supplus;", "\u2AC0");
+    entities.put("&supset;", "\u2283");
+    entities.put("&supseteq;", "\u2287");
+    entities.put("&supseteqq;", "\u2AC6");
+    entities.put("&supsetneq;", "\u228B");
+    entities.put("&supsetneqq;", "\u2ACC");
+    entities.put("&supsim;", "\u2AC8");
+    entities.put("&supsub;", "\u2AD4");
+    entities.put("&supsup;", "\u2AD6");
+    entities.put("&swArr;", "\u21D9");
+    entities.put("&swarhk;", "\u2926");
+    entities.put("&swarr;", "\u2199");
+    entities.put("&swarrow;", "\u2199");
+    entities.put("&swnwar;", "\u292A");
+    entities.put("&szlig;", "\u00DF");
+    entities.put("&target;", "\u2316");
+    entities.put("&tau;", "\u03C4");
+    entities.put("&tbrk;", "\u23B4");
+    entities.put("&tcaron;", "\u0165");
+    entities.put("&tcedil;", "\u0163");
+    entities.put("&tcy;", "\u0442");
+    entities.put("&tdot;", "\u20DB");
+    entities.put("&telrec;", "\u2315");
+    entities.put("&tfr;", "\uD835\uDD31");
+    entities.put("&there4;", "\u2234");
+    entities.put("&therefore;", "\u2234");
+    entities.put("&theta;", "\u03B8");
+    entities.put("&thetasym;", "\u03D1");
+    entities.put("&thetav;", "\u03D1");
+    entities.put("&thickapprox;", "\u2248");
+    entities.put("&thicksim;", "\u223C");
+    entities.put("&thinsp;", "\u2009");
+    entities.put("&thkap;", "\u2248");
+    entities.put("&thksim;", "\u223C");
+    entities.put("&thorn;", "\u00FE");
+    entities.put("&tilde;", "\u02DC");
+    entities.put("&times;", "\u00D7");
+    entities.put("&timesb;", "\u22A0");
+    entities.put("&timesbar;", "\u2A31");
+    entities.put("&timesd;", "\u2A30");
+    entities.put("&tint;", "\u222D");
+    entities.put("&toea;", "\u2928");
+    entities.put("&top;", "\u22A4");
+    entities.put("&topbot;", "\u2336");
+    entities.put("&topcir;", "\u2AF1");
+    entities.put("&topf;", "\uD835\uDD65");
+    entities.put("&topfork;", "\u2ADA");
+    entities.put("&tosa;", "\u2929");
+    entities.put("&tprime;", "\u2034");
+    entities.put("&trade;", "\u2122");
+    entities.put("&triangle;", "\u25B5");
+    entities.put("&triangledown;", "\u25BF");
+    entities.put("&triangleleft;", "\u25C3");
+    entities.put("&trianglelefteq;", "\u22B4");
+    entities.put("&triangleq;", "\u225C");
+    entities.put("&triangleright;", "\u25B9");
+    entities.put("&trianglerighteq;", "\u22B5");
+    entities.put("&tridot;", "\u25EC");
+    entities.put("&trie;", "\u225C");
+    entities.put("&triminus;", "\u2A3A");
+    entities.put("&triplus;", "\u2A39");
+    entities.put("&trisb;", "\u29CD");
+    entities.put("&tritime;", "\u2A3B");
+    entities.put("&trpezium;", "\u23E2");
+    entities.put("&tscr;", "\uD835\uDCC9");
+    entities.put("&tscy;", "\u0446");
+    entities.put("&tshcy;", "\u045B");
+    entities.put("&tstrok;", "\u0167");
+    entities.put("&twixt;", "\u226C");
+    entities.put("&twoheadleftarrow;", "\u219E");
+    entities.put("&twoheadrightarrow;", "\u21A0");
+    entities.put("&uArr;", "\u21D1");
+    entities.put("&uHar;", "\u2963");
+    entities.put("&uacute;", "\u00FA");
+    entities.put("&uarr;", "\u2191");
+    entities.put("&ubrcy;", "\u045E");
+    entities.put("&ubreve;", "\u016D");
+    entities.put("&ucirc;", "\u00FB");
+    entities.put("&ucy;", "\u0443");
+    entities.put("&udarr;", "\u21C5");
+    entities.put("&udblac;", "\u0171");
+    entities.put("&udhar;", "\u296E");
+    entities.put("&ufisht;", "\u297E");
+    entities.put("&ufr;", "\uD835\uDD32");
+    entities.put("&ugrave;", "\u00F9");
+    entities.put("&uharl;", "\u21BF");
+    entities.put("&uharr;", "\u21BE");
+    entities.put("&uhblk;", "\u2580");
+    entities.put("&ulcorn;", "\u231C");
+    entities.put("&ulcorner;", "\u231C");
+    entities.put("&ulcrop;", "\u230F");
+    entities.put("&ultri;", "\u25F8");
+    entities.put("&umacr;", "\u016B");
+    entities.put("&uml;", "\u00A8");
+    entities.put("&uogon;", "\u0173");
+    entities.put("&uopf;", "\uD835\uDD66");
+    entities.put("&uparrow;", "\u2191");
+    entities.put("&updownarrow;", "\u2195");
+    entities.put("&upharpoonleft;", "\u21BF");
+    entities.put("&upharpoonright;", "\u21BE");
+    entities.put("&uplus;", "\u228E");
+    entities.put("&upsi;", "\u03C5");
+    entities.put("&upsih;", "\u03D2");
+    entities.put("&upsilon;", "\u03C5");
+    entities.put("&upuparrows;", "\u21C8");
+    entities.put("&urcorn;", "\u231D");
+    entities.put("&urcorner;", "\u231D");
+    entities.put("&urcrop;", "\u230E");
+    entities.put("&uring;", "\u016F");
+    entities.put("&urtri;", "\u25F9");
+    entities.put("&uscr;", "\uD835\uDCCA");
+    entities.put("&utdot;", "\u22F0");
+    entities.put("&utilde;", "\u0169");
+    entities.put("&utri;", "\u25B5");
+    entities.put("&utrif;", "\u25B4");
+    entities.put("&uuarr;", "\u21C8");
+    entities.put("&uuml;", "\u00FC");
+    entities.put("&uwangle;", "\u29A7");
+    entities.put("&vArr;", "\u21D5");
+    entities.put("&vBar;", "\u2AE8");
+    entities.put("&vBarv;", "\u2AE9");
+    entities.put("&vDash;", "\u22A8");
+    entities.put("&vangrt;", "\u299C");
+    entities.put("&varepsilon;", "\u03F5");
+    entities.put("&varkappa;", "\u03F0");
+    entities.put("&varnothing;", "\u2205");
+    entities.put("&varphi;", "\u03D5");
+    entities.put("&varpi;", "\u03D6");
+    entities.put("&varpropto;", "\u221D");
+    entities.put("&varr;", "\u2195");
+    entities.put("&varrho;", "\u03F1");
+    entities.put("&varsigma;", "\u03C2");
+    entities.put("&varsubsetneq;", "\u228A\uFE00");
+    entities.put("&varsubsetneqq;", "\u2ACB\uFE00");
+    entities.put("&varsupsetneq;", "\u228B\uFE00");
+    entities.put("&varsupsetneqq;", "\u2ACC\uFE00");
+    entities.put("&vartheta;", "\u03D1");
+    entities.put("&vartriangleleft;", "\u22B2");
+    entities.put("&vartriangleright;", "\u22B3");
+    entities.put("&vcy;", "\u0432");
+    entities.put("&vdash;", "\u22A2");
+    entities.put("&vee;", "\u2228");
+    entities.put("&veebar;", "\u22BB");
+    entities.put("&veeeq;", "\u225A");
+    entities.put("&vellip;", "\u22EE");
+    entities.put("&verbar;", "\u007C");
+    entities.put("&vert;", "\u007C");
+    entities.put("&vfr;", "\uD835\uDD33");
+    entities.put("&vltri;", "\u22B2");
+    entities.put("&vnsub;", "\u2282\u20D2");
+    entities.put("&vnsup;", "\u2283\u20D2");
+    entities.put("&vopf;", "\uD835\uDD67");
+    entities.put("&vprop;", "\u221D");
+    entities.put("&vrtri;", "\u22B3");
+    entities.put("&vscr;", "\uD835\uDCCB");
+    entities.put("&vsubnE;", "\u2ACB\uFE00");
+    entities.put("&vsubne;", "\u228A\uFE00");
+    entities.put("&vsupnE;", "\u2ACC\uFE00");
+    entities.put("&vsupne;", "\u228B\uFE00");
+    entities.put("&vzigzag;", "\u299A");
+    entities.put("&wcirc;", "\u0175");
+    entities.put("&wedbar;", "\u2A5F");
+    entities.put("&wedge;", "\u2227");
+    entities.put("&wedgeq;", "\u2259");
+    entities.put("&weierp;", "\u2118");
+    entities.put("&wfr;", "\uD835\uDD34");
+    entities.put("&wopf;", "\uD835\uDD68");
+    entities.put("&wp;", "\u2118");
+    entities.put("&wr;", "\u2240");
+    entities.put("&wreath;", "\u2240");
+    entities.put("&wscr;", "\uD835\uDCCC");
+    entities.put("&xcap;", "\u22C2");
+    entities.put("&xcirc;", "\u25EF");
+    entities.put("&xcup;", "\u22C3");
+    entities.put("&xdtri;", "\u25BD");
+    entities.put("&xfr;", "\uD835\uDD35");
+    entities.put("&xhArr;", "\u27FA");
+    entities.put("&xharr;", "\u27F7");
+    entities.put("&xi;", "\u03BE");
+    entities.put("&xlArr;", "\u27F8");
+    entities.put("&xlarr;", "\u27F5");
+    entities.put("&xmap;", "\u27FC");
+    entities.put("&xnis;", "\u22FB");
+    entities.put("&xodot;", "\u2A00");
+    entities.put("&xopf;", "\uD835\uDD69");
+    entities.put("&xoplus;", "\u2A01");
+    entities.put("&xotime;", "\u2A02");
+    entities.put("&xrArr;", "\u27F9");
+    entities.put("&xrarr;", "\u27F6");
+    entities.put("&xscr;", "\uD835\uDCCD");
+    entities.put("&xsqcup;", "\u2A06");
+    entities.put("&xuplus;", "\u2A04");
+    entities.put("&xutri;", "\u25B3");
+    entities.put("&xvee;", "\u22C1");
+    entities.put("&xwedge;", "\u22C0");
+    entities.put("&yacute;", "\u00FD");
+    entities.put("&yacy;", "\u044F");
+    entities.put("&ycirc;", "\u0177");
+    entities.put("&ycy;", "\u044B");
+    entities.put("&yen;", "\u00A5");
+    entities.put("&yfr;", "\uD835\uDD36");
+    entities.put("&yicy;", "\u0457");
+    entities.put("&yopf;", "\uD835\uDD6A");
+    entities.put("&yscr;", "\uD835\uDCCE");
+    entities.put("&yucy;", "\u044E");
+    entities.put("&yuml;", "\u00FF");
+    entities.put("&zacute;", "\u017A");
+    entities.put("&zcaron;", "\u017E");
+    entities.put("&zcy;", "\u0437");
+    entities.put("&zdot;", "\u017C");
+    entities.put("&zeetrf;", "\u2128");
+    entities.put("&zeta;", "\u03B6");
+    entities.put("&zfr;", "\uD835\uDD37");
+    entities.put("&zhcy;", "\u0436");
+    entities.put("&zigrarr;", "\u21DD");
+    entities.put("&zopf;", "\uD835\uDD6B");
+    entities.put("&zscr;", "\uD835\uDCCF");
+    entities.put("&zwj;", "\u200D");
+    entities.put("&zwnj;", "\u200C");
+  }
+
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java
index ae1a56bb6..303fbce8e 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/CachingPackageClientTests.java
@@ -1,6 +1,7 @@
 package org.hl7.fhir.utilities.tests;
 
 import org.hl7.fhir.utilities.npm.CachingPackageClient;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.utilities.npm.PackageInfo;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -70,7 +71,7 @@ public class CachingPackageClientTests {
     Assertions.assertTrue(client.exists("hl7.fhir.r4.core", "4.0.1"));
     Assertions.assertTrue(!client.exists("hl7.fhir.r4.core", "1.0.2"));
     Assertions.assertTrue(!client.exists("hl7.fhir.nothing", "1.0.1"));
-    Assertions.assertTrue(client.exists("hl7.fhir.pubpack", "0.0.9"));
+    Assertions.assertTrue(client.exists(CommonPackages.ID_PUBPACK, CommonPackages.VER_PUBPACK));
   }
 
   @Test
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/PackageCacheTests.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/PackageCacheTests.java
index a75d1c75a..db0ccc70f 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/PackageCacheTests.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/PackageCacheTests.java
@@ -1,6 +1,7 @@
 package org.hl7.fhir.utilities.tests;
 
 import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -22,7 +23,7 @@ public class PackageCacheTests {
       System.out.println("remaining packages: "+list.toString());
     }
     Assertions.assertTrue(list.isEmpty(), "List should be true but is "+list.toString());
-    NpmPackage npm = cache.loadPackage("hl7.fhir.pubpack", "0.0.9");
+    NpmPackage npm = cache.loadPackage(CommonPackages.ID_PUBPACK, CommonPackages.VER_PUBPACK);
     npm.loadAllFiles();
     Assertions.assertNotNull(npm);
     File dir = new File(Utilities.path("[tmp]", "cache"));
@@ -32,7 +33,7 @@ public class PackageCacheTests {
       Utilities.createDirectory(dir.getAbsolutePath());
     }
     npm.save(dir);
-    NpmPackage npm2 = cache.loadPackage("hl7.fhir.pubpack", "file:" + dir.getAbsolutePath());
+    NpmPackage npm2 = cache.loadPackage(CommonPackages.ID_PUBPACK, "file:" + dir.getAbsolutePath());
     Assertions.assertNotNull(npm2);
     list = cache.listPackages();
     Assertions.assertFalse(list.isEmpty());
@@ -60,7 +61,7 @@ public class PackageCacheTests {
   public void testLastReleasedVersion() throws IOException {
     FilesystemPackageCacheManager cache = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
     cache.clear();
-    Assertions.assertEquals("0.0.8", cache.loadPackage("hl7.fhir.pubpack", "0.0.8").version());
-    Assertions.assertEquals("0.0.9", cache.loadPackage("hl7.fhir.pubpack").version());    
+    Assertions.assertEquals("0.0.8", cache.loadPackage(CommonPackages.ID_PUBPACK, "0.0.8").version());
+    Assertions.assertEquals(CommonPackages.VER_PUBPACK, cache.loadPackage(CommonPackages.ID_PUBPACK).version());    
   }
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
index 7bb14b4ab..c05d25aba 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
@@ -107,6 +107,11 @@ public class XhtmlNodeTest {
     Assertions.assertThrows(FHIRException.class, () -> new XhtmlParser().parse(BaseTestingUtilities.loadTestResource("xhtml", "bad-link.html"), "div"));
   }
 
+  @Test
+  public void testParseEntities() throws FHIRFormatError, IOException {
+    XhtmlNode x = new XhtmlParser().parse(BaseTestingUtilities.loadTestResource("xhtml", "entities.html"), "div");
+  }
+    
 
 
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
index 23629104d..562dbcb96 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
@@ -18,6 +18,8 @@ import org.hl7.fhir.r5.model.Constants;
 import org.hl7.fhir.r5.model.ImplementationGuide;
 import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.utils.structuremap.StructureMapUtilities;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.IniFile;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
@@ -33,9 +35,7 @@ import org.hl7.fhir.validation.cli.utils.VersionSourceInformation;
 import org.w3c.dom.Document;
 
 import java.io.*;
-import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -273,9 +273,10 @@ public class IgLoader {
 
   private InputStream fetchFromUrlSpecific(String source, boolean optional) throws FHIRException, IOException {
     try {
-      URL url = new URL(source + "?nocache=" + System.currentTimeMillis());
-      URLConnection c = url.openConnection();
-      return c.getInputStream();
+      SimpleHTTPClient http = new SimpleHTTPClient();
+      HTTPResult res = http.get(source + "?nocache=" + System.currentTimeMillis());
+      res.checkThrowException();
+      return new ByteArrayInputStream(res.getContent());
     } catch (IOException e) {
       if (optional)
         return null;
@@ -412,17 +413,16 @@ public class IgLoader {
 
   private byte[] fetchFromUrlSpecific(String source, String contentType, boolean optional, List<String> errors) throws FHIRException, IOException {
     try {
+      SimpleHTTPClient http = new SimpleHTTPClient();
       try {
         // try with cache-busting option and then try withhout in case the server doesn't support that
-        URL url = new URL(source + "?nocache=" + System.currentTimeMillis());
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        conn.setRequestProperty("Accept", contentType);
-        return TextFile.streamToBytes(conn.getInputStream());
+        HTTPResult res = http.get(source + "?nocache=" + System.currentTimeMillis(), contentType);
+        res.checkThrowException();
+        return res.getContent();
       } catch (Exception e) {
-        URL url = new URL(source);
-        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-        conn.setRequestProperty("Accept", contentType);
-        return TextFile.streamToBytes(conn.getInputStream());
+        HTTPResult res = http.get(source, contentType);
+        res.checkThrowException();
+        return res.getContent();
       }
     } catch (IOException e) {
       if (errors != null) {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Scanner.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Scanner.java
index e23fbe749..dddf0d6de 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Scanner.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/Scanner.java
@@ -11,6 +11,8 @@ import org.hl7.fhir.r5.renderers.RendererFactory;
 import org.hl7.fhir.r5.renderers.utils.RenderingContext;
 import org.hl7.fhir.r5.utils.EOperationOutcome;
 import org.hl7.fhir.r5.utils.FHIRPathEngine;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.validation.ValidationMessage;
@@ -19,8 +21,6 @@ import org.hl7.fhir.validation.cli.model.ScanOutputItem;
 import org.hl7.fhir.validation.instance.InstanceValidator;
 
 import java.io.*;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
@@ -240,7 +240,7 @@ public class Scanner {
   }
 
   protected void genScanOutputItem(ScanOutputItem item, String filename) throws IOException, FHIRException, EOperationOutcome {
-    RenderingContext rc = new RenderingContext(getContext(), null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(getContext(), null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.END_USER);
     rc.setNoSlowLookup(true);
     RendererFactory.factory(item.getOutcome(), rc).render(item.getOutcome());
     String s = new XhtmlComposer(XhtmlComposer.HTML).compose(item.getOutcome().getText().getDiv());
@@ -294,18 +294,16 @@ public class Scanner {
   protected OperationOutcome exceptionToOutcome(Exception ex) throws IOException, FHIRException, EOperationOutcome {
     OperationOutcome op = new OperationOutcome();
     op.addIssue().setCode(OperationOutcome.IssueType.EXCEPTION).setSeverity(OperationOutcome.IssueSeverity.FATAL).getDetails().setText(ex.getMessage());
-    RenderingContext rc = new RenderingContext(getContext(), null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(getContext(), null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.END_USER);
     RendererFactory.factory(op, rc).render(op);
     return op;
   }
 
   protected void download(String address, String filename) throws IOException {
-    URL url = new URL(address);
-    URLConnection c = url.openConnection();
-    InputStream s = c.getInputStream();
-    FileOutputStream f = new FileOutputStream(filename);
-    transfer(s, f, 1024);
-    f.close();
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(address);
+    res.checkThrowException();
+    TextFile.bytesToFile(res.getContent(), filename);
   }
 
   protected void transfer(InputStream in, OutputStream out, int buffer) throws IOException {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
index 6546c1293..033927d7f 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java
@@ -41,6 +41,8 @@ import org.hl7.fhir.r5.utils.ToolingExtensions;
 import org.hl7.fhir.r5.utils.structuremap.StructureMapUtilities;
 import org.hl7.fhir.utilities.TimeTracker;
 import org.hl7.fhir.utilities.*;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -54,10 +56,8 @@ import org.hl7.fhir.validation.instance.utils.ValidatorHostContext;
 import org.xml.sax.SAXException;
 
 import java.io.*;
-import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.*;
 
 /*
@@ -238,7 +238,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     if (tt != null) {
       context.setClock(tt);
     }
-    NpmPackage npmX = getPcm().loadPackage("hl7.fhir.xver-extensions", "0.0.4");
+    NpmPackage npmX = getPcm().loadPackage(CommonPackages.ID_XVER, CommonPackages.VER_XVER);
     context.loadFromPackage(npmX, null);
 
     this.fhirPathEngine = new FHIRPathEngine(context);
@@ -435,7 +435,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
   public Resource generate(String source, String version) throws FHIRException, IOException, EOperationOutcome {
     Content cnt = igLoader.loadContent(source, "validate", false);
     Resource res = igLoader.loadResourceByVersion(version, cnt.focus, source);
-    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
     genResource(res, rc);
     return (Resource) res;
   }
@@ -554,19 +554,9 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
     if (output.startsWith("http://")) {
       ByteArrayOutputStream bs = new ByteArrayOutputStream();
       handleOutputToStream(r, output, bs, version);
-      URL url = new URL(output);
-      HttpURLConnection c = (HttpURLConnection) url.openConnection();
-      c.setDoOutput(true);
-      c.setDoInput(true);
-      c.setRequestMethod("POST");
-      c.setRequestProperty("Content-type", "application/fhir+xml");
-      c.setRequestProperty("Accept", "application/fhir+xml");
-      c.getOutputStream().write(bs.toByteArray());
-      c.getOutputStream().close();
-
-      if (c.getResponseCode() >= 300) {
-        throw new IOException("Unable to PUT to " + output + ": " + c.getResponseMessage());
-      }
+      SimpleHTTPClient http = new SimpleHTTPClient();
+      HTTPResult res = http.post(output, "application/fhir+xml", bs.toByteArray(), "application/fhir+xml");
+      res.checkThrowException();
     } else {
       FileOutputStream s = new FileOutputStream(output);
       handleOutputToStream(r, output, s, version);
@@ -711,9 +701,10 @@ public class ValidationEngine implements IValidatorResourceFetcher, IPackageInst
 
   @Override
   public byte[] fetchRaw(IResourceValidator validator, String source) throws IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    return TextFile.streamToBytes(c.getInputStream());
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(source);
+    res.checkThrowException();
+    return res.getContent();
   }
 
   @Override
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
index 1515dcedc..d53af0266 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
@@ -63,6 +63,7 @@ import org.hl7.fhir.r5.model.StructureDefinition;
 import org.hl7.fhir.utilities.TimeTracker;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.validation.cli.model.CliContext;
 import org.hl7.fhir.validation.cli.services.ComparisonService;
 import org.hl7.fhir.validation.cli.services.ValidationService;
@@ -222,7 +223,7 @@ public class ValidatorCli {
     String v = VersionUtilities.getCurrentVersion(cliContext.getSv());
     String definitions = VersionUtilities.packageForVersion(v) + "#" + v;
     ValidationEngine validator = validationService.initializeValidator(cliContext, definitions, tt);
-    validator.loadPackage("hl7.fhir.pubpack", null);
+    validator.loadPackage(CommonPackages.ID_PUBPACK, null);
     ComparisonService.doLeftRightComparison(args, Params.getParam(args, Params.DESTINATION), validator);
   }
 
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorUtils.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorUtils.java
index d2927918c..b691e3a84 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorUtils.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorUtils.java
@@ -91,7 +91,7 @@ public class ValidatorUtils {
     if (!op.hasIssue()) {
       op.addIssue().setSeverity(OperationOutcome.IssueSeverity.INFORMATION).setCode(OperationOutcome.IssueType.INFORMATIONAL).getDetails().setText(context.formatMessage(I18nConstants.ALL_OK));
     }
-    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.RESOURCE);
+    RenderingContext rc = new RenderingContext(context, null, null, "http://hl7.org/fhir", "", null, RenderingContext.ResourceRendererMode.END_USER);
     RendererFactory.factory(op, rc).render(op);
     return op;
   }
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
index 0a4364cec..248faffeb 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/ProfileLoader.java
@@ -2,13 +2,14 @@ package org.hl7.fhir.validation.cli.utils;
 
 import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.net.URLConnection;
 
 public class ProfileLoader {
   public static byte[] loadProfileSource(String src) throws FHIRException, IOException {
@@ -25,10 +26,10 @@ public class ProfileLoader {
 
   private static byte[] loadProfileFromUrl(String src) throws FHIRException {
     try {
-      URL url = new URL(src + "?nocache=" + System.currentTimeMillis());
-      URLConnection c = url.openConnection();
-     
-      return IOUtils.toByteArray(c.getInputStream());
+      SimpleHTTPClient http = new SimpleHTTPClient();
+      HTTPResult res = http.get(src + "?nocache=" + System.currentTimeMillis());
+      res.checkThrowException();
+      return res.getContent();
     } catch (Exception e) {
       throw new FHIRException("Unable to find definitions at URL '" + src + "': " + e.getMessage(), e);
     }
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
index 2445f5dee..86cc33b16 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
@@ -49,6 +49,7 @@ import org.hl7.fhir.r5.test.utils.TestingUtilities;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 import org.hl7.fhir.utilities.npm.ToolsVersion;
@@ -121,7 +122,7 @@ public class ComparisonTests {
       System.out.println("---- Set up Output ----------------------------------------------------------");
       Utilities.createDirectory(Utilities.path("[tmp]", "comparison"));
       FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
-      NpmPackage npm = pcm.loadPackage("hl7.fhir.pubpack", "0.0.9");
+      NpmPackage npm = pcm.loadPackage(CommonPackages.ID_PUBPACK, CommonPackages.VER_PUBPACK);
       for (String f : npm.list("other")) {
         TextFile.streamToFile(npm.load("other", f), Utilities.path("[tmp]", "comparison", f));
       }
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
index e4597ed89..d6a087ab5 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/conversion/tests/SnapShotGenerationXTests.java
@@ -524,7 +524,7 @@ public class SnapShotGenerationXTests {
       throw e;
     }
     if (output.getDifferential().hasElement()) {
-      RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.RESOURCE);
+      RenderingContext rc = new RenderingContext(TestingUtilities.context(), null, null, "http://hl7.org/fhir", "", null, ResourceRendererMode.END_USER);
       rc.setDestDir(makeTempDir());
       rc.setProfileUtilities(new ProfileUtilities(TestingUtilities.context(), null, new TestPKP()));
       RendererFactory.factory(output, rc).render(output);
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java
index 41bc4376e..b124ed7f4 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ProfileComparisonTests.java
@@ -1,5 +1,6 @@
 package org.hl7.fhir.validation.tests;
 
+import org.hl7.fhir.utilities.npm.CommonPackages;
 import org.junit.jupiter.api.Test;
 
 public class ProfileComparisonTests {
@@ -13,7 +14,7 @@ public class ProfileComparisonTests {
 //    ValidationEngine ve = new ValidationEngine("hl7.fhir.r3.core#3.0.2", DEF_TX, null, FhirPublication.STU3, "3.0.2");
 //    ve.loadIg("hl7.fhir.us.core#1.0.1", false);
 //    ve.loadIg("hl7.fhir.au.base#current", false);
-//    ve.getContext().loadFromPackage(new PackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage("hl7.fhir.pubpack", "0.0.9"), new R5ToR5Loader(new String[] {"Binary"}), "Binary");
+//    ve.getContext().loadFromPackage(new PackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage(CommonPackages.ID_PUBPACK, CommonPackages.VER_PUBPACK), new R5ToR5Loader(new String[] {"Binary"}), "Binary");
 //
 //
 //    String left = "http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient";
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
index d822201bc..0d2ccf2c8 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationTests.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -54,6 +53,8 @@ import org.hl7.fhir.r5.utils.IResourceValidator.BestPracticeWarningLevel;
 import org.hl7.fhir.r5.utils.IResourceValidator.BundleValidationRule;
 import org.hl7.fhir.r5.utils.IResourceValidator.IValidatorResourceFetcher;
 import org.hl7.fhir.r5.utils.IResourceValidator.ReferenceValidationPolicy;
+import org.hl7.fhir.utilities.SimpleHTTPClient;
+import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult;
 import org.hl7.fhir.utilities.TextFile;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
@@ -554,9 +555,10 @@ public class ValidationTests implements IEvaluationContext, IValidatorResourceFe
 
   @Override
   public byte[] fetchRaw(IResourceValidator validator, String source) throws MalformedURLException, IOException {
-    URL url = new URL(source);
-    URLConnection c = url.openConnection();
-    return TextFile.streamToBytes(c.getInputStream());
+    SimpleHTTPClient http = new SimpleHTTPClient();
+    HTTPResult res = http.get(source);
+    res.checkThrowException();
+    return res.getContent();
   }
 
   @Override
diff --git a/pom.xml b/pom.xml
index c73a88b4e..f9db3c8cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
     <properties>
         <hapi_fhir_version>5.1.0</hapi_fhir_version>
-        <validator_test_case_version>1.1.72</validator_test_case_version>
+        <validator_test_case_version>1.1.73-SNAPSHOT</validator_test_case_version>
         <junit_jupiter_version>5.7.1</junit_jupiter_version>
         <junit_platform_launcher_version>1.7.1</junit_platform_launcher_version>
         <maven_surefire_version>3.0.0-M4</maven_surefire_version>