diff --git a/doc/xschem_man/tutorial_xschem_slides.html b/doc/xschem_man/tutorial_xschem_slides.html
index 04792b9a..44038540 100644
--- a/doc/xschem_man/tutorial_xschem_slides.html
+++ b/doc/xschem_man/tutorial_xschem_slides.html
@@ -32,8 +32,8 @@ p{padding: 15px  30px 10px;}
    <li>Core is written in C89 for max portability, GUI and scripting language implemented with Tcl-Tk.</li>
    <li>XSCHEM understands vector instances and bus notations like DATA[15:0,31:16].</li>
    <li>TCL API for forward / backward annotation to / from 3rd party EDA software.</li>
-   <li>Works on most unix-likes and on Windows if the Cygwin / XWin layer is installed.</li>
-   <li>Native Windows port is planned.</li>
+   <li>Works on most unix-likes.</li>
+   <li>Native Windows port available.</li>
   </ul>
  </h3>
  <img src="tutorial_xschem_slides01.png" style="position:fixed; top:20%; right:2%;max-width: 30%;border: 1px solid">
diff --git a/doc/xschem_man/tutorial_xschem_slides01.html b/doc/xschem_man/tutorial_xschem_slides01.html
index 3169df49..3491c9e0 100644
--- a/doc/xschem_man/tutorial_xschem_slides01.html
+++ b/doc/xschem_man/tutorial_xschem_slides01.html
@@ -31,7 +31,8 @@ p{padding: 15px  30px 10px;}
    <li><a href="tutorial_xschem_slides06.html">Hierarchy, symbols and component instances</a></li>
    <li><a href="tutorial_xschem_slides07.html">Instance attributes and parametrized subcircuits</a></li>
    <li><a href="tutorial_xschem_slides08.html">Simulation</a></li>
-   <li><a href="tutorial_xschem_slides082.html">Roadmap</a></li>
+   <li><a href="tutorial_xschem_slides083.html">Wave viewing</a></li>
+   <li><a href="tutorial_xschem_slides085.html">Roadmap</a></li>
    <li><a href="tutorial_xschem_slides09.html">Conclusions</a></li>
    <li><a href="tutorial_xschem_slides10.html">Contacts</a></li>
   </ul>
diff --git a/doc/xschem_man/tutorial_xschem_slides04.html b/doc/xschem_man/tutorial_xschem_slides04.html
index 19aafa93..23a1a4ef 100644
--- a/doc/xschem_man/tutorial_xschem_slides04.html
+++ b/doc/xschem_man/tutorial_xschem_slides04.html
@@ -48,7 +48,6 @@ p{padding: 15px  30px 10px;}
    <li>Proprietary or using undocumented file formats.</li>
    <li>A layout tool.</li>
    <li>A circuit simulator.</li>
-   <li>A native windows software (yet).</li>
    <li>Super easy to use: there is a learning curve.</li>
    <li>A memory hog: XSCHEM with a medium design loaded requires 54M virtual memory, 24M resident set. 
        Perfectly useable on an Intel-Atom netbook with 1GB RAM.  This is my performance test machine.</li>
diff --git a/doc/xschem_man/tutorial_xschem_slides05.html b/doc/xschem_man/tutorial_xschem_slides05.html
index bed3a258..56d8a8a7 100644
--- a/doc/xschem_man/tutorial_xschem_slides05.html
+++ b/doc/xschem_man/tutorial_xschem_slides05.html
@@ -27,7 +27,7 @@ p{padding: 15px  30px 10px;}
    <table>
      <tr><th>FEATURE</th><th>DESCRIPTION</th></tr>
      <tr><td>File format for schematic and symbol files.</td><td>ASCII</td></tr>
