Smaller stuff that went uncommitted

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 335 insertions, 240 deletions

diff --git a/docs/design.dia b/docs/design.dia
index e78aeca..72390b5 100644
--- a/docs/design.dia
+++ b/docs/design.dia
@@ -2,10 +2,10 @@
 <dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
   <dia:diagramdata>
     <dia:attribute name="background">
-      <dia:color val="#f4ddcaff"/>
+      <dia:color val="#f4ddca"/>
     </dia:attribute>
     <dia:attribute name="pagebreak">
-      <dia:color val="#000099ff"/>
+      <dia:color val="#000099"/>
     </dia:attribute>
     <dia:attribute name="paper">
       <dia:composite type="paper">
@@ -13,16 +13,16 @@
           <dia:string>#A4#</dia:string>
         </dia:attribute>
         <dia:attribute name="tmargin">
-          <dia:real val="2.8222"/>
+          <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="bmargin">
-          <dia:real val="2.8222"/>
+          <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="lmargin">
-          <dia:real val="2.8222"/>
+          <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="rmargin">
-          <dia:real val="2.8222"/>
+          <dia:real val="2.8222000598907471"/>
         </dia:attribute>
         <dia:attribute name="is_portrait">
           <dia:boolean val="true"/>
@@ -37,9 +37,6 @@
     </dia:attribute>
     <dia:attribute name="grid">
       <dia:composite type="grid">
-        <dia:attribute name="dynamic">
-          <dia:boolean val="true"/>
-        </dia:attribute>
         <dia:attribute name="width_x">
           <dia:real val="1"/>
         </dia:attribute>
@@ -56,89 +53,84 @@
       </dia:composite>
     </dia:attribute>
     <dia:attribute name="color">
-      <dia:color val="#d8e5e5ff"/>
+      <dia:color val="#d8e5e5"/>
     </dia:attribute>
-    <dia:attribute name="guides"/>
-    <dia:attribute name="guide_color">
-      <dia:color val="#00ff00ff"/>
-    </dia:attribute>
-    <dia:attribute name="display">
-      <dia:composite type="display">
-        <dia:attribute name="antialiased">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="snap-to-grid">
-          <dia:boolean val="false"/>
-        </dia:attribute>
-        <dia:attribute name="snap-to-guides">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="snap-to-object">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="show-grid">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="show-guides">
-          <dia:boolean val="true"/>
-        </dia:attribute>
-        <dia:attribute name="show-connection-points">
-          <dia:boolean val="true"/>
-        </dia:attribute>
+    <dia:attribute name="guides">
+      <dia:composite type="guides">
+        <dia:attribute name="hguides"/>
+        <dia:attribute name="vguides"/>
       </dia:composite>
     </dia:attribute>
   </dia:diagramdata>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true"/>
-  <dia:layer name="Background" visible="true" connectable="true" active="true">
-    <dia:object type="Standard - Line" version="0" id="O0">
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true"/>
+  <dia:layer name="Background" visible="true" active="true">
+    <dia:object type="Cisco - STB (set top box)" version="1" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.1319,10.254"/>
+        <dia:point val="7.1079,9.58249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.0826,5.01063;17.5196,10.3033"/>
+        <dia:rectangle val="6.18033,8.90147;9.46778,11.1563"/>
       </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="13.1319,10.254"/>
-        <dia:point val="17.4703,5.05993"/>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
       </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="7.1079,9.58249"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="1.4661067992829642"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="0.63463103621674977"/>
       </dia:attribute>
       <dia:attribute name="line_width">
-        <dia:real val="0.070000000000000007"/>
+        <dia:real val="0.10000000000000001"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow">
-        <dia:enum val="22"/>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
       </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
