Progress

1 files changed, 174 insertions, 119 deletions

diff --git a/rnv/mannheim.tex b/rnv/mannheim.tex
index ae68717..be4149c 100644
--- a/rnv/mannheim.tex
+++ b/rnv/mannheim.tex
@@ -133,12 +133,12 @@
     \node[stop4, rotate=45] (Wasserturm) at (135:-\rad+0.1) {};
     \node[stop4, rotate=45] (Strohmarkt) at (135:-2) {};
     \node[stop4, rotate=45] (Rathaus) at (135:\rad/2) {};
-    \node[stop4, rotate=45] (Rheinstr) at (135:\rad-0.2) {};
+    \node[stop4, rotate=45] (Rheinstr) at (135:\rad-0.3) {};
     \node[stop6, rotate=-45] (Marktplatz) at ($(45:\rad/2)+(135:-0.4)$) {};
     \node[stop6, rotate=-45] (Abendakademie) at ($(45:\rad-0.2)+(135:-0.4)$) {};
     \node[stop5, rotate=-45] (Schloss) at ($(45:-\rad+1)+(135:-0.5)$) {};
     \node[stop5, rotate=45] (Universität) at ($(45:-\rad)+(135:-0.9)$) {};
-    \node[stop3, rotate=90] (Nationaltheater) at (0:4.2) {};
+    \node[stop3, rotate=90] (Nationaltheater) at (0:\rad+0.8) {};
     \node[stop2, rotate=-25] (Rosengarten) at (-25:\rad+0.4) {};
     \node[stop3, rotate=60] (Kurpfalzbrücke) at (60:\rad+0.3) {};
     \node[stop3, rotate=90] (MVV Hochhaus) at (90:\rad+0.3) {};
@@ -146,23 +146,21 @@
     \node[stop4, rotate=-45] (Kunsthalle) at ($(135:-\rad-0.4)-(45:0.7)$) {};
     \node[stop7, rotate=-45, anchor=one half] (Hauptbahnhof) at ($(Kunsthalle.one half)-(45:1.7)$) {};
     \node[stop4, rotate=45] (Tattersall) at ($(Hauptbahnhof.center)!0.5!(Kunsthalle.center)+(135:-1.1)$) {};
-    \node[stop3, rotate=-45] (Theresienkrankenhaus) at ($(Nationaltheater)+(0:1.6)+(45:0.3)$) {};
-    \node[stop1] (Collini-Center) at ($(Abendakademie.three quarter)+(45:1)+(135:-1)$) {};
+    \node[stop3, rotate=-45] (Theresienkrankenhaus) at ($(Nationaltheater)+(0:2.2)+(45:0.3)$) {};
+    \node[stop1] (Collini-Center) at ($(Abendakademie.three quarter)+(45:1.4)+(135:-1)$) {};
     \node[stop1] (Lessingstr) at ($(Collini-Center)+(135:-3.0)$) {};
     \node[stop1] (Gewerkschaftshaus) at (20:\rad+0.5) {};
     %
-    \node[stop1] (Fernmeldeturm) at ($(Lessingstr)+(135:-0.5)$) {};
-    \node[stop1] (Holbeinstr) at ($(Fernmeldeturm)+(135:-0.4)+(0:0.4)$) {};
-    \node[stop2, rotate=90, anchor=two half] (Neuostheim) at ($(Holbeinstr)+(0:0.5)$) {};
+    \node[stop1] (Fernmeldeturm) at ($(Lessingstr)+(135:-0.7)$) {};
+    \node[stop1] (Holbeinstr) at ($(Fernmeldeturm)+(135:-0.7)$) {};
+    \node[stop2, rotate=90, anchor=two half] (Neuostheim) at ($(Holbeinstr)+(135:-0.4)+(0:0.4)$) {};
     \node[stop1] (Duale Hochschule) at ($(Neuostheim.two half)+(0:0.5)$) {};
-    \node[stop1] (Pforzheimer Str) at ($(Duale Hochschule)+(0:0.5)$) {};
-    \node[stop1] (Deutscher Hof) at ($(Pforzheimer Str)+(0:0.5)$) {};
     % Neckarstadt
-    \node[stop5, rotate=-45] (Alte Feuerwache) at ($(45:\rad+2)+(135:-0.1)$) {};
+    \node[stop5, rotate=-45] (Alte Feuerwache) at ($(45:\rad+2.8)+(135:-0.1)$) {};
     \node[stop2, rotate=45] (Schafweide) at ($(Alte Feuerwache)+(45:0.6)+(135:-1.8)$) {};
-    \node[stop5, rotate=-45] (Universitätsklinikum) at ($(Schafweide)+(135:-2)+(45:0.4)$) {};
-    \node[stop3, rotate=-45, anchor=two half] (Lange Röttgerstr) at ($(Universitätsklinikum.center)+(45:0.8)$) {};
-    \node[stop3, rotate=-45] (Bonifatiuskirche) at ($(Lange Röttgerstr)+(45:0.5)$) {};
+    \node[stop5, rotate=-45] (Universitätsklinikum) at ($(Schafweide)+(135:-2)+(45:0.6)$) {};
+    \node[stop3, rotate=-45, anchor=two half] (Lange Rötterstr) at ($(Universitätsklinikum.center)+(45:0.8)$) {};
+    \node[stop3, rotate=-45] (Bonifatiuskirche) at ($(Lange Rötterstr)+(45:0.5)$) {};
     \node[stop2, rotate=-45, anchor=two half] (Exorzierplatz) at ($(Bonifatiuskirche.two half)+(45:0.5)$) {};
     \node[stop2, rotate=45] (Bibienastr) at ($(Universitätsklinikum.three quarter)+(45:0.4)+(135:-1.0)$) {};
     \node[stop2, rotate=90] (Hauptfriedhof) at ($(Bibienastr)-(135:1.0)+(0:0.4)$) {};
@@ -177,7 +175,7 @@
     \node[stop2] (Carl-Benz-Str) at ($(Alte Feuerwache.center)+(45:0.5)+(90:1.4)$) {};
     \node[stop2, above=0.3cm of Carl-Benz-Str] (Neuer Messplatz) {};
     \node[stop2, above=0.3cm of Neuer Messplatz] (Herzogenriedstr) {};
-    \node[stop1] (Neumarkt) at ($(Alte Feuerwache.one half)+(45:0.5)+(90:0.7)+(180:1.8)$) {};
+    \node[stop1] (Neumarkt) at ($(Alte Feuerwache.one half)+(45:0.7)+(180:1.4)$) {};
     \node[stop1, left=0.3cm of Neumarkt] (Bgm-Fuchs-Str) {};
     \node[stop1, left=0.3cm of Bgm-Fuchs-Str] (Neckarstadt West) {};
     % Luzenberg
@@ -212,7 +210,7 @@
     \node[stop1, above=0.3cm of Jugendverkehrsschule] (Hessische Str) {};
     \node[stop1, above=0.3cm of Hessische Str] (Speckweg) {};
     \node[stop1, above=0.3cm of Speckweg] (Herrmann-Gutzmann-Schule) {};
-    \node[stop1, above=0.6cm of Herrmann-Gutzmann-Schule] (Erlöserkirche) {};
+    \node[stop1, above=0.4cm of Herrmann-Gutzmann-Schule] (Erlöserkirche) {};
     \node[stop1, above=0.3cm of Erlöserkirche] (Waldstr) {};
     \node[stop1, right=0.6cm of Waldstr] (Carl-Benz-Bad) {};
     \node[stop1, above=0.3cm of Waldstr] (Freilichtbühne) {};
@@ -246,29 +244,33 @@
     \node[stop2, rotate=90, right=0.5cm of Werderstr.center, anchor=center] (Pestallozischule) {};
     \node[stop2, rotate=90, right=0.5cm of Pestallozischule.center, anchor=center] (Weberstr) {};
     \node[stop2, rotate=90, right=0.5cm of Weberstr.center, anchor=center] (Planetarium) {};
-    \node[stop2, rotate=-45] (Luisenpark Technoseum) at ($(Planetarium)+(0:0.4)+(45:0.4)$){};
-    \node[stop2, rotate=-45] (Carl-Benz-Stadion) at ($(Luisenpark Technoseum)+(45:0.5)$){};
-    \node[stop2, rotate=-45] (Harrlach) at ($(Carl-Benz-Stadion)+(45:0.5)$){};
-    \node[stop2, rotate=-45] (Lucas-Cranach-Str) at ($(Harrlach)+(45:0.5)$){};
-    \node[stop2, rotate=-45] (Schwindstr) at ($(Lucas-Cranach-Str)+(45:0.5)$){};
-    \node[stop1] (Technoseum Süd) at ($(Planetarium.two half)+(0:0.4)-(135:0.4)$){};
+    \node[stop2, rotate=-45] (Luisenpark Technoseum) at ($(Planetarium)+(0:0.4)+(45:0.5)$){};
+    \node[stop2, rotate=-45] (Carl-Benz-Stadion) at ($(Luisenpark Technoseum)+(45:0.6)$){};
+    \node[stop2, rotate=-45] (Harrlach) at ($(Carl-Benz-Stadion)+(45:0.6)$){};
+    \node[stop2, rotate=-45] (Lucas-Cranach-Str) at ($(Harrlach)+(45:0.6)$){};
+    \node[stop2, rotate=-45] (Schwindstr) at ($(Lucas-Cranach-Str)+(45:0.6)$){};
+    \node[stop1] (Technoseum Süd) at ($(Planetarium.two half)+(0:0.4)-(135:0.8)$){};
     \node[stop1] (Fahrlach) at ($(Technoseum Süd)-(135:0.5)$){};
     \node[stop1] (Husarenweg) at ($(Fahrlach)-(135:0.5)$){};
     \node[stop1] (Ulanenweg) at ($(Husarenweg)-(135:0.5)$){};
     \node[stop1] (Gerd-Dehof-Platz) at ($(Ulanenweg)-(135:0.5)$){};
     \node[stop1] (SAP Arena Süd) at ($(Gerd-Dehof-Platz)-(135:0.5)$){};
+    \node[stop1] (S-Bf SAP Arena) at ($(SAP Arena Süd)-(135:0.5)+(0:1.4)$){};
+    \node[stop1] (Hans-Thoma-Str) at ($(Neuostheim)+(0:0.6)-(90:1.2)$) {};
+    \node[stop1] (Maimarkt) at ($(Hans-Thoma-Str)-(90:1.2)$) {};
+    \node[stop1] (SAP Arena) at ($(Maimarkt)-(90:1.2)$) {};
     % Schwetzingerstadt
-    \node[stop1] (Kopernikusstr) at ($(Tattersall.one half)+(135:-0.4)+(90:-0.7)$) {};
-    \node[stop2, below=0.4cm of Kopernikusstr, anchor=one half] (Krappmühlstr) {};
+    \node[stop1] (Kopernikusstr) at ($(Tattersall.two quarter)+(135:-0.4)+(90:-0.7)$) {};
+    \node[stop2, below=0.4cm of Kopernikusstr, anchor=two half] (Krappmühlstr) {};
     \node[stop2, below=0.3cm of Krappmühlstr] (Hochschule) {};
     % Neckarau
-    \node[stop1, below=0.4cm of Hochschule.one half] (Lettestr) {};
+    \node[stop1, below=0.4cm of Hochschule.two half] (Lettestr) {};
     \node[stop1, below=0.3cm of Lettestr] (Voltastr) {};
     \node[stop1, below=0.3cm of Voltastr] (Neckarau Bf) {};
-    \node[stop2, below=0.4cm of Neckarau Bf, anchor=one half] (Friedrichstr) {};
-    \node[stop1, below=0.4cm of Friedrichstr.one half] (Isarweg) {};
+    \node[stop2, below=0.4cm of Neckarau Bf, anchor=two half] (Friedrichstr) {};
+    \node[stop1, below=0.4cm of Friedrichstr.two half] (Isarweg) {};
     % Lindenhof
-    \node[stop1] (Hauptbahnhof Süd) at ($(Hauptbahnhof.two quarter)-(45:2)-(0,1)$) {};
+    \node[stop1] (Hauptbahnhof Süd) at ($(Hauptbahnhof.one half)-(45:1.4)-(0,0.6)$) {};
     \node[stop1, below=0.3cm of Hauptbahnhof Süd] (Windeckstr) {};
     \node[stop1, below=0.3cm of Windeckstr] (Diesterwegschule) {};
     \node[stop1, below=0.3cm of Diesterwegschule] (Meeräckerplatz) {};
@@ -280,7 +282,7 @@
     \node[stop1, below=0.3cm of Tannhäuser Ring] (Stollenwörth) {};
     \node[stop1, below=0.3cm of Stollenwörth] (Rheingoldhalle) {};
     % Ludwigshafen
-    \node[stop5, rotate=-45] (Berliner Platz) at ($(45:-6)-(135:0.3)$) {};
+    \node[stop5, rotate=-45] (Berliner Platz) at ($(45:-6)-(135:0.5)$) {};
   \end{pgfonlayer}
 
   \begin{pgfonlayer}{lines}
@@ -310,33 +312,40 @@
       -- ($(Universität.center)+(135:0.6)$)
       }
       -- (Universität.center)
-      -- ($(Hauptbahnhof.two half)+(45:-0.4)$)
-      -- (Hauptbahnhof.two half)
+      {[rounded corners=0.3cm]
+      -- ($(Hauptbahnhof.three sixth)+(45:-0.4)$)
+      }
+      -- (Hauptbahnhof.three sixth)
       {[rounded corners=0.2cm]
-      -- ($(Tattersall.one half)+(135:0.35)$)
+      -- ($(Tattersall.two quarter)+(135:1.15)$)
       }
-      -- (Tattersall.one half)
-      -- ($(Tattersall.one half)+(135:-0.4)$)
+      -- (Tattersall.two quarter)
+      -- ($(Tattersall.two quarter)+(135:-0.4)$)
       -- (Kopernikusstr)
-      -- (Krappmühlstr.one half)
-      -- (Hochschule.one half)
+      -- (Krappmühlstr.two half)
+      -- (Hochschule.two half)
       -- (Lettestr)
       -- (Voltastr)
       -- (Neckarau Bf)
-      -- (Friedrichstr.one half)
+      -- (Friedrichstr.two half)
       -- (Isarweg)
     ;
 
     \draw[maybe line, one] 
       (Alte Feuerwache.three quarter)
+      {[rounded corners=0.4cm]
       -- ($(45:\rad+0.3)-(135:0.3)$)
+      }
       arc[start angle=41, end angle=60, radius=\rad+0.3]
       -- (Kurpfalzbrücke.center)
       arc[start angle=60, end angle=90, radius=\rad+0.3]
       -- (MVV Hochhaus.center)
       arc[start angle=90, end angle=120, radius=\rad+0.3]
       -- (Dalbergstr.center)
-      arc[start angle=120, end angle=130, radius=\rad+0.3]
+      arc[start angle=120, end angle=126, radius=\rad+0.3]
+      {[rounded corners=0.5cm]
+      -- ($(Rheinstr.two quarter)+(135:0.6)$)
+      }
       -- (Rheinstr.two quarter)
       -- (Rathaus.two quarter)
       {[rounded corners=0.4cm]
@@ -351,28 +360,29 @@
       -- (Bgm-Fuchs-Str)
       -- (Neumarkt)
       {[rounded corners=0.3cm]
-      -- ($(Alte Feuerwache.one half)+(45:0.5-\offset)+(90:0.7)$)
+      -- ($(Alte Feuerwache.one half)+(45:0.7)$)
       }
-      -- ($(Alte Feuerwache.one half)+(45:0.5)$)
       -- (Alte Feuerwache.one half) 
       -- ($(45:\rad+0.1)+(135:0.3)$)
-      arc[start angle=49, end angle=60, radius=\rad+0.1]
+      arc[start angle=53, end angle=60, radius=\rad+0.1]
       -- (Kurpfalzbrücke.one half)
       arc[start angle=60, end angle=90, radius=\rad+0.1]
       -- (MVV Hochhaus.one half)
-      arc[start angle=90, end angle=120, radius=\rad+0.1]
+      arc[start angle=90, end angle=119, radius=\rad+0.1]
       -- (Dalbergstr.one half)
-      arc[start angle=120, end angle=130, radius=\rad+0.1]
+      {[rounded corners=0.3cm]
+      -- ($(Rheinstr.two half)+(135:0.4)$)
+      }
       -- (Rheinstr.two half) 
       -- (Strohmarkt.two half) 
       -- (Wasserturm.two half)
       {[rounded corners=0.01cm]
       -- ($(135:-\rad-0.5)+(45:0.3)$)
       }
-      arc[start angle=-40.5, end angle=-2.5, radius=\rad+0.5]
+      arc[start angle=-40.5, end angle=-3.8, radius=\rad+0.5]
       -- (Nationaltheater.one half)
       {[rounded corners=0.3cm]
-      -- ($(Nationaltheater.one half)+(0:0.8+2*\offset)$)
+      -- ($(Nationaltheater.one half)+(0:2.2+2*\offset)$)
       }
       -- (Theresienkrankenhaus.two half)
       -- (Universitätsklinikum.two half)
@@ -423,7 +433,7 @@
       -- ($(Wasserturm.one half)+(135:-0.2)$)
       -- (Kunsthalle.one half)
       -- (Hauptbahnhof.one half)
-      -- ($(Hauptbahnhof.one half)+(45:-2)$)
+      -- ($(Hauptbahnhof.one half)-(45:1.4)$)
       -- (Hauptbahnhof Süd)
       -- (Windeckstr)
       -- (Diesterwegschule)
@@ -439,14 +449,19 @@
 
     \draw[maybe line, three] 
       (Alte Feuerwache.two quarter)
-      ($(45:\rad+0.5)+(135:0.1)$)
+      {[rounded corners=0.2cm]
+      -- ($(45:\rad+0.5)+(135:0.1)$)
+      }
       arc[start angle=47, end angle=60, radius=\rad+0.5]
       -- (Kurpfalzbrücke.two half)
       arc[start angle=60, end angle=90, radius=\rad+0.5]
       -- (MVV Hochhaus.two half)
       arc[start angle=90, end angle=120, radius=\rad+0.5]
       -- (Dalbergstr.two half)
-      arc[start angle=120, end angle=133.5, radius=\rad+0.5]
+      arc[start angle=120, end angle=128, radius=\rad+0.5]
+      {[rounded corners=0.6cm]
+      -- ($(Rheinstr.one half)+(135:0.8)$)
+      }
       -- (Rheinstr.one half)
       -- (Rathaus.one half)
       -- (ParadeplatzE.one half)
@@ -472,9 +487,9 @@
       -- (Hochuferstr)
       -- ($(Bonifatiuskirche.one half)+(45:0.2)$)
       -- (Bonifatiuskirche.one half)
-      -- (Lange Röttgerstr.one half)
+      -- (Lange Rötterstr.one half)
       -- (Universitätsklinikum.one half)
-      -- ($(Universitätsklinikum.one half)-(45:0.3)$)
+      -- ($(Universitätsklinikum.one half)-(45:0.5)$)
       -- (Schafweide.two half) 
       {[rounded corners=0.4cm]
       -- ($(Alte Feuerwache.center)+(45:0.7)$)
@@ -486,30 +501,32 @@
       -- (ParadeplatzE.two quarter)
       -- (Strohmarkt.two quarter)
       -- (Wasserturm.two quarter)
+      {[rounded corners=0.3cm]
       -- ($(Wasserturm.two quarter)-(135:0.6)$)
+      }
       -- (Kunsthalle.three quarter)
-      -- ($(Tattersall.two half)-(135:-1.15)$)
-      -- ($(Tattersall.two half)+(45:-0.2)-(135:-0.95)$)
-      -- (Hauptbahnhof.center)
-      -- ($(Hauptbahnhof.center)+(45:-0.8)$)
+      -- ($(Tattersall.two half)-(135:-1.15)+(45:0.1)$)
+      -- ($(Tattersall.two half)+(45:-0.3)-(135:-0.75)$)
+      -- (Hauptbahnhof.four sixth)
+      {[rounded corners=0.7cm]
+      -- ($(Hauptbahnhof.four sixth)+(45:-0.8)$)
+      }
       -- (Universität.one half)
-      {[rounded corners=0.4cm]
-      -- ($(Universität.one half)+(135:0.8)$)
+      {[rounded corners=0.5cm]
+      -- ($(Universität.one half)+(135:0.6)$)
       }
       -- (Berliner Platz.two quarter)
     ;
 
     \draw[line, five]
-      (Deutscher Hof)
-      -- (Pforzheimer Str)
-      -- (Duale Hochschule)
+      (Duale Hochschule)
       -- (Neuostheim.two half)
+      -- ($(Holbeinstr)+(135:-0.4)$)
       -- (Holbeinstr)
-      -- ($(Fernmeldeturm)+(135:-0.4)$)
       -- (Fernmeldeturm)
       -- (Lessingstr)
       -- (Collini-Center)
-      -- ($(Abendakademie.four sixth)+(45:1)$)
+      -- ($(Abendakademie.four sixth)+(45:1.4)$)
       -- (Abendakademie.four sixth)
       -- (Marktplatz.four sixth)
       -- (ParadeplatzW.center)
@@ -518,16 +535,16 @@
       -- ($(Universität.three quarter)+(135:0.4)$)
       }
       -- (Universität.three quarter)
-      -- ($(Hauptbahnhof.one half)-(45:0.2)$)
+      -- ($(Hauptbahnhof.two quarter)-(45:0.2)$)
       -- (Hauptbahnhof.two quarter)
       -- (Kunsthalle.two quarter) 
       -- ($(135:-\rad-0.3)$)
-      arc[start angle=-45, end angle=2.5, radius=\rad+0.3]
+      arc[start angle=-45, end angle=3.6, radius=\rad+0.3]
       -- (Nationaltheater.two half)
-      -- ($(Nationaltheater.two half)+(0:0.8-2*\offset)$)
+      -- ($(Nationaltheater.two half)+(0:2.2-2*\offset)$)
       -- (Theresienkrankenhaus.one half)
       -- (Universitätsklinikum.center)
-      -- (Lange Röttgerstr.two half)
+      -- (Lange Rötterstr.two half)
       -- (Bonifatiuskirche.two half)
       -- (Exorzierplatz.two half)
       -- (Boveristr.two half)
@@ -559,7 +576,9 @@
       -- (ParadeplatzE.three quarter)
       -- (Strohmarkt.three quarter)
       -- (Wasserturm.three quarter)
+      {[rounded corners=0.5cm]
       -- ($(Wasserturm.three quarter)+(135:-0.8)$)
+      }
       -- (Kunsthalle.two half)
       {[rounded corners=0.3cm]
       -- ($(Tattersall.two half)-(135:-0.95)$)
@@ -575,10 +594,12 @@
         -- ($(Universität.two quarter)+(135:0.8)$)
       }
       -- (Universität.two quarter)
-      -- ($(Hauptbahnhof.three sixth)-(45:0.6)$)
-      -- (Hauptbahnhof.three sixth)
+      {[rounded corners=0.5cm]
+      -- ($(Hauptbahnhof.center)-(45:0.6)$)
+      }
+      -- (Hauptbahnhof.center)
       {[rounded corners=0.3cm]
-      -- ($(Tattersall.two half)-(135:-1.15)$)
+      -- ($(Tattersall.two half)-(135:-0.95)$)
       }
       -- (Tattersall.two half)
       -- ($(Tattersall.two half)+(135:-0.4)$)
@@ -592,6 +613,7 @@
       -- (Harrlach.one half)
       -- (Lucas-Cranach-Str.one half)
       -- (Schwindstr.one half)
+      -- ($(Neuostheim.one half)+(180:0.7)$)
       -- (Neuostheim.one half)
       (Planetarium.two half)
       -- ($(Planetarium.two half)+(0:0.4)$)
@@ -601,6 +623,18 @@
       -- (Ulanenweg)
       -- (Gerd-Dehof-Platz)
       -- (SAP Arena Süd)
+      -- ($(SAP Arena Süd)-(135:0.5)$)
+      -- (S-Bf SAP Arena)
+    ;
+
+    \draw[maybe line, six] 
+      {[rounded corners=0.4cm]
+      (Neuostheim.one half)
+      -- ($(Neuostheim.one half)+(0:0.6)$)
+      }
+      {[rounded corners=0.3cm]
+      |- (S-Bf SAP Arena)
+      }
     ;
 
     \draw[line, seven]
@@ -625,11 +659,11 @@
       -- (Universitätsklinikum.three quarter)
       -- (Theresienkrankenhaus)
       {[rounded corners=0.2cm]
-      -- ($(Nationaltheater)+(0:0.8)$)
+      -- ($(Nationaltheater)+(0:2.2)$)
       }
       -- (Nationaltheater)
       -- ($(0:\rad+0.5)$)
-      arc[start angle=0, end angle=31, radius=\rad+0.5]
+      arc[start angle=0, end angle=29, radius=\rad+0.5]
       -- ($(Abendakademie.two half)+(45:0.3)$)
       -- (Abendakademie.two half)
       -- (Marktplatz.two half)
@@ -637,27 +671,41 @@
       -- (Schloss.two half)
       -- (Universität.center)
       -- (Universität.west)
-      {[rounded corners=0.2cm]
-      -- ($(Universität.west)+(45:-0.3)$)
-      -- ($(Berliner Platz.one half)+(45:0.4)$)
-      }
-      -- (Berliner Platz.one half)
+      -- (Berliner Platz.two half)
     ;
 
     \draw[line, eight] 
-      (Berliner Platz) 
-      -- (Hauptbahnhof)
+      (Hauptbahnhof.two half)
+      {[rounded corners=1.1cm]
+      -- ($(Hauptbahnhof.two half)+(45:-1.2)$)
+      }
+      -- ++(135:3.4)
+      -- (Berliner Platz.three quarter)
     ;
     
     \draw[maybe line, eight] 
-      (Hauptbahnhof.three quarter)
-      -- ($(Tattersall.two quarter)+(135:0.55)$)
-      -- (Tattersall.two quarter)
+      (Hauptbahnhof.two half)
+      -- ($(Tattersall.one half)+(135:0.35)$)
+      -- (Tattersall.one half)
+      -- ($(Tattersall.one half)-(135:0.4-2*\offset)$)
+      -- (Krappmühlstr.one half)
+      -- (Hochschule.one half)
+      -- (Friedrichstr.one half)
     ;
 
     \draw[line, nine] 
-      (Hauptbahnhof.four sixth)
-      -- ($(Tattersall.three quarter)+(135:0.75)$)
+      (Hauptbahnhof.three quarter)
+      {[rounded corners=0.9cm]
+      -- ($(Hauptbahnhof.three quarter)+(45:-1.0)$)
+      }
+      {[rounded corners=0.3cm]
+      -- ++(135:3.4)
+      }
+      -- (Berliner Platz)
+      (Hauptbahnhof.three quarter)
+      {[rounded corners=0.3cm]
+      -- ($(Tattersall.three quarter)+(135:0.55)$)
+      }
       -- (Tattersall.three quarter)
       -- ($(Tattersall.three quarter)-(135:0.4+2*\offset)$)
       -- (Werderstr.one half)
@@ -683,18 +731,18 @@
       -- (Boveristr.one half)
       -- (Exorzierplatz.one half)
       -- (Bonifatiuskirche.center)
-      -- (Lange Röttgerstr.center)
+      -- (Lange Rötterstr.center)
       -- (Universitätsklinikum.two quarter)
       {[rounded corners=0.3cm]
-      -- ($(Universitätsklinikum.two quarter)-(45:0.5)$)
+      -- ($(Universitätsklinikum.two quarter)-(45:0.7)$)
       }
       -- (Schafweide.one half)
       {[rounded corners=0.2cm]
       -- ($(Alte Feuerwache.two half)+(45:0.5)$)
       }
       -- (Alte Feuerwache.two half)
-      -- ($(Abendakademie.four sixth)+(45:1.4)$)
-      -- ($(Abendakademie.three quarter)+(45:1)$)
+      -- ($(Abendakademie.four sixth)+(45:1.8)$)
+      -- ($(Abendakademie.three quarter)+(45:1.4)$)
       -- (Abendakademie.three quarter)
       -- (Marktplatz.three quarter)
       -- (ParadeplatzW.three quarter)
@@ -728,10 +776,8 @@
 
   \begin{pgfonlayer}{labels}
     \foreach\stop/\placement/\anchor/\rotate in {
-      Duale Hochschule/below/west/-45,
-      Pforzheimer Str/below/west/-45,
-      Deutscher Hof/below/west/-45,
-      Neuostheim/below left/west/-45,
+      Duale Hochschule/above/west/45,
+      Neuostheim/right/west/45,
       Strohmarkt/right/west/45,
       Rathaus/left/east/0,
       Rheinstr/left/east/0,
@@ -754,26 +800,30 @@
       Weberstr/right/south west/45,
       Planetarium/right/south west/45,
       Luisenpark Technoseum/right/west/-45,
-      Technoseum Süd/left/east/45,
-      Fahrlach/left/east/45,
-      Husarenweg/left/east/45,
-      Ulanenweg/left/east/45,
-      Gerd-Dehof-Platz/left/east/45,
-      SAP Arena Süd/left/east/45,
+      Technoseum Süd/below/east/45,
+      Fahrlach/below/east/45,
+      Husarenweg/below/east/45,
+      Ulanenweg/below/east/45,
+      Gerd-Dehof-Platz/below/east/45,
+      SAP Arena Süd/below/east/45,
       Carl-Benz-Stadion/right/west/-45,
       Harrlach/right/west/-45,
       Lucas-Cranach-Str/right/west/-45,
       Schwindstr/right/west/-45,
+      Hans-Thoma-Str/right/west/0,
+      Maimarkt/right/west/0,
+      SAP Arena/right/west/0,
+      S-Bf SAP Arena/below/north/0,
       Hauptbahnhof/left/east/0,
-      Hauptbahnhof Süd/left/east/0,
-      Windeckstr/left/east/0,
-      Diesterwegschule/left/east/0,
-      Meeräckerplatz/left/east/0,
-      Markuskirche/left/east/0,
-      Franz-Sigel-Str/left/east/0,
-      Freiheitsplatz/left/east/0,
-      Neckarau West/left/east/0,
-      Lange Röttgerstr/right/west/-45,
+      Hauptbahnhof Süd/right/west/0,
+      Windeckstr/right/west/0,
+      Diesterwegschule/right/west/0,
+      Meeräckerplatz/right/west/0,
+      Markuskirche/right/west/0,
+      Franz-Sigel-Str/right/west/0,
+      Freiheitsplatz/right/west/0,
+      Neckarau West/right/west/0,
+      Lange Rötterstr/right/west/-45,
       Bonifatiuskirche/right/west/-45,
       Exorzierplatz/right/west/-45,
       Boveristr/right/west/-45,
@@ -797,18 +847,18 @@
       Franklinschule/left/east/0,
       Franklin Mitte/left/east/0,
       Sullivan/left/east/0,
-      Tannhäuser Ring/left/east/0,
-      Stollenwörth/left/east/0,
-      Rheingoldhalle/left/east/0,
+      Tannhäuser Ring/right/west/0,
+      Stollenwörth/right/west/0,
+      Rheingoldhalle/right/west/0,
       Kurpfalzbrücke/left/east/0,
-      Kopernikusstr/left/east/0,
-      Hochschule/left/east/0,
-      Lettestr/left/east/0,
-      Voltastr/left/east/0,
-      Neckarau Bf/left/east/0,
-      Friedrichstr/left/east/0,
-      Isarweg/left/east/0,
-      Krappmühlstr/left/east/0,
+      Kopernikusstr/right/west/0,
+      Krappmühlstr/right/west/0,
+      Hochschule/right/west/0,
+      Lettestr/right/west/0,
+      Voltastr/right/west/0,
+      Neckarau Bf/right/west/0,
+      Friedrichstr/right/west/0,
+      Isarweg/right/west/0,
       Schafweide/left/east/0,
       Hochuferstr/left/east/0,
       Landwehrsteg/left/east/0,
@@ -843,7 +893,7 @@
       Freilichtbühne/left/east/0,
       Waldfriedhof/left/east/0,
       Universitätsklinikum/left/east/-45,
-      Bibienastr/above left/east/45,
+      Bibienastr/left/east/45,
       Hauptfriedhof/right/west/45,
       Pfeifferswörth/right/west/45,
       Neckarplatt/right/west/45,
@@ -856,8 +906,9 @@
       Adolf-Damaschke-Ring/right/west/-45,
       Ziethenstr/right/west/-45,
       Theresienkrankenhaus/right/west/0,
-      Lessingstr/right/west/0,
-      Fernmeldeturm/right/west/0,
+      Lessingstr/left/east/45,
+      Fernmeldeturm/left/east/45,
+      Holbeinstr/left/east/45,
       Gewerkschaftshaus/left/east/45,
       Neumarkt/above/east/-45,
       Bgm-Fuchs-Str/above/east/-45,
@@ -869,11 +920,15 @@
     \node[label, line name, fill=two, left=0.2cm of Neckarstadt West] {\bf 2};
     \node[label, line name, fill=two, right=0.2cm of Feudenheim] {\bf 2};
     \node[label, line name, fill=three, above=0.2cm of Sandhofen] {\bf 3};
-    \node[label, line name, fill=three, right=0.2cm of Rheingoldhalle] {\bf 3};
+    \node[label, line name, fill=three, left=0.2cm of Rheingoldhalle] {\bf 3};
     \node[label, line name, fill=four, above=0.2cm of Waldfriedhof] {\bf 4};
     \node[label, line name, fill=four, above=0.2cm of Käfertaler Wald] {\bf 4A};
     \node[label, line name, fill=five, right=0.2cm of Heddesheim Bf] {\bf 5A};
+    \node[label, line name, fill=six, right=0.2cm of S-Bf SAP Arena] (lab six) {\bf 6};
+    \node[label, line name, fill=six, right=0.1cm of lab six] {\bf 6A};
     \node[label, line name, fill=seven, above=0.2cm of Vogelstang] {\bf 7};
+    \node[label, line name, fill=nine] (nine lab) at ($(Schwindstr)+(45:0.1)+(0:0.4)$) {\bf 9};
+    \node[label, nine, right=-0.05cm of nine lab] {\bf EX};
     \node[label, line name, fill=fifteen, right=0.2cm of Wallstadt Ost.east, anchor=south west] {\bf 15};
     \node[label, line name, fill=sixteen, right=0.2cm of Sullivan] {\bf 16};
     \node[label, line name, fill=sixteen, left=0.2cm of Bensheimer Str] {\bf 16};