diff --git a/packages/mindplot/src/components/commands/MoveControlPointCommand.ts b/packages/mindplot/src/components/commands/MoveControlPointCommand.ts
index ac9ec39f..4c657a76 100644
--- a/packages/mindplot/src/components/commands/MoveControlPointCommand.ts
+++ b/packages/mindplot/src/components/commands/MoveControlPointCommand.ts
@@ -61,7 +61,7 @@ class MoveControlPointCommand extends Command {
       default:
         throw new Error('Illegal state exception');
     }
-    this._controlPoint = { ...oldCtlPoint };
+    this._controlPoint = oldCtlPoint ? { ...oldCtlPoint } : null;
 
     relationship.redraw();
     relationship.setOnFocus(true);
diff --git a/packages/mindplot/src/components/persistence/XMLSerializerTango.ts b/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
index d5fe827f..0b3de705 100644
--- a/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
+++ b/packages/mindplot/src/components/persistence/XMLSerializerTango.ts
@@ -497,12 +497,17 @@ class XMLSerializerTango implements XMLMindmapSerializer {
     const spoint = Point.fromString(srcCtrlPoint);
     if (spoint) {
       model.setSrcCtrlPoint(spoint);
+    } else {
+      console.error(`srcCtrlPoint could not be parsed: ${srcCtrlPoint}`);
     }
 
     const dpoint = Point.fromString(destCtrlPoint);
     if (dpoint) {
       model.setDestCtrlPoint(dpoint);
+    } else {
+      console.error(`destCtrlPoint could not be parsed: ${destCtrlPoint}`);
     }
+
     model.setEndArrow(false);
     model.setStartArrow(true);
     return model;
diff --git a/packages/mindplot/test/unit/export/expected/cdata-support.wxml b/packages/mindplot/test/unit/export/expected/cdata-support.wxml
index 10aa4102..fe1172ed 100644
--- a/packages/mindplot/test/unit/export/expected/cdata-support.wxml
+++ b/packages/mindplot/test/unit/export/expected/cdata-support.wxml
@@ -1 +1 @@
-<map name="cdata-support" version="tango"><topic central="true" text="Observation" shape="rectangle" id="1"><note><![CDATA[Always ask ]]></note></topic><topic position="-4,-107" text="Data Analysis" id="29"><note><![CDATA[You always check your data to see if it is correct and then you check it and organize the data that you have to make sure that it is right ]]></note></topic><topic position="-143,-31" text="Organizing Data" id="30"><note><![CDATA[Organize your data when you are doing an experiment ]]></note></topic><topic position="181,-42" text="Questions" id="31"><note><![CDATA[Always ask your self a question when analysis the data it is a good idea to do.]]></note></topic><topic position="-6,46" text="Hypothesis" id="32"><note><![CDATA[You make your hypothesis when you are making your observation.]]></note></topic><topic position="-305,-50" text="Experiment" id="33"><note><![CDATA[Always analysis your data and keep it in order when you are doing an experiment.]]></note></topic><topic position="211,-151" text="Variable" id="34"><note><![CDATA[A major factor that can change the outcome in an experiment.]]></note></topic><topic position="327,-64" text="Independent Variable" id="35"><note><![CDATA[When you change it you the see affect or the aftermath of what happened ]]></note></topic><topic position="-304,14" text="Control Group" id="37"><note><![CDATA[A test That can be compared ]]></note></topic><topic position="323,98" text="Dependent Variable" id="36"><note><![CDATA[Changes the outcome of the other variables]]></note></topic><topic position="-28,141" text="Constant " id="40"><note><![CDATA[Doesnt Change at all maybe once and a while but never that often]]></note></topic><relationship srcTopicId="30" destTopicId="33" lineType="3" srcCtrlPoint="-53,0" destCtrlPoint="-20,0" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="35" lineType="3" srcCtrlPoint="191,-113" destCtrlPoint="-354,-98" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="34" lineType="3" srcCtrlPoint="-14,-117" destCtrlPoint="-218,-20" endArrow="false" startArrow="true"/><relationship srcTopicId="34" destTopicId="36" lineType="3" srcCtrlPoint="66,43" destCtrlPoint="199,-215" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
+<map name="cdata-support" version="tango"><topic central="true" text="Observation" shape="rectangle" id="1"><note><![CDATA[Always ask ]]></note></topic><topic position="-4,-107" text="Data Analysis" id="29"><note><![CDATA[You always check your data to see if it is correct and then you check it and organize the data that you have to make sure that it is right ]]></note></topic><topic position="-143,-31" text="Organizing Data" id="30"><note><![CDATA[Organize your data when you are doing an experiment ]]></note></topic><topic position="181,-42" text="Questions" id="31"><note><![CDATA[Always ask your self a question when analysis the data it is a good idea to do.]]></note></topic><topic position="-6,46" text="Hypothesis" id="32"><note><![CDATA[You make your hypothesis when you are making your observation.]]></note></topic><topic position="-305,-50" text="Experiment" id="33"><note><![CDATA[Always analysis your data and keep it in order when you are doing an experiment.]]></note></topic><topic position="211,-151" text="Variable" id="34"><note><![CDATA[A major factor that can change the outcome in an experiment.]]></note></topic><topic position="327,-64" text="Independent Variable" id="35"><note><![CDATA[When you change it you the see affect or the aftermath of what happened ]]></note></topic><topic position="-304,14" text="Control Group" id="37"><note><![CDATA[A test That can be compared ]]></note></topic><topic position="323,98" text="Dependent Variable" id="36"><note><![CDATA[Changes the outcome of the other variables]]></note></topic><topic position="-28,141" text="Constant " id="40"><note><![CDATA[Doesnt Change at all maybe once and a while but never that often]]></note></topic><relationship srcTopicId="1" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="30" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="30" destTopicId="33" lineType="3" srcCtrlPoint="-53,0" destCtrlPoint="-20,0" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="35" lineType="3" srcCtrlPoint="191,-113" destCtrlPoint="-354,-98" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="37" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="34" lineType="3" srcCtrlPoint="-14,-117" destCtrlPoint="-218,-20" endArrow="false" startArrow="true"/><relationship srcTopicId="35" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="34" destTopicId="36" lineType="3" srcCtrlPoint="66,43" destCtrlPoint="199,-215" endArrow="false" startArrow="true"/><relationship srcTopicId="33" destTopicId="40" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/complex.wxml b/packages/mindplot/test/unit/export/expected/complex.wxml
index d03e68a8..722b017d 100644
--- a/packages/mindplot/test/unit/export/expected/complex.wxml
+++ b/packages/mindplot/test/unit/export/expected/complex.wxml
@@ -48,4 +48,4 @@ Attached below a sample of such screening questions]]></note></topic><topic posi
     Understand values and priorities.
     Decrease the learning curve.]]></note></topic><topic position="1047,61" order="1" text="Related Strategic Priorities" id="87"><note><![CDATA[1]]></note></topic><topic position="1050,85" order="2" text="KPI: Employee Performance" id="61"><eicon id="📊"/></topic><topic position="1011,112" order="3" text="Methodology" id="80"><topic position="1131,111" order="0" text="Target" id="102"/></topic></topic><topic position="824,186" order="3" text="Goal: Reduce Turnover" id="52"><eicon id="🏈"/><note><![CDATA[To reduce turnover of Top Talent.]]></note><topic position="994,145" order="0" text="So That" id="62"><eicon id="🌈"/><note><![CDATA[    Provide support through feedback.
     Help the employee feel valued.
-    Again, decrease the learning curve.]]></note></topic><topic position="1021,169" order="1" text="Related Strategic Priorities" id="88"/><topic position="1014,193" order="2" text="KPI: Retention Rate" id="63"><eicon id="📊"/></topic><topic position="992,221" order="3" text="Methodology" shrink="true" id="98"><topic position="1112,219" order="0" text="Target" id="101"/></topic></topic><topic position="814,253" order="4" text="Risk &amp; Compliance" id="246"><eicon id="🏈"/><note><![CDATA[To eliminate or minimize risk and to comply with all legislated requirements.  ]]></note></topic></topic></topic></map>
\ No newline at end of file
+    Again, decrease the learning curve.]]></note></topic><topic position="1021,169" order="1" text="Related Strategic Priorities" id="88"/><topic position="1014,193" order="2" text="KPI: Retention Rate" id="63"><eicon id="📊"/></topic><topic position="992,221" order="3" text="Methodology" shrink="true" id="98"><topic position="1112,219" order="0" text="Target" id="101"/></topic></topic><topic position="814,253" order="4" text="Risk &amp; Compliance" id="246"><eicon id="🏈"/><note><![CDATA[To eliminate or minimize risk and to comply with all legislated requirements.  ]]></note></topic></topic></topic><relationship srcTopicId="154" destTopicId="6" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="156" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="16" destTopicId="162" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="31" destTopicId="91" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="91" destTopicId="105" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="10" destTopicId="163" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="204" destTopicId="9" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="204" destTopicId="33" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="206" destTopicId="208" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="18" destTopicId="215" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="91" destTopicId="105" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="91" destTopicId="105" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="247" destTopicId="248" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="156" destTopicId="166" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="166" destTopicId="167" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="167" destTopicId="2" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="270" destTopicId="130" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="275" destTopicId="298" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="123" destTopicId="220" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="6" destTopicId="29" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="29" destTopicId="31" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/issue.wxml b/packages/mindplot/test/unit/export/expected/issue.wxml
index 54346249..15e23d69 100644
--- a/packages/mindplot/test/unit/export/expected/issue.wxml
+++ b/packages/mindplot/test/unit/export/expected/issue.wxml
@@ -15,4 +15,4 @@ calculo navegar en internet, base de datos, etc.]]></text><topic position="-855,
 ]]></text></topic><topic position="465,236" order="4" shape="rounded rectangle" id="42" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Microprocesador
 ]]></text></topic><topic position="450,265" order="5" shape="rounded rectangle" id="43" fontStyle=";8;#000000;;;" bgColor="#ead1dc" brColor="#4c1130"><text><![CDATA[Disco Duro
 ]]></text></topic></topic><topic position="80,-215" shape="rounded rectangle" id="118" fontStyle=";10;#feffff;;;" bgColor="#cc0000" brColor="#660000"><text><![CDATA[Máquina electrónica que sirve para:  escribir,  dibujar,  pintar,
-escuchar música, ver videos, calcular, comunicarnos con otras personas, etc-]]></text></topic></map>
\ No newline at end of file
+escuchar música, ver videos, calcular, comunicarnos con otras personas, etc-]]></text></topic><relationship srcTopicId="35" destTopicId="21" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="118" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="118" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/npe.wxml b/packages/mindplot/test/unit/export/expected/npe.wxml
index 13694870..9f021d19 100644
--- a/packages/mindplot/test/unit/export/expected/npe.wxml
+++ b/packages/mindplot/test/unit/export/expected/npe.wxml
@@ -1 +1 @@
-<map name="npe" version="tango"><topic central="true" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectangle" id="1" fontStyle=";10;#741b47;bold;;" bgColor="#d5a6bd" brColor="#e69138"><eicon id="✏️"/></topic><topic position="6,-284" text="NIF D" shape="rectangle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Beneficios a los empleados,impuestos a la utilidad, arrendamientos y capitalización de resultado integral .]]></note><eicon id="😎"/><topic position="211,-280" order="0" text=" Normas aplicables a problemas de determinación de resultados " id="19"/></topic><topic position="46,221" text=" CIRCULANTES" shape="rounded rectangle" id="7" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Tratamiento contable de los gastos de registro, colocación, unidades de inversión, aplicación supletoria etc.]]></note><eicon id="☎️"/><topic position="236,225" order="0" text="Adquisición temporal de acciones propias" id="22"/></topic><topic position="-143,148" text=" NIF A" shape="rectangle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.youtube.com/watch?v=7YN-sOlkQp0" urlType="url"/><eicon id="⌛"/><topic position="-254,152" order="0" text=" Marco conceptual" id="20"/></topic><topic position="-150,-129" text=" NIF C" shape="rectangle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="https://sites.google.com/site/contabilidadimcpnif/estructura-de-las-nif" urlType="url"/><eicon id="🐵"/><topic position="-366,-125" order="0" text="Normas aplicables a conceptos específicos de los estados financieros " shape="line" id="13"/></topic><topic position="183,-153" text="NIF E" shape="rectangle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Agricultura y donativos recibidos u otorgados con propósitos no lucrativos.]]></note><icon id="soft_penguin"/><topic position="402,-149" order="0" text=" Normas aplicables alas actividades especializadas de distintos sectores" id="18"/></topic><topic position="326,127" text=" NIF B" shape="rectangle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.contaduria.uady.mx/files/cuerpo-acad/caef/aief/resumen_NIF_marco_conceptual.pdf" urlType="url"/><eicon id="🏠"/><topic position="521,131" order="0" text=" Normas aplicables a los estados financieros en su conjunto" id="21"/></topic></map>
\ No newline at end of file
+<map name="npe" version="tango"><topic central="true" text="NIF (NORMAS DE INFORMACIÓN FINANCIERA)" shape="rounded rectangle" id="1" fontStyle=";10;#741b47;bold;;" bgColor="#d5a6bd" brColor="#e69138"><eicon id="✏️"/></topic><topic position="6,-284" text="NIF D" shape="rectangle" id="3" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Beneficios a los empleados,impuestos a la utilidad, arrendamientos y capitalización de resultado integral .]]></note><eicon id="😎"/><topic position="211,-280" order="0" text=" Normas aplicables a problemas de determinación de resultados " id="19"/></topic><topic position="46,221" text=" CIRCULANTES" shape="rounded rectangle" id="7" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Tratamiento contable de los gastos de registro, colocación, unidades de inversión, aplicación supletoria etc.]]></note><eicon id="☎️"/><topic position="236,225" order="0" text="Adquisición temporal de acciones propias" id="22"/></topic><topic position="-143,148" text=" NIF A" shape="rectangle" id="6" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.youtube.com/watch?v=7YN-sOlkQp0" urlType="url"/><eicon id="⌛"/><topic position="-254,152" order="0" text=" Marco conceptual" id="20"/></topic><topic position="-150,-129" text=" NIF C" shape="rectangle" id="4" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="https://sites.google.com/site/contabilidadimcpnif/estructura-de-las-nif" urlType="url"/><eicon id="🐵"/><topic position="-366,-125" order="0" text="Normas aplicables a conceptos específicos de los estados financieros " shape="line" id="13"/></topic><topic position="183,-153" text="NIF E" shape="rectangle" id="2" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><note><![CDATA[Agricultura y donativos recibidos u otorgados con propósitos no lucrativos.]]></note><icon id="soft_penguin"/><topic position="402,-149" order="0" text=" Normas aplicables alas actividades especializadas de distintos sectores" id="18"/></topic><topic position="326,127" text=" NIF B" shape="rectangle" id="5" fontStyle="Arial;10;;bold;;" bgColor="#509dc0"><link url="http://www.contaduria.uady.mx/files/cuerpo-acad/caef/aief/resumen_NIF_marco_conceptual.pdf" urlType="url"/><eicon id="🏠"/><topic position="521,131" order="0" text=" Normas aplicables a los estados financieros en su conjunto" id="21"/></topic><relationship srcTopicId="3" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="4" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="4" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="7" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="6" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="5" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="2" destTopicId="1" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="1" destTopicId="2" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/mindplot/test/unit/export/expected/process.mm b/packages/mindplot/test/unit/export/expected/process.mm
index 73dd081d..de5085b4 100644
--- a/packages/mindplot/test/unit/export/expected/process.mm
+++ b/packages/mindplot/test/unit/export/expected/process.mm
@@ -37,6 +37,8 @@
                     <node ID="ID_30" POSITION="right" TEXT="In 2010, 2,500 referrals forwarded to OneLegacy"/>
                 </node>
                 <node ID="ID_31" POSITION="right" STYLE="bubble" BACKGROUND_COLOR="#00ffd5" TEXT="Doheny Eye and Tissue Transplant Bank" LINK="http://www.dohenyeyebank.org/"/>
+                <arrowlink DESTINATION="ID_32" STARTARROW="Default"/>
+                <arrowlink DESTINATION="ID_36" STARTARROW="Default"/>
             </node>
             <node ID="ID_32" POSITION="right" STYLE="bubble" BACKGROUND_COLOR="#00ffd5" TEXT="OneLegacy">
                 <node ID="ID_33" POSITION="right" TEXT="In 2010, 11,828 referrals"/>
diff --git a/packages/mindplot/test/unit/export/expected/process.wxml b/packages/mindplot/test/unit/export/expected/process.wxml
index f172aa52..c6a4f998 100644
--- a/packages/mindplot/test/unit/export/expected/process.wxml
+++ b/packages/mindplot/test/unit/export/expected/process.wxml
@@ -1 +1 @@
-<map name="process" version="tango"><topic central="true" text="California" shape="rounded rectangle" id="0"><topic position="-200,-200" order="7" text="Northern California" shape="line" id="1"><topic position="-290,-275" order="0" text="Oakland/Berkeley" shape="line" id="2"/><topic position="-290,-250" order="1" text="San Mateo" shape="line" id="3"/><topic position="-290,-225" order="2" text="Other North" shape="line" id="4"/><topic position="-290,-200" order="3" text="San Francisco" shape="line" id="5"/><topic position="-290,-175" order="4" text="Santa Clara" shape="line" id="6"/><topic position="-290,-150" order="5" text="Marin/Napa/Solano" shape="line" id="7"/></topic><topic position="-200,-100" order="3" text="Hawaii" shape="line" id="8"/><topic position="-200,0" order="0" text="Southern California" shape="line" id="9"><topic position="-290,-50" order="0" text="Los Angeles" shape="line" id="10"/><topic position="-290,-25" order="1" text="Anaheim/Santa Ana" shape="line" id="11"/><topic position="-290,0" order="2" text="Ventura" shape="line" id="12"/><topic position="-290,25" order="3" text="Other South" shape="line" id="13"/></topic><topic position="-200,100" order="4" text="Policy Bodies" shape="line" id="14"><topic position="-290,25" order="0" text="Advocacy" shape="line" id="15"><topic position="-380,0" order="0" text="AAO" shape="line" id="16"/><topic position="-380,25" order="1" text="ASCRS" shape="line" id="17"/><topic position="-380,50" order="2" text="EBAA" shape="line" id="18"/></topic><topic position="-290,50" order="1" text="Military" shape="line" id="19"/><topic position="-290,75" order="2" text="United Network for Organ Sharing" shape="line" id="20"/><topic position="-290,100" order="3" text="Kaiser Hospital System" shape="line" id="21"/><topic position="-290,125" order="4" text="University of California System" shape="line" id="22"/><topic position="-290,150" order="5" text="CMS" shape="line" id="23"><topic position="-380,125" order="0" text="Medicare Part A" shape="line" id="24"/><topic position="-380,150" order="1" text="Medicare Part B" shape="line" id="25"/></topic></topic><topic position="200,-100" order="3" text="Corneal Tissue OPS" shape="line" id="26"><topic position="290,-200" order="0" text="Transplant Bank International" shape="line" id="27"><topic position="380,-250" order="0" text="Orange County Eye and Transplant Bank" shape="line" id="28"/><topic position="380,-225" order="1" text="Northern California Transplant Bank" shape="rounded rectangle" id="29" bgColor="#00ffd5"><topic position="470,-225" order="0" text="In 2010, 2,500 referrals forwarded to OneLegacy" shape="line" id="30"/></topic><topic position="380,-200" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectangle" id="31" bgColor="#00ffd5"><link url="http://www.dohenyeyebank.org/" urlType="url"/></topic></topic><topic position="290,-175" order="1" text="OneLegacy" shape="rounded rectangle" id="32" bgColor="#00ffd5"><topic position="380,-200" order="0" text="In 2010, 11,828 referrals" shape="line" id="33"/></topic><topic position="290,-150" order="2" text="San Diego Eye Bank" shape="rounded rectangle" id="34" bgColor="#00ffd5"><topic position="380,-150" order="0" text="In 2010, 2,555 referrals" shape="line" id="35"/></topic><topic position="290,-125" order="3" text="California Transplant Donor Network" shape="line" id="36"/><topic position="290,-100" order="4" text="California Transplant Services" shape="line" id="37"><topic position="380,-100" order="0" text="In 2010, 0 referrals" shape="line" id="38"/></topic><topic position="290,-75" order="5" text="Lifesharing" shape="line" id="39"/><topic position="290,-50" order="6" text="DCI Donor Services" shape="line" id="40"><topic position="380,-50" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectangle" id="41" bgColor="#00ffd5"><topic position="470,-75" order="0" text="In 2010, 2.023 referrals" shape="line" id="42"/></topic></topic><topic position="290,-25" order="7" text="SightLife" shape="rounded rectangle" id="43" bgColor="#00ffd5"/></topic><topic position="-200,200" order="8" text="Tools" shape="line" id="44"><topic position="-290,175" order="0" text="Darthmouth Atlas of Health" shape="line" id="45"/><topic position="-290,200" order="1" text="HealthLandscape" shape="line" id="46"/></topic><topic position="200,0" order="0" text="QE Medicare" shape="line" id="47"/><topic position="200,100" order="4" text="CMS Data" shape="line" id="48"/><topic position="200,200" order="8" text="Ambulatory Payment Classification" shape="line" id="49"><topic position="290,150" order="0" text="CPT's which don't allow V2785" shape="line" id="50"><topic position="380,125" order="0" text="Ocular Reconstruction Transplant" shape="line" id="51"><topic position="470,100" order="0" text="65780 (amniotic membrane tranplant" shape="line" id="52"/><topic position="470,125" order="1" text="65781 (limbal stem cell allograft)" shape="line" id="53"/><topic position="470,150" order="2" text="65782 (limbal conjunctiva autograft)" shape="line" id="54"/></topic><topic position="380,150" order="1" text="Endothelial keratoplasty" shape="line" id="55"><topic position="470,150" order="0" text="65756" shape="line" id="56"/></topic><topic position="380,175" order="2" text="Epikeratoplasty" shape="line" id="57"><topic position="470,175" order="0" text="65767" shape="line" id="58"/></topic></topic><topic position="290,175" order="1" text="Anterior lamellar keratoplasty" shape="line" id="59"><topic position="380,175" order="0" text="65710" shape="line" id="60"/></topic><topic position="290,200" order="2" text="Processing, preserving, and transporting corneal tissue" shape="line" id="61"><topic position="380,175" order="0" text="V2785" shape="line" id="62"/><topic position="380,200" order="1" text="Laser incision in recepient" shape="line" id="63"><topic position="470,200" order="0" text="0290T" shape="line" id="64"/></topic></topic><topic position="290,225" order="3" text="Laser incision in donor" shape="line" id="65"><topic position="380,225" order="0" text="0289T" shape="line" id="66"/></topic><topic position="290,250" order="4" text="Penetrating keratoplasty" shape="line" id="67"><topic position="380,225" order="0" text="65730 (in other)" shape="line" id="68"/><topic position="380,250" order="1" text="65755 (in pseudoaphakia)" shape="line" id="69"/><topic position="380,275" order="2" text="65750 (in aphakia)" shape="line" id="70"/></topic></topic></topic></map>
\ No newline at end of file
+<map name="process" version="tango"><topic central="true" text="California" shape="rounded rectangle" id="0"><topic position="-200,-200" order="7" text="Northern California" shape="line" id="1"><topic position="-290,-275" order="0" text="Oakland/Berkeley" shape="line" id="2"/><topic position="-290,-250" order="1" text="San Mateo" shape="line" id="3"/><topic position="-290,-225" order="2" text="Other North" shape="line" id="4"/><topic position="-290,-200" order="3" text="San Francisco" shape="line" id="5"/><topic position="-290,-175" order="4" text="Santa Clara" shape="line" id="6"/><topic position="-290,-150" order="5" text="Marin/Napa/Solano" shape="line" id="7"/></topic><topic position="-200,-100" order="3" text="Hawaii" shape="line" id="8"/><topic position="-200,0" order="0" text="Southern California" shape="line" id="9"><topic position="-290,-50" order="0" text="Los Angeles" shape="line" id="10"/><topic position="-290,-25" order="1" text="Anaheim/Santa Ana" shape="line" id="11"/><topic position="-290,0" order="2" text="Ventura" shape="line" id="12"/><topic position="-290,25" order="3" text="Other South" shape="line" id="13"/></topic><topic position="-200,100" order="4" text="Policy Bodies" shape="line" id="14"><topic position="-290,25" order="0" text="Advocacy" shape="line" id="15"><topic position="-380,0" order="0" text="AAO" shape="line" id="16"/><topic position="-380,25" order="1" text="ASCRS" shape="line" id="17"/><topic position="-380,50" order="2" text="EBAA" shape="line" id="18"/></topic><topic position="-290,50" order="1" text="Military" shape="line" id="19"/><topic position="-290,75" order="2" text="United Network for Organ Sharing" shape="line" id="20"/><topic position="-290,100" order="3" text="Kaiser Hospital System" shape="line" id="21"/><topic position="-290,125" order="4" text="University of California System" shape="line" id="22"/><topic position="-290,150" order="5" text="CMS" shape="line" id="23"><topic position="-380,125" order="0" text="Medicare Part A" shape="line" id="24"/><topic position="-380,150" order="1" text="Medicare Part B" shape="line" id="25"/></topic></topic><topic position="200,-100" order="3" text="Corneal Tissue OPS" shape="line" id="26"><topic position="290,-200" order="0" text="Transplant Bank International" shape="line" id="27"><topic position="380,-250" order="0" text="Orange County Eye and Transplant Bank" shape="line" id="28"/><topic position="380,-225" order="1" text="Northern California Transplant Bank" shape="rounded rectangle" id="29" bgColor="#00ffd5"><topic position="470,-225" order="0" text="In 2010, 2,500 referrals forwarded to OneLegacy" shape="line" id="30"/></topic><topic position="380,-200" order="2" text="Doheny Eye and Tissue Transplant Bank" shape="rounded rectangle" id="31" bgColor="#00ffd5"><link url="http://www.dohenyeyebank.org/" urlType="url"/></topic></topic><topic position="290,-175" order="1" text="OneLegacy" shape="rounded rectangle" id="32" bgColor="#00ffd5"><topic position="380,-200" order="0" text="In 2010, 11,828 referrals" shape="line" id="33"/></topic><topic position="290,-150" order="2" text="San Diego Eye Bank" shape="rounded rectangle" id="34" bgColor="#00ffd5"><topic position="380,-150" order="0" text="In 2010, 2,555 referrals" shape="line" id="35"/></topic><topic position="290,-125" order="3" text="California Transplant Donor Network" shape="line" id="36"/><topic position="290,-100" order="4" text="California Transplant Services" shape="line" id="37"><topic position="380,-100" order="0" text="In 2010, 0 referrals" shape="line" id="38"/></topic><topic position="290,-75" order="5" text="Lifesharing" shape="line" id="39"/><topic position="290,-50" order="6" text="DCI Donor Services" shape="line" id="40"><topic position="380,-50" order="0" text="Sierra Eye and Tissue Donor Services" shape="rounded rectangle" id="41" bgColor="#00ffd5"><topic position="470,-75" order="0" text="In 2010, 2.023 referrals" shape="line" id="42"/></topic></topic><topic position="290,-25" order="7" text="SightLife" shape="rounded rectangle" id="43" bgColor="#00ffd5"/></topic><topic position="-200,200" order="8" text="Tools" shape="line" id="44"><topic position="-290,175" order="0" text="Darthmouth Atlas of Health" shape="line" id="45"/><topic position="-290,200" order="1" text="HealthLandscape" shape="line" id="46"/></topic><topic position="200,0" order="0" text="QE Medicare" shape="line" id="47"/><topic position="200,100" order="4" text="CMS Data" shape="line" id="48"/><topic position="200,200" order="8" text="Ambulatory Payment Classification" shape="line" id="49"><topic position="290,150" order="0" text="CPT's which don't allow V2785" shape="line" id="50"><topic position="380,125" order="0" text="Ocular Reconstruction Transplant" shape="line" id="51"><topic position="470,100" order="0" text="65780 (amniotic membrane tranplant" shape="line" id="52"/><topic position="470,125" order="1" text="65781 (limbal stem cell allograft)" shape="line" id="53"/><topic position="470,150" order="2" text="65782 (limbal conjunctiva autograft)" shape="line" id="54"/></topic><topic position="380,150" order="1" text="Endothelial keratoplasty" shape="line" id="55"><topic position="470,150" order="0" text="65756" shape="line" id="56"/></topic><topic position="380,175" order="2" text="Epikeratoplasty" shape="line" id="57"><topic position="470,175" order="0" text="65767" shape="line" id="58"/></topic></topic><topic position="290,175" order="1" text="Anterior lamellar keratoplasty" shape="line" id="59"><topic position="380,175" order="0" text="65710" shape="line" id="60"/></topic><topic position="290,200" order="2" text="Processing, preserving, and transporting corneal tissue" shape="line" id="61"><topic position="380,175" order="0" text="V2785" shape="line" id="62"/><topic position="380,200" order="1" text="Laser incision in recepient" shape="line" id="63"><topic position="470,200" order="0" text="0290T" shape="line" id="64"/></topic></topic><topic position="290,225" order="3" text="Laser incision in donor" shape="line" id="65"><topic position="380,225" order="0" text="0289T" shape="line" id="66"/></topic><topic position="290,250" order="4" text="Penetrating keratoplasty" shape="line" id="67"><topic position="380,225" order="0" text="65730 (in other)" shape="line" id="68"/><topic position="380,250" order="1" text="65755 (in pseudoaphakia)" shape="line" id="69"/><topic position="380,275" order="2" text="65750 (in aphakia)" shape="line" id="70"/></topic></topic></topic><relationship srcTopicId="27" destTopicId="32" lineType="3" endArrow="false" startArrow="true"/><relationship srcTopicId="27" destTopicId="36" lineType="3" endArrow="false" startArrow="true"/></map>
\ No newline at end of file
diff --git a/packages/web2d/src/components/Point.js b/packages/web2d/src/components/Point.js
index ab445ac0..5fa0ba0f 100644
--- a/packages/web2d/src/components/Point.js
+++ b/packages/web2d/src/components/Point.js
@@ -44,7 +44,7 @@ Point.fromString = function pointFromString(point) {
   let result = null;
   if (point) {
     const values = point.split(',');
-    if (values.lenght > 1) {
+    if (values.length === 2) {
       const x = Number.parseInt(values[0], 10);
       const y = Number.parseInt(values[1], 10);