+      <dia:attribute name="show_background">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_style">
+        <dia:enum val="0"/>
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="flip_horizontal">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="flip_vertical">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="subscale">
+        <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Cisco - Cellular phone" version="1" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.2207,10.4276"/>
+        <dia:point val="11.1736,10.5168"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.1807,10.3276;12.9217,12.8237"/>
+        <dia:rectangle val="11.057,9.91457;13.0525,12.8282"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="11.2207,10.4276"/>
+        <dia:point val="11.1736,10.5168"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="1.2942626925997278"/>
+        <dia:real val="1.3290184176610877"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2.3054244343357921"/>
@@ -147,10 +139,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -174,7 +166,7 @@
         <dia:point val="17.5953,-2.18277"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="17.5929,-2.18519;22.0652,4.26977"/>
+        <dia:rectangle val="17.5941,-2.18398;22.064,4.26856"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -192,10 +184,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -234,13 +226,13 @@
         <dia:real val="4.8390429847471363"/>
       </dia:attribute>
       <dia:attribute name="line_width">
-        <dia:real val="0.10000000000000001"/>
+        <dia:real val="0.10000000149011612"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -261,16 +253,16 @@
     </dia:object>
     <dia:object type="Cisco - TV" version="1" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.78561,7.91626"/>
+        <dia:point val="4.8674,7.889"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.78374,7.91391;7.13542,10.2499"/>
+        <dia:rectangle val="3.96112,6.97672;8.12207,11.1154"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.78561,7.91626"/>
+        <dia:point val="4.8674,7.889"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.3472609013178616"/>
@@ -282,10 +274,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -306,10 +298,10 @@
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="12.9624,12.1879"/>
+        <dia:point val="12.6058,12.1231"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.9624,11.5279;17.7599,12.3854"/>
+        <dia:rectangle val="12.6058,11.5698;16.7258,12.2574"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -317,16 +309,16 @@
             <dia:string>#Client (libclient)#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.76482221393664818"/>
+            <dia:real val="0.77611108124256134"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.9624,12.1879"/>
+            <dia:point val="12.6058,12.1231"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -337,67 +329,22 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - STB (set top box)" version="1" id="O6">
-      <dia:attribute name="obj_pos">
-        <dia:point val="7.36498,9.31536"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.36398,9.31436;8.8325,9.95141"/>
-      </dia:attribute>
-      <dia:attribute name="meta">
-        <dia:composite type="dict"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="7.36498,9.31536"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="1.4661067992829642"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="0.63463103621674977"/>
-      </dia:attribute>
-      <dia:attribute name="line_width">
-        <dia:real val="0.10000000000000001"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
-      </dia:attribute>
-      <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
-      </dia:attribute>
-      <dia:attribute name="show_background">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="line_style">
-        <dia:enum val="0"/>
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="flip_horizontal">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="flip_vertical">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="subscale">
-        <dia:real val="1"/>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O7">
+    <dia:object type="Standard - Line" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="17.0481,1.39917"/>
+        <dia:point val="17.5953,1.63397"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.80908,1.3497;17.0976,9.11273"/>
+        <dia:rectangle val="8.52454,1.58451;17.6448,10.0556"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="17.0481,1.39917"/>
-        <dia:point val="8.85855,9.06326"/>
+        <dia:point val="17.5953,1.63397"/>
+        <dia:point val="8.574,10.0062"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
       </dia:attribute>
       <dia:attribute name="line_color">
-        <dia:color val="#828945ff"/>
+        <dia:color val="#777d48"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.070000000000000007"/>
@@ -420,13 +367,17 @@
       <dia:attribute name="end_arrow_width">
         <dia:real val="0.5"/>
       </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O2" connection="7"/>
+        <dia:connection handle="1" to="O0" connection="8"/>
+      </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O8">
+    <dia:object type="Standard - Text" version="1" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.96367,11.1898"/>
+        <dia:point val="5.02851,11.0925"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.96367,10.5298;8.72367,11.3873"/>
+        <dia:rectangle val="5.02851,10.5393;8.42601,11.2268"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -434,16 +385,16 @@
             <dia:string>#Sink (libsink)#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.76482221393664818"/>
+            <dia:real val="0.77611108124256134"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.96367,11.1898"/>
+            <dia:point val="5.02851,11.0925"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -454,12 +405,12 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O9">
+    <dia:object type="Standard - Text" version="1" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="19.2678,-2.57202"/>
+        <dia:point val="19.3514,-2.42606"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.2678,-3.28202;21.3328,-2.35952"/>
+        <dia:rectangle val="19.3514,-3.02964;21.1164,-2.27955"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -467,16 +418,16 @@
             <dia:string>#Server#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.8247944355091722"/>
+            <dia:real val="0.84666663408279419"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="19.2678,-2.57202"/>
+            <dia:point val="19.3514,-2.42606"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -487,16 +438,16 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O10">
+    <dia:object type="Standard - Line" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="12.4381,9.93856"/>
+        <dia:point val="12.2883,10.5206"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.3888,4.62497;16.9155,9.98787"/>
+        <dia:rectangle val="12.2388,4.21792;19.2885,10.5701"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="12.4381,9.93856"/>
-        <dia:point val="16.8662,4.67428"/>
+        <dia:point val="12.2883,10.5206"/>
+        <dia:point val="19.2391,4.26734"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -513,13 +464,26 @@
       <dia:attribute name="start_arrow_width">
         <dia:real val="0.5"/>
       </dia:attribute>
+      <dia:attribute name="end_arrow">
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_length">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:attribute name="end_arrow_width">
+        <dia:real val="0.5"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O1" connection="0"/>
+        <dia:connection handle="1" to="O2" connection="5"/>
+      </dia:connections>
     </dia:object>
-    <dia:object type="Cisco - Radio Tower" version="1" id="O11">
+    <dia:object type="Cisco - Radio Tower" version="1" id="O10">
       <dia:attribute name="obj_pos">
         <dia:point val="34.7279,-1.54667"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.6479,-1.62667;37.12,4.94319"/>
+        <dia:rectangle val="34.3101,-1.58667;37.0889,4.90742"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -537,10 +501,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -559,12 +523,12 @@
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - File Server" version="1" id="O12">
+    <dia:object type="Cisco - File Server" version="1" id="O11">
       <dia:attribute name="obj_pos">
         <dia:point val="28.6989,3.60233"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.6965,3.5999;30.6011,6.66403"/>
+        <dia:rectangle val="28.6977,3.60112;30.5999,6.66281"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -582,10 +546,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -604,12 +568,12 @@
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Terminal" version="1" id="O13">
+    <dia:object type="Cisco - Terminal" version="1" id="O12">
       <dia:attribute name="obj_pos">
         <dia:point val="27.3192,5.42086"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="27.3171,5.41858;28.5492,6.63724"/>
+        <dia:rectangle val="27.3182,5.41972;28.5479,6.63599"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -627,10 +591,10 @@
         <dia:real val="0.10000000000000001"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffffff"/>
+        <dia:color val="#ffffff"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -649,7 +613,7 @@
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O14">
+    <dia:object type="Standard - Arc" version="0" id="O13">
       <dia:attribute name="obj_pos">
         <dia:point val="33.8633,-1.81419"/>
       </dia:attribute>
@@ -661,22 +625,22 @@
         <dia:point val="34.8174,2.13881"/>
       </dia:attribute>
       <dia:attribute name="arc_color">
-        <dia:color val="#cc9f9fff"/>
+        <dia:color val="#cc9f9f"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
         <dia:real val="0.88923828036935093"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O15">
+    <dia:object type="Standard - Line" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.3728,4.0933"/>
+        <dia:point val="28.6989,3.83011"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.471,1.65495;28.4184,4.15709"/>
+        <dia:rectangle val="22.0158,0.402843;28.746,3.87718"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="28.3728,4.0933"/>
-        <dia:point val="22.5166,1.71874"/>
+        <dia:point val="28.6989,3.83011"/>
+        <dia:point val="22.0628,0.449916"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -702,13 +666,17 @@
       <dia:attribute name="end_arrow_width">
         <dia:real val="0.5"/>
       </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O11" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="11"/>
+      </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O16">
+    <dia:object type="Standard - Text" version="1" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.2392,7.64919"/>
+        <dia:point val="28.15,7.56"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.2392,6.95919;29.7892,7.85419"/>
+        <dia:rectangle val="28.15,7.00672;29.4925,7.6943"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -716,16 +684,16 @@
             <dia:string>#Node#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.80000000000000004"/>
+            <dia:real val="0.77611108124256134"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="28.2392,7.64919"/>
+            <dia:point val="28.15,7.56"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -736,33 +704,33 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Cisco - Antenna" version="1" id="O17">
+    <dia:object type="Cisco - Antenna" version="1" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="28.4588,1.12127"/>
+        <dia:point val="28.6251,1.12127"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.3739,1.03641;30.7282,3.68681"/>
+        <dia:rectangle val="28.5827,1.07884;30.8762,3.71519"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="28.4588,1.12127"/>
+        <dia:point val="28.6251,1.12127"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.1845405088777148"/>
+        <dia:real val="2.2087081495126459"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.5655417860204972"/>
+        <dia:real val="2.5939244558160306"/>
       </dia:attribute>
       <dia:attribute name="line_width">
         <dia:real val="0.059999999999999998"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#000000ff"/>
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -781,7 +749,7 @@
         <dia:real val="1"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O18">
+    <dia:object type="Standard - Arc" version="0" id="O17">
       <dia:attribute name="obj_pos">
         <dia:point val="32.7372,-2.60487"/>
       </dia:attribute>
@@ -793,13 +761,13 @@
         <dia:point val="34.1683,3.32463"/>
       </dia:attribute>
       <dia:attribute name="arc_color">
-        <dia:color val="#cc9f9fff"/>
+        <dia:color val="#cc9f9f"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
         <dia:real val="1.3338574205540243"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O19">
+    <dia:object type="Standard - Arc" version="0" id="O18">
       <dia:attribute name="obj_pos">
         <dia:point val="31.5926,-3.36268"/>
       </dia:attribute>
@@ -811,13 +779,13 @@
         <dia:point val="33.5008,4.54332"/>
       </dia:attribute>
       <dia:attribute name="arc_color">
-        <dia:color val="#cc9f9fff"/>
+        <dia:color val="#cc9f9f"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
         <dia:real val="1.778476560738703"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Arc" version="0" id="O20">
+    <dia:object type="Standard - Arc" version="0" id="O19">
       <dia:attribute name="obj_pos">
         <dia:point val="30.4584,-4.13699"/>
       </dia:attribute>
@@ -829,18 +797,18 @@
         <dia:point val="32.8436,5.74551"/>
       </dia:attribute>
       <dia:attribute name="arc_color">
-        <dia:color val="#cc9f9fff"/>
+        <dia:color val="#cc9f9f"/>
       </dia:attribute>
       <dia:attribute name="curve_distance">
         <dia:real val="2.2230957009233752"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O21">
+    <dia:object type="Standard - Text" version="1" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.4167,1.47234"/>
+        <dia:point val="23.8483,1.13329"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.3435,0.859328;28.2937,3.50394"/>
+        <dia:rectangle val="23.8483,0.580013;28.2433,1.2676"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -848,16 +816,16 @@
             <dia:string>#Remote Resource#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.76482221393664818"/>
+            <dia:real val="0.77611108124256134"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="23.4167,1.47234"/>
+            <dia:point val="23.8483,1.13329"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -867,33 +835,30 @@
       <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
-      <dia:attribute name="text_angle">
-        <dia:real val="21.75"/>
-      </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O22">
+    <dia:object type="Standard - Text" version="1" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.3491,7.11348"/>
+        <dia:point val="18.5927,9.60105"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.89688,2.30411;15.0859,7.25733"/>
+        <dia:rectangle val="18.5927,9.02168;18.5927,9.73667"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#Synced Stream (liana)#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.76482221393664818"/>
+            <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="10.3491,7.11348"/>
+            <dia:point val="18.5927,9.60105"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -903,16 +868,46 @@
       <dia:attribute name="valign">
         <dia:enum val="3"/>
       </dia:attribute>
-      <dia:attribute name="text_angle">
-        <dia:real val="-43.25"/>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O22">
+      <dia:attribute name="obj_pos">
+        <dia:point val="15.5943,8.19888"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="15.5943,7.64559;19.7818,8.33318"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#System Interface#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="serif" style="0" name="Times-Roman"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.77611108124256134"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="15.5943,8.19888"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.5927,9.60105"/>
+        <dia:point val="37.6358,7.91856"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.5927,8.91105;18.5927,9.80605"/>
+        <dia:rectangle val="37.6358,7.33919;37.6358,8.05419"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -926,10 +921,10 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="18.5927,9.60105"/>
+            <dia:point val="37.6358,7.91856"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -942,27 +937,27 @@
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="15.4803,8.49876"/>
+        <dia:point val="34.4489,5.64929"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.4803,7.83876;20.4928,8.69626"/>
+        <dia:rectangle val="34.4489,5.09601;37.4989,5.7836"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#System Interface#</dia:string>
+            <dia:string>#The Internet#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
-            <dia:font family="sans" style="0" name="Helvetica"/>
+            <dia:font family="serif" style="0" name="Times-Roman"/>
           </dia:attribute>
           <dia:attribute name="height">
-            <dia:real val="0.76482221393664818"/>
+            <dia:real val="0.77611108124256134"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="15.4803,8.49876"/>
+            <dia:point val="34.4489,5.64929"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -975,10 +970,43 @@
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="37.6358,7.91856"/>
+        <dia:point val="11.0015,14.8342"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="11.0015,14.2809;12.0065,14.9685"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#You#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="serif" style="0" name="Times-Roman"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.77611108124256134"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="11.0015,14.8342"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O26">
+      <dia:attribute name="obj_pos">
+        <dia:point val="8.74582,4.31338"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.6358,7.22856;37.6358,8.12356"/>
+        <dia:rectangle val="8.74582,3.73402;8.74582,4.449"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -992,10 +1020,10 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="37.6358,7.91856"/>
+            <dia:point val="8.74582,4.31338"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -1006,17 +1034,17 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O26">
+    <dia:object type="Standard - Text" version="1" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="34.1144,5.79929"/>
+        <dia:point val="10.7235,4.24854"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="34.1144,5.10929;37.9919,6.00429"/>
+        <dia:rectangle val="10.7235,3.66917;10.7235,4.38416"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#The Internet#</dia:string>
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -1025,10 +1053,10 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="34.1144,5.79929"/>
+            <dia:point val="10.7235,4.24854"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>
@@ -1039,17 +1067,84 @@
         <dia:enum val="3"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O27">
+    <dia:object type="Standard - Text" version="1" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.0312,14.5666"/>
+        <dia:point val="11.6916,4.94287"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.0312,13.8766;12.1112,14.7716"/>
+        <dia:rectangle val="9.8228,4.3724;13.5775,5.88766"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#You#</dia:string>
+            <dia:string>#Synced Stream
+(liana)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="serif" style="0" name="Times-Roman"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.77611108124256134"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="11.6916,4.94287"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="1"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O29">
+      <dia:attribute name="obj_pos">
+        <dia:point val="10.6434,3.01726"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="10.6434,2.43789;10.6434,3.15288"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="10.6434,3.01726"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="Standard - Text" version="1" id="O30">
+      <dia:attribute name="obj_pos">
+        <dia:point val="11.6732,4.84559"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="11.6732,4.26622;11.6732,4.98121"/>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>
@@ -1058,10 +1153,10 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="11.0312,14.5666"/>
+            <dia:point val="11.6732,4.84559"/>
           </dia:attribute>
           <dia:attribute name="color">
-            <dia:color val="#000000ff"/>
+            <dia:color val="#000000"/>
           </dia:attribute>
           <dia:attribute name="alignment">
             <dia:enum val="0"/>