-     <tr><td>Multiple schematic /symbol windows.</td><td>Each handled by 1 XSCHEM instance. A crash of one instance does not crash all others.</td></tr>
+     <tr><td>Multiple schematic /symbol windows.</td><td>Each handled by 1 XSCHEM instance. A crash of one instance does not crash all others. Tabbed and multi-windows interface has been added.</td></tr>
      <tr><td>Clipboard copy / paste (ctrl-c ctrl-v), across hierarchy levels.</td><td>Yes, between different windows too.</td></tr>
      <tr><td>Copy from one window to other window.</td><td>Yes.</td></tr>
      <tr><td>Memory footprint.</td><td>Very low, data purged on hierarchy traversal.</td></tr>
@@ -38,7 +38,6 @@ p{padding: 15px  30px 10px;}
      <tr><td>Instance pin auto wiring.</td><td>Yes.</td></tr>
      <tr><td>Net auto-router engine.</td><td>No.</td></tr>
      <tr><td>Parametric symbols</td><td>Yes.</td></tr>
-     <tr><td>Bus notation for nets and components.</td><td>Yes.</td></tr>
    </table>
   </h3>
  </div>
@@ -47,7 +46,8 @@ p{padding: 15px  30px 10px;}
   <h3 style="text-align:left; max-width: 100%;margin-left:0;font-size: 90%;">
    <table>
      <tr><th>FEATURE</th><th>DESCRIPTION</th></tr>
-     <tr><td>Portability.</td><td>All UNIX systems with Tcl and X11, Windows with the Cygwin layer.</td></tr>
+     <tr><td>Bus notation for nets and components.</td><td>Yes.</td></tr>
+     <tr><td>Portability.</td><td>All UNIX systems with Tcl and X11, Windows with VS and Active-Tcl.</td></tr>
      <tr><td>Netlisting performance.</td><td>Extremely fast, Complex system with 59 sub blocks netlisted in VHDL in &lt; 1 second on a Linux laptop.</td></tr>
      <tr><td>Startup time.</td><td>Fast (&lt;1 sec).</td></tr>
      <tr><td>Primitive component creation with arbitrary code for VHDL/SPICE/verilog.</td><td>Works out of the box with very simple property strings.</td></tr>
diff --git a/doc/xschem_man/tutorial_xschem_slides071.html b/doc/xschem_man/tutorial_xschem_slides071.html
index 028845c1..c2336e1e 100644
--- a/doc/xschem_man/tutorial_xschem_slides071.html
+++ b/doc/xschem_man/tutorial_xschem_slides071.html
@@ -32,7 +32,7 @@ p{padding: 15px  30px 10px;}
   </ul>
  </h3>
  <img src="tutorial_xschem_slides17.png" style="position:fixed; top:10%; right:2%;width:25%; max-width: 25%;">
- <img src="tutorial_xschem_slides18.png" style="position:fixed; bottom:5%; left:8%;width:45%; max-width: 45%;">
+ <img src="tutorial_xschem_slides18.png" style="position:fixed; bottom:5%; left:8%;width:45%; max-width: 40%;">
  <!-- end of slide -->
  <div class="filler"></div>
 </div>
diff --git a/doc/xschem_man/tutorial_xschem_slides08.html b/doc/xschem_man/tutorial_xschem_slides08.html
index 5a133b36..a8863da2 100644
--- a/doc/xschem_man/tutorial_xschem_slides08.html
+++ b/doc/xschem_man/tutorial_xschem_slides08.html
@@ -15,7 +15,7 @@ th,td {font-size: 60%;padding: 3px;}
 <!-- start of slide -->
 <div class="content">   
 <!-- navigation buttons -->
-<a href="tutorial_xschem_slides07.html" class="prev">PREV</a>
+<a href="tutorial_xschem_slides071.html" class="prev">PREV</a>
 <a href="tutorial_xschem_slides01.html" class="home">UP</a>
 <a href="tutorial_xschem_slides081.html" class="next">NEXT</a>
 
diff --git a/doc/xschem_man/tutorial_xschem_slides0812.html b/doc/xschem_man/tutorial_xschem_slides0812.html
index fa379f57..ef490196 100644
--- a/doc/xschem_man/tutorial_xschem_slides0812.html
+++ b/doc/xschem_man/tutorial_xschem_slides0812.html
@@ -16,7 +16,7 @@ p{padding: 15px  30px 10px;}
 <!-- navigation buttons -->
 <a href="tutorial_xschem_slides081.html" class="prev">PREV</a>
 <a href="tutorial_xschem_slides01.html" class="home">UP</a>
-<a href="tutorial_xschem_slides082.html" class="next">NEXT</a>
+<a href="tutorial_xschem_slides083.html" class="next">NEXT</a>
 
 
  <!-- slide title -->
diff --git a/doc/xschem_man/tutorial_xschem_slides083.html b/doc/xschem_man/tutorial_xschem_slides083.html
new file mode 100644
index 00000000..9572889b
--- /dev/null
+++ b/doc/xschem_man/tutorial_xschem_slides083.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>XSCHEM PRESENTATION</title>
+<link rel="stylesheet" type="text/css" href="xschem_man.css" />
+<style type="text/css">
+/* Local styling goes here */
+p{padding: 15px  30px 10px;}
+.content{ background-image:url('xschem_bg2.png');}
+</style>
+
+</head>
+<body>
+<!-- start of slide -->
+<div class="content">   
+<!-- navigation buttons -->
+<a href="tutorial_xschem_slides0812.html" class="prev">PREV</a>
+<a href="tutorial_xschem_slides01.html" class="home">UP</a>
+<a href="tutorial_xschem_slides085.html" class="next">NEXT</a>
+
+
+ <!-- slide title -->
+ <h1 style="max-width: 80%;">WAVE VIEWING</h1>
+
+ <!-- end of slide -->
+ <div class="filler"></div>
+</div>
+
+<!-- frame footer -->
+<iframe seamless src="xschem_footer.html"  class="footer_iframe" >
+</body>
+</html>
+
diff --git a/doc/xschem_man/tutorial_xschem_slides082.html b/doc/xschem_man/tutorial_xschem_slides085.html
similarity index 95%
rename from doc/xschem_man/tutorial_xschem_slides082.html
rename to doc/xschem_man/tutorial_xschem_slides085.html
index e08d34b9..8ec88193 100644
--- a/doc/xschem_man/tutorial_xschem_slides082.html
+++ b/doc/xschem_man/tutorial_xschem_slides085.html
@@ -14,7 +14,7 @@ p{padding: 15px  30px 10px;}
 <!-- start of slide -->
 <div class="content">   
 <!-- navigation buttons -->
-<a href="tutorial_xschem_slides0812.html" class="prev">PREV</a>
+<a href="tutorial_xschem_slides083.html" class="prev">PREV</a>
 <a href="tutorial_xschem_slides01.html" class="home">UP</a>
 <a href="tutorial_xschem_slides09.html" class="next">NEXT</a>
 
diff --git a/doc/xschem_man/tutorial_xschem_slides09.html b/doc/xschem_man/tutorial_xschem_slides09.html
index 22fd59c8..88052da9 100644
--- a/doc/xschem_man/tutorial_xschem_slides09.html
+++ b/doc/xschem_man/tutorial_xschem_slides09.html
@@ -14,7 +14,7 @@ p{padding: 15px  30px 10px;}
 <!-- start of slide -->
 <div class="content">   
 <!-- navigation buttons -->
-<a href="tutorial_xschem_slides082.html" class="prev">PREV</a>
+<a href="tutorial_xschem_slides085.html" class="prev">PREV</a>
 <a href="tutorial_xschem_slides01.html" class="home">UP</a>
 <a href="tutorial_xschem_slides10.html" class="next">NEXT</a>
 
diff --git a/doc/xschem_man/tutorial_xschem_slides18.png b/doc/xschem_man/tutorial_xschem_slides18.png
index 83248e12..ad6931bb 100644
Binary files a/doc/xschem_man/tutorial_xschem_slides18.png and b/doc/xschem_man/tutorial_xschem_slides18.png differ