diff --git a/README.md b/README.md
index 8873c3dce..075eae92f 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ For more details see http://www.klayout.org.
 
 Building on Linux:
 
-* Qt 4.7 or later (4.6 with some restrictions) or Qt 5
+* Qt 4.7 or later (4.6 with some restrictions), Qt 5 or Qt 6
 * gcc 4.6 or later or clang 3.8 or later
 
 Building on Windows with MSYS2:
 
-* MSYS2 with gcc, Qt4 or 5, zlib, ruby and python packages installed
+* MSYS2 with gcc, Qt4, 5 or 6, zlib, ruby and python packages installed
 
 Building on Windows with MSVC 2017:
 
@@ -34,14 +34,10 @@ For more build instructions see http://www.klayout.de/build.html.
 
 ## Building instructions (Linux)
 
-### Plain building for Qt4
+### Plain building for Qt4, Qt5 and Qt6 (one Qt version installed)
 
     ./build.sh
 
-### Plain building for Qt5
-
-    ./build.sh -qt5
-
 ### Building without Qt binding
 
     ./build.sh -without-qtbinding
diff --git a/src/db/db/dbCommonReader.cc b/src/db/db/dbCommonReader.cc
index 315499971..0400621eb 100644
--- a/src/db/db/dbCommonReader.cc
+++ b/src/db/db/dbCommonReader.cc
@@ -556,6 +556,7 @@ CommonReader::read (db::Layout &layout)
 void
 CommonReader::init (const LoadLayoutOptions &options)
 {
+  ReaderBase::init (options);
   CommonReaderBase::init ();
 
   db::CommonReaderOptions common_options = options.get_options<db::CommonReaderOptions> ();
diff --git a/src/db/db/dbCommonReader.h b/src/db/db/dbCommonReader.h
index 9610e1634..b5a5a9a19 100644
--- a/src/db/db/dbCommonReader.h
+++ b/src/db/db/dbCommonReader.h
@@ -237,7 +237,7 @@ protected:
   friend class CommonReaderLayerMapping;
 
   virtual void common_reader_error (const std::string &msg) = 0;
-  virtual void common_reader_warn (const std::string &msg) = 0;
+  virtual void common_reader_warn (const std::string &msg, int warn_level = 1) = 0;
 
   /**
    * @brief Merge (and delete) the src_cell into target_cell
diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc
index 6b9bf63cc..d8c9114d5 100644
--- a/src/db/db/dbLayoutToNetlist.cc
+++ b/src/db/db/dbLayoutToNetlist.cc
@@ -1366,9 +1366,10 @@ compute_area_and_perimeter_of_net_shapes (const db::hier_clusters<db::NetShape>
   perimeter = ap_collector.perimeter ();
 }
 
-static void
+static db::Point
 get_merged_shapes_of_net (const db::hier_clusters<db::NetShape> &clusters, db::cell_index_type ci, size_t cid, unsigned int layer_id, db::Shapes &shapes)
 {
+  db::Point ref;
   db::EdgeProcessor ep;
 
   //  count vertices and reserve space
@@ -1380,16 +1381,76 @@ get_merged_shapes_of_net (const db::hier_clusters<db::NetShape> &clusters, db::c
 
   size_t p = 0;
   for (db::recursive_cluster_shape_iterator<db::NetShape> rci (clusters, layer_id, ci, cid); !rci.at_end (); ++rci) {
-    ep.insert (rci.trans () * rci->polygon_ref (), ++p);
+    if (p == 0) {
+      db::PolygonRef pr = (rci.trans () * rci->polygon_ref ());
+      db::PolygonRef::polygon_edge_iterator e = pr.begin_edge ();
+      if (! e.at_end ()) {
+        //  pick one reference point for the label
+        ref = (*e).p1 ();
+        ep.insert (pr, ++p);
+      }
+    } else {
+      ep.insert (rci.trans () * rci->polygon_ref (), ++p);
+    }
   }
 
   db::ShapeGenerator sg (shapes);
   db::PolygonGenerator pg (sg, false);
   db::SimpleMerge op;
   ep.process (pg, op);
+
+  return ref;
 }
 
-db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_area_factor, double gate_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes)
+static std::string
+create_antenna_msg (double agate, db::Polygon::area_type agate_int, double gate_area_factor, db::Polygon::perimeter_type pgate_int, double gate_perimeter_factor,
+                    double ametal, db::Polygon::area_type ametal_int, double metal_area_factor, db::Polygon::perimeter_type pmetal_int, double metal_perimeter_factor,
+                    const std::vector<std::pair<const db::Region *, double> > &diodes,
+                    const std::vector<db::Polygon::area_type> &adiodes_int,
+                    double r, double ratio, double dbu)
+{
+  std::string msg;
+  msg            += tl::sprintf ("agate_eff: %.12g, ", agate);
+  if (fabs (gate_area_factor) > 1e-6) {
+    msg          += tl::sprintf ("agate: %.12g, agate_factor: %.12g, ", agate_int * dbu * dbu, gate_area_factor);
+  }
+  if (fabs (gate_perimeter_factor) > 1e-6) {
+    msg          += tl::sprintf ("pgate: %.12g, pgate_factor: %.12g, ", pgate_int * dbu * dbu, gate_perimeter_factor);
+  }
+  msg            += tl::sprintf ("ametal_eff: %.12g, ", ametal);
+  if (fabs (metal_area_factor) > 1e-6) {
+    msg          += tl::sprintf ("ametal: %.12g, ametal_factor: %.12g, ", ametal_int * dbu * dbu, metal_area_factor);
+  }
+  if (fabs (metal_perimeter_factor) > 1e-6) {
+    msg          += tl::sprintf ("pmetal: %.12g, pmetal_factor: %.12g, ", pmetal_int * dbu * dbu, metal_perimeter_factor);
+  }
+  if (! adiodes_int.empty ()) {
+    msg          += "adiodes: [";
+    for (auto d = adiodes_int.begin (); d != adiodes_int.end (); ++d) {
+      if (d != adiodes_int.begin ()) {
+        msg      += ", ";
+      }
+      msg        += tl::sprintf ("%.12g", *d * dbu * dbu);
+    }
+    msg          += "], ";
+  }
+  if (! diodes.empty ()) {
+    msg          += "diode_factors: [";
+    for (auto d = diodes.begin (); d != diodes.end (); ++d) {
+      if (d != diodes.begin ()) {
+        msg      += ", ";
+      }
+      msg        += tl::sprintf ("%.12g", d->second);
+    }
+    msg          += "], ";
+  }
+  msg            += tl::sprintf ("ratio: %.12g, ", ametal / agate);
+  msg            += tl::sprintf ("max_ratio_eff: %.12g, ", r);
+  msg            += tl::sprintf ("max_ratio: %.12g", ratio);
+  return msg;
+}
+
+db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_area_factor, double gate_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes, db::Texts *values)
 {
   //  TODO: that's basically too much .. we only need the clusters
   if (! m_netlist_extracted) {
@@ -1401,6 +1462,11 @@ db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_a
 
   db::DeepLayer dl (&dss (), m_layout_index, ly.insert_layer ());
 
+  db::DeepLayer dlv;
+  if (values) {
+    dlv = db::DeepLayer (&dss (), m_layout_index, ly.insert_layer ());
+  }
+
   for (db::Layout::bottom_up_const_iterator cid = ly.begin_bottom_up (); cid != ly.end_bottom_up (); ++cid) {
 
     const connected_clusters<db::NetShape> &clusters = m_net_clusters.clusters_per_cell (*cid);
@@ -1408,6 +1474,8 @@ db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_a
       continue;
     }
 
+    std::vector<db::Polygon::area_type> adiodes_int;
+
     for (connected_clusters<db::NetShape>::all_iterator c = clusters.begin_all (); ! c.at_end (); ++c) {
 
       if (! clusters.is_root (*c)) {
@@ -1417,13 +1485,18 @@ db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_a
       double r = ratio;
       bool skip = false;
 
-      for (std::vector<std::pair<const db::Region *, double> >::const_iterator d = diodes.begin (); d != diodes.end () && ! skip; ++d) {
+      adiodes_int.clear ();
+      adiodes_int.reserve (diodes.size ());
+
+      for (auto d = diodes.begin (); d != diodes.end () && ! skip; ++d) {
 
         db::Polygon::area_type adiode_int = 0;
         db::Polygon::perimeter_type pdiode_int = 0;
 
         compute_area_and_perimeter_of_net_shapes (m_net_clusters, *cid, *c, layer_of (*d->first), adiode_int, pdiode_int);
 
+        adiodes_int.push_back (adiode_int);
+
         if (fabs (d->second) < db::epsilon) {
           if (adiode_int > 0) {
             skip = true;
@@ -1465,12 +1538,29 @@ db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_a
           }
 
           if (tl::verbosity () >= 50) {
-            tl::info << "cell [" << ly.cell_name (*cid) << "]: agate=" << tl::to_string (agate) << ", ametal=" << tl::to_string (ametal) << ", r=" << tl::sprintf ("%.12g", r);
+            tl::info << "cell [" << ly.cell_name (*cid) << "]: " <<
+              create_antenna_msg (agate, agate_int, gate_area_factor, pgate_int, gate_perimeter_factor,
+                                  ametal, ametal_int, metal_area_factor, pmetal_int, metal_perimeter_factor,
+                                  diodes, adiodes_int, r, ratio, dbu);
           }
 
           if (ametal / agate > r + db::epsilon) {
+
             db::Shapes &shapes = ly.cell (*cid).shapes (dl.layer ());
-            get_merged_shapes_of_net (m_net_clusters, *cid, *c, layer_of (metal), shapes);
+            db::Point ref = get_merged_shapes_of_net (m_net_clusters, *cid, *c, layer_of (metal), shapes);
+
+            if (values) {
+
+              //  generate a data string with the details of the antenna computation (intentionally like JSON)
+              std::string msg = create_antenna_msg (agate, agate_int, gate_area_factor, pgate_int, gate_perimeter_factor,
+                                                    ametal, ametal_int, metal_area_factor, pmetal_int, metal_perimeter_factor,
+                                                    diodes, adiodes_int, r, ratio, dbu);
+
+              db::Shapes &shapesv = ly.cell (*cid).shapes (dlv.layer ());
+              shapesv.insert (db::Text (msg, db::Trans (ref - db::Point ())));
+
+            }
+
           }
 
         }
@@ -1481,6 +1571,10 @@ db::Region LayoutToNetlist::antenna_check (const db::Region &gate, double gate_a
 
   }
 
+  if (values) {
+    *values = db::Texts (new db::DeepTexts (dlv));
+  }
+
   return db::Region (new db::DeepRegion (dl));
 }
 
diff --git a/src/db/db/dbLayoutToNetlist.h b/src/db/db/dbLayoutToNetlist.h
index 6b04e5cce..f1b099076 100644
--- a/src/db/db/dbLayoutToNetlist.h
+++ b/src/db/db/dbLayoutToNetlist.h
@@ -856,18 +856,18 @@ public:
    *  regardless of the diode's area.
    *  In other words: any diode will make the net safe against antenna discharge.
    */
-  db::Region antenna_check (const db::Region &gate, double gate_perimeter_factor, const db::Region &metal, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > ())
+  db::Region antenna_check (const db::Region &gate, double gate_perimeter_factor, const db::Region &metal, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > (), db::Texts *values = 0)
   {
-    return antenna_check (gate, 1.0, gate_perimeter_factor, metal, 1.0, metal_perimeter_factor, ratio, diodes);
+    return antenna_check (gate, 1.0, gate_perimeter_factor, metal, 1.0, metal_perimeter_factor, ratio, diodes, values);
   }
 
   /**
    *  @brief Variant of the antenna check not using the perimeter
    *  This version uses 0 for the perimeter factor hence not taking into account the perimeter at all.
    */
-  db::Region antenna_check (const db::Region &gate, const db::Region &metal, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > ())
+  db::Region antenna_check (const db::Region &gate, const db::Region &metal, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > (), db::Texts *values = 0)
   {
-    return antenna_check (gate, 1.0, 0.0, metal, 1.0, 0.0, ratio, diodes);
+    return antenna_check (gate, 1.0, 0.0, metal, 1.0, 0.0, ratio, diodes, values);
   }
 
   /**
@@ -879,8 +879,10 @@ public:
    *
    *  where f is the area scale factor and t the perimeter scale factor. This version allows to ignore the
    *  area contribution entirely and switch to a perimeter-based antenna check by setting f to zero.
+   *
+   *  If values is non-null, texts explaining the violations are placed there.
    */
-  db::Region antenna_check (const db::Region &gate, double gate_area_factor, double gate_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > ());
+  db::Region antenna_check (const db::Region &gate, double gate_area_factor, double gate_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<std::pair<const db::Region *, double> > &diodes = std::vector<std::pair<const db::Region *, double> > (), Texts *values = 0);
 
   /**
    *  @brief Saves the database to the given path
diff --git a/src/db/db/dbLayoutToNetlistFormatDefs.h b/src/db/db/dbLayoutToNetlistFormatDefs.h
index d77386a2d..428eaaeaa 100644
--- a/src/db/db/dbLayoutToNetlistFormatDefs.h
+++ b/src/db/db/dbLayoutToNetlistFormatDefs.h
@@ -46,55 +46,76 @@ namespace db
  *  The file follows the declaration-before-use principle
  *  (circuits before subcircuits, nets before use ...)
  *
- *  Global statements:
+ *  Main body:
+ *    [version|description|unit|top|layer|connect|global|circuit|class|device|any]*
  *
+ *  [version]:
  *    version(<number>)             - file format version [short key: V]
+ *
+ *  [description]:
  *    description(<text>)           - an arbitrary description text [short key: B]
+ *
+ *  [unit]:
  *    unit(<unit>)                  - specifies the database unit [short key: U]
+ *
+ *  [top]:
  *    top(<circuit>)                - specifies the name of the top circuit [short key: W]
+ *
+ *  [layer]:
  *    layer(<name> <source-spec>?)  - define a layer [short key: L]
+ *
+ *  [connect]:
  *    connect(<layer1> <name> ...)  - connects layer1 with the following layers [short key: C]
+ *
+ *  [global]:
  *    global(<layer> <net-name> ...)
  *                                  - connects the shapes of the layer with the given global
  *                                    nets [short key: G]
+ *
+ *  [circuit]:
  *    circuit(<name> [circuit-def]) - circuit (cell) [short key: X]
+ *
+ *  [class]:
  *    class(<name> <template> [template-def])  - a device class definition (template: RES,CAP,...) [short key: K]
- *    device(<name> <class> [device-abstract-def])
+ *
+ *  [device]:
+ *    device(<name> <class> [device-abstract-terminal|any]*)
  *                                  - device abstract [short key: D]
  *
  *  [circuit-def]:
+ *    [boundary|property|circuit-net|circuit-pin|circuit-device|subcircuit|any]*
  *
- *    [boundary-def]
- *
- *    [property-def]*
- *
- *    net(<id> [name]? [property-def]* [geometry-def]*)
+ *  [circuit-net]:
+ *    net(<id> [name]? [geometries-def])
  *                                  - net geometry [short key: N]
  *                                    A net declaration shall be there also if no geometry
  *                                    is present. The ID is a numerical shortcut for the net.
+ *
+ *  [circuit-pin]:
  *    pin(<net-id> [name]?)         - outgoing pin connection [short key: P]
  *                                    Statement order specifies pin order.
- *    device(<id> <abstract-or-class> [name]? [combined-device]* [terminal-route]* [device-def])
+ *
+ *  [circuit-device]:
+ *    device(<id> <abstract-or-class> [name|trans|combined-device|terminal-route|param|device-terminal|any]*)
  *                                  - device with connections [short key: D]
- *    circuit(<id> [name]? [subcircuit-def])
+ *
+ *  [subcircuit]:
+ *    circuit(<id> [name]? [property|trans|subcircuit-pin|any])
  *                                  - subcircuit with connections [short key: X]
  *
- *  [boundary-def]:
- *
- *    polygon([coord] ...)          - defines a polygon [short key: Q]
+ *  [boundary]:
+ *    polygon([coord] ...) |        - defines a polygon [short key: Q]
  *                                    "*" for <x> or <y> means take previous
  *    rect([coord] [coord])         - defines a rectangle [short key: R]
  *                                    coordinates are bottom/left and top/right
  *
  *  [combined-device]:
- *
- *    device(<abstract> [trans-def])
+ *    device(<abstract> [trans])
  *                                  - specifies an additional device component
  *                                    (for combined devices) with abstract <abstract>
  *                                    and offset dx, dy.
  *
  *  [terminal-route]:
- *
  *    connect(<device-index> <outer-terminal-name> <inner-terminal-name>)
  *                                  - connects the outer terminal with the terminal
  *                                    of the device component with <device-index>:
@@ -102,68 +123,70 @@ namespace db
  *                                    device etc.
  *
  *  [name]:
- *
  *    name(<name>)                  - specify net name [short key: I]
  *
- *  [property-def]:
+ *  [geometries-def]:
+ *    [property|polygon|rect|text|any]*
  *
+ *  [property]:
  *    property(<prop-name> <prop-value>)
  *                                  - specifies a property value/key pair [short key: F]
  *                                    prop-name and prop-value are variant specifications
  *                                    in klayout notation: #x is an integer, ##y a floating-point
  *                                    value, a word or quoted literal is a string.
  *
- *  [geometry-def]:
- *
+ *  [polygon]:
  *    polygon(<layer> [coord] ...)  - defines a polygon [short key: Q]
  *                                    "*" for <x> or <y> means take previous
+ *
+ *  [rect]:
  *    rect(<layer> [coord] [coord]) - defines a rectangle [short key: R]
  *                                    coordinates are bottom/left and top/right
+ *
+ *  [text]:
  *    text(<layer> [text] [coord])  - defines a rectangle [short key: J]
  *
- *  [coord]
- *
+ *  [coord]:
  *    <x> <y>                       - absolute coordinates
  *    (<x> <y>)                     - relative coordinates (reference is reset to 0,0
  *                                    for each net or terminal in device abstract)
  *
  *  [template-def]:
+ *    [template-param|template-terminal|any]*
  *
+ *  [template-param]:
  *    param(<name> <primary>? <default-value>*)    - defines a template parameter [short key: E]
  *                                    ('primary' is a value: 0 or 1)
+ *
+ *  [template-terminal]:
  *    terminal(<name>)              - defines a terminal [short key: T]
  *
- *  [device-abstract-def]:
- *
- *    [device-abstract-terminal-def]*
- *
- *  [device-abstract-terminal-def]:
- *
- *    terminal(<terminal-name> [geometry-def]*)
+ *  [device-abstract-terminal]:
+ *    terminal(<terminal-name> [geometries-def])
  *                                  - specifies the terminal geometry [short key: T]
  *
- *  [device-def]:
- *
- *    [property-def]*               - user properties
- *    [trans-def]                   - location of the device
- *                                    must be before terminal
+ *  [param]:
  *    param(<name> <value>)         - defines a parameter [short key: E]
+ *
+ *  [device-terminal]:
  *    terminal(<terminal-name> <net-id>)
- *                                  - specifies connection of the terminal with
- *                                    a net (short key: T)
+ *                                  - specifies connection of the terminal with a net (short key: T)
  *
- *  [subcircuit-def]:
- *
- *    [property-def]*               - user properties
- *    [trans-def]                   - location of the subcircuit
+ *  [subcircuit-pin]:
  *    pin(<pin-id> <net-id>)        - specifies connection of the pin with a net [short key: P]
  *
- *  [trans-def]:
- *
+ *  [trans]:
  *    location(<x> <y>)             - location of the instance [short key: Y]
  *    rotation(<angle>)             - rotation angle (in degree, default is 0) [short key: O]
  *    mirror                        - if specified, the instance is mirrored before rotation [short key: M]
  *    scale(<mag>)                  - magnification (default is 1) [short key: S]
+ *
+ *  [any]:
+ *    * |
+ *    <token> |
+ *    <token> ( [any]* ) |
+ *    <float> |
+ *    <quoted-string>
  */
 
 namespace l2n_std_format
diff --git a/src/db/db/dbLayoutToNetlistReader.cc b/src/db/db/dbLayoutToNetlistReader.cc
index 30fab09e2..96bcc1d90 100644
--- a/src/db/db/dbLayoutToNetlistReader.cc
+++ b/src/db/db/dbLayoutToNetlistReader.cc
@@ -97,6 +97,13 @@ LayoutToNetlistStandardReader::read_int ()
   return i;
 }
 
+bool
+LayoutToNetlistStandardReader::try_read_int (int &i)
+{
+  i = 0;
+  return m_ex.try_read (i);
+}
+
 db::Coord
 LayoutToNetlistStandardReader::read_coord ()
 {
@@ -133,6 +140,50 @@ LayoutToNetlistStandardReader::skip ()
   }
 }
 
+void LayoutToNetlistStandardReader::skip_element ()
+{
+  std::string s;
+  double f;
+
+  if (m_ex.try_read_word (s)) {
+
+    //  skip bracket elements after token key
+    Brace br (this);
+    while (br) {
+      skip_element ();
+    }
+    br.done ();
+
+  } else if (m_ex.test ("*")) {
+
+    //  asterisk is allowed as element (e.g. inside point)
+
+  } else if (m_ex.try_read_quoted (s)) {
+
+    //  skip string
+
+  } else if (m_ex.try_read (f)) {
+
+    //  skip numeric value
+
+  } else {
+
+    Brace br (this);
+    if (br) {
+
+      //  skip bracket elements without token
+      while (br) {
+        skip_element ();
+      }
+      br.done ();
+
+    } else {
+      throw tl::Exception (tl::to_string (tr ("Unexpected token")));
+    }
+
+  }
+}
+
 void LayoutToNetlistStandardReader::do_read (db::LayoutToNetlist *l2n)
 {
   tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("File read: ")) + m_path);
@@ -153,7 +204,7 @@ static db::Region &layer_by_name (db::LayoutToNetlist *l2n, const std::string &n
   return *l;
 }
 
-void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::LayoutToNetlist *l2n, bool nested, std::map<const db::Circuit *, ObjectMap> *map_per_circuit)
+void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::LayoutToNetlist *l2n, LayoutToNetlistStandardReader::Brace *nested, std::map<const db::Circuit *, ObjectMap> *map_per_circuit)
 {
   m_dbu = 0.001;
   int version = 0;
@@ -179,7 +230,7 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
 
   db::LayoutLocker layout_locker (l2n ? l2n->internal_layout () : 0);
 
-  while (! at_end ()) {
+  while (nested ? *nested : ! at_end ()) {
 
     if (test (skeys::version_key) || test (lkeys::version_key)) {
 
@@ -289,7 +340,7 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
           br.done ();
 
         } else {
-          throw tl::Exception (tl::to_string (tr ("Invalid keyword")));
+          skip_element ();
         }
 
       }
@@ -369,7 +420,7 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
         } else if (at_end ()) {
           throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside circuit definition (rect, polygon, net, pin, device or circuit expected)")));
         } else {
-          throw tl::Exception (tl::to_string (tr ("Invalid keyword inside circuit definition (rect, polygon, net, pin, device or circuit expected)")));
+          skip_element ();
         }
 
       }
@@ -430,19 +481,17 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
         } else if (at_end ()) {
           throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside device abstract definition (terminal expected)")));
         } else {
-          throw tl::Exception (tl::to_string (tr ("Invalid keyword inside device abstract definition (terminal expected)")));
+          skip_element ();
         }
 
       }
 
       br.done ();
 
-    } else if (nested) {
-      break;
     } else if (at_end ()) {
-      throw tl::Exception (tl::to_string (tr ("Unexpected end of file")));
+      throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside device abstract definition (terminal expected)")));
     } else {
-      throw tl::Exception (tl::to_string (tr ("Invalid keyword")));
+      skip_element ();
     }
 
   }
@@ -450,6 +499,10 @@ void LayoutToNetlistStandardReader::read_netlist (db::Netlist *netlist, db::Layo
   if (l2n) {
     l2n->set_netlist_extracted ();
   }
+
+  if (version > 1) {
+    throw tl::Exception (tl::to_string (tr ("This program version only supports version 1 of the L2N DB format. File version is: ")) + tl::to_string (version));
+  }
 }
 
 db::Point
@@ -490,65 +543,6 @@ LayoutToNetlistStandardReader::read_property (db::NetlistObject *obj)
   br.done ();
 }
 
-std::pair<unsigned int, NetShape> LayoutToNetlistStandardReader::read_geometry(db::LayoutToNetlist *l2n)
-{
-  std::string lname;
-
-  if (test (skeys::rect_key) || test (lkeys::rect_key)) {
-
-    Brace br (this);
-
-    read_word_or_quoted (lname);
-    unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
-
-    db::Point lb = read_point ();
-    db::Point rt = read_point ();
-    db::Box box (lb, rt);
-
-    br.done ();
-
-    return std::make_pair (lid, db::PolygonRef (db::Polygon (box), l2n->internal_layout ()->shape_repository ()));
-
-  } else if (test (skeys::polygon_key) || test (lkeys::polygon_key)) {
-
-    Brace br (this);
-
-    read_word_or_quoted (lname);
-    unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
-
-    std::vector<db::Point> pt;
-    while (br) {
-      pt.push_back (read_point ());
-    }
-    br.done ();
-
-    db::Polygon poly;
-    poly.assign_hull (pt.begin (), pt.end ());
-    return std::make_pair (lid, db::PolygonRef (poly, l2n->internal_layout ()->shape_repository ()));
-
-  } else if (test (skeys::text_key) || test (lkeys::text_key)) {
-
-    Brace br (this);
-
-    read_word_or_quoted (lname);
-    unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
-
-    std::string text;
-    read_word_or_quoted (text);
-
-    db::Point pt = read_point ();
-
-    br.done ();
-
-    return std::make_pair (lid, db::TextRef (db::Text (text, db::Trans (pt - db::Point ())), l2n->internal_layout ()->shape_repository ()));
-
-  } else if (at_end ()) {
-    throw tl::Exception (tl::to_string (tr ("Unexpected end of file (polygon or rect expected)")));
-  } else {
-    throw tl::Exception (tl::to_string (tr ("Invalid keyword (polygon or rect expected)")));
-  }
-}
-
 db::Box
 LayoutToNetlistStandardReader::read_rect ()
 {
@@ -587,14 +581,75 @@ void
 LayoutToNetlistStandardReader::read_geometries (db::NetlistObject *obj, Brace &br, db::LayoutToNetlist *l2n, db::local_cluster<db::NetShape> &lc, db::Cell &cell)
 {
   m_ref = db::Point ();
+  std::string lname;
 
   while (br) {
+
     if (test (skeys::property_key) || test (lkeys::property_key)) {
+
       read_property (obj);
+
+    } else if (test (skeys::rect_key) || test (lkeys::rect_key)) {
+
+      Brace br (this);
+
+      read_word_or_quoted (lname);
+      unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
+
+      db::Point lb = read_point ();
+      db::Point rt = read_point ();
+      db::Box box (lb, rt);
+
+      br.done ();
+
+      NetShape n (db::PolygonRef (db::Polygon (box), l2n->internal_layout ()->shape_repository ()));
+
+      lc.add (n, lid);
+      n.insert_into (cell.shapes (lid));
+
+    } else if (test (skeys::polygon_key) || test (lkeys::polygon_key)) {
+
+      Brace br (this);
+
+      read_word_or_quoted (lname);
+      unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
+
+      std::vector<db::Point> pt;
+      while (br) {
+        pt.push_back (read_point ());
+      }
+      br.done ();
+
+      db::Polygon poly;
+      poly.assign_hull (pt.begin (), pt.end ());
+      NetShape n (db::PolygonRef (poly, l2n->internal_layout ()->shape_repository ()));
+
+      lc.add (n, lid);
+      n.insert_into (cell.shapes (lid));
+
+    } else if (test (skeys::text_key) || test (lkeys::text_key)) {
+
+      Brace br (this);
+
+      read_word_or_quoted (lname);
+      unsigned int lid = l2n->layer_of (layer_by_name (l2n, lname));
+
+      std::string text;
+      read_word_or_quoted (text);
+
+      db::Point pt = read_point ();
+
+      br.done ();
+
+      NetShape n (db::TextRef (db::Text (text, db::Trans (pt - db::Point ())), l2n->internal_layout ()->shape_repository ()));
+
+      lc.add (n, lid);
+      n.insert_into (cell.shapes (lid));
+
+    } else if (at_end ()) {
+      throw tl::Exception (tl::to_string (tr ("Unexpected end of file (polygon, text or rect expected)")));
     } else {
-      std::pair<unsigned int, db::NetShape> pr = read_geometry (l2n);
-      lc.add (pr.second, pr.first);
-      pr.second.insert_into (cell.shapes (pr.first));
+      skip_element ();
     }
   }
 }
@@ -641,6 +696,7 @@ LayoutToNetlistStandardReader::read_pin (db::Netlist * /*netlist*/, db::LayoutTo
   db::Net *net = 0;
 
   db::Pin pin;
+  int netid = 0;
 
   while (br) {
 
@@ -660,18 +716,19 @@ LayoutToNetlistStandardReader::read_pin (db::Netlist * /*netlist*/, db::LayoutTo
 
       read_property (&pin);
 
-    } else {
+    } else if (try_read_int (netid)) {
 
       if (net) {
         throw tl::Exception (tl::to_string (tr ("Duplicate net ID")));
       }
 
-      unsigned int netid = (unsigned int) read_int ();
-      net = map.id2net [netid];
+      net = map.id2net [(unsigned int) netid];
       if (!net) {
         throw tl::Exception (tl::to_string (tr ("Not a valid net ID: ")) + tl::to_string (netid));
       }
 
+    } else {
+      skip_element ();
     }
 
   }
@@ -851,7 +908,7 @@ LayoutToNetlistStandardReader::read_device (db::Netlist *netlist, db::LayoutToNe
     } else if (at_end ()) {
       throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside device definition (location, scale, mirror, rotation, param or terminal expected)")));
     } else {
-      throw tl::Exception (tl::to_string (tr ("Invalid keyword inside device definition (location, scale, mirror, rotation, param or terminal expected)")));
+      skip_element ();
     }
 
   }
@@ -1032,7 +1089,7 @@ LayoutToNetlistStandardReader::read_subcircuit (db::Netlist *netlist, db::Layout
     } else if (at_end ()) {
       throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside subcircuit definition (location, rotation, mirror, scale or pin expected)")));
     } else {
-      throw tl::Exception (tl::to_string (tr ("Invalid keyword inside subcircuit definition (location, rotation, mirror, scale or pin expected)")));
+      skip_element ();
     }
 
   }
diff --git a/src/db/db/dbLayoutToNetlistReader.h b/src/db/db/dbLayoutToNetlistReader.h
index 0c4e75f22..fb81d7452 100644
--- a/src/db/db/dbLayoutToNetlistReader.h
+++ b/src/db/db/dbLayoutToNetlistReader.h
@@ -44,6 +44,11 @@ namespace l2n_std_reader {
     operator bool ();
     void done ();
 
+    bool has_brace () const
+    {
+      return m_has_brace;
+    }
+
   private:
     db::LayoutToNetlistStandardReader *mp_reader;
     bool m_checked;
@@ -101,7 +106,7 @@ protected:
   friend class l2n_std_reader::Brace;
   typedef l2n_std_reader::Brace Brace;
 
-  void read_netlist (Netlist *netlist, db::LayoutToNetlist *l2n, bool nested = false, std::map<const db::Circuit *, ObjectMap> *map_per_circuit = 0);
+  void read_netlist (Netlist *netlist, db::LayoutToNetlist *l2n, Brace *nested = 0, std::map<const db::Circuit *, ObjectMap> *map_per_circuit = 0);
   static size_t terminal_id (const db::DeviceClass *device_class, const std::string &tname);
   static std::pair<db::DeviceAbstract *, const db::DeviceClass *> device_model_by_name (db::Netlist *netlist, const std::string &dmname);
 
@@ -126,12 +131,14 @@ protected:
 
   bool test (const std::string &token);
   void expect (const std::string &token);
-  void read_word_or_quoted(std::string &s);
+  void read_word_or_quoted (std::string &s);
   int read_int ();
+  bool try_read_int (int &i);
   db::Coord read_coord ();
   double read_double ();
   bool at_end ();
   void skip ();
+  void skip_element ();
 
   void read_net (Netlist *netlist, db::LayoutToNetlist *l2n, db::Circuit *circuit, ObjectMap &map);
   void read_pin (Netlist *netlist, db::LayoutToNetlist *l2n, db::Circuit *circuit, ObjectMap &map);
@@ -139,7 +146,6 @@ protected:
   void read_subcircuit (Netlist *netlist, db::LayoutToNetlist *l2n, db::Circuit *circuit, ObjectMap &map, std::map<db::CellInstArray, std::list<Connections> > &connections);
   bool read_trans_part (db::DCplxTrans &tr);
   void read_abstract_terminal (db::LayoutToNetlist *l2n, db::DeviceAbstract *dm, db::DeviceClass *dc);
-  std::pair<unsigned int, db::NetShape> read_geometry(db::LayoutToNetlist *l2n);
   void read_property (db::NetlistObject *obj);
   db::Polygon read_polygon ();
   db::Box read_rect ();
diff --git a/src/db/db/dbLayoutToNetlistWriter.cc b/src/db/db/dbLayoutToNetlistWriter.cc
index 317906a0d..fc0b7ea2a 100644
--- a/src/db/db/dbLayoutToNetlistWriter.cc
+++ b/src/db/db/dbLayoutToNetlistWriter.cc
@@ -29,6 +29,9 @@
 namespace db
 {
 
+static const std::string endl ("\n");
+static const std::string indent1 (" ");
+
 // -------------------------------------------------------------------------------------------
 //  LayoutToNetlistWriterBase implementation
 
@@ -47,15 +50,89 @@ void LayoutToNetlistWriterBase::write (const db::LayoutToNetlist *l2n)
   do_write (l2n);
 }
 
+// -------------------------------------------------------------------------------------------
+//  TokenizedOutput implementation
+
+TokenizedOutput::TokenizedOutput (tl::OutputStream &s)
+  : mp_stream (&s), mp_parent (0), m_first (true), m_inline (false), m_newline (false), m_indent (-1)
+{
+  //  .. nothing yet ..
+}
+
+TokenizedOutput::TokenizedOutput (tl::OutputStream &s, const std::string &token)
+  : mp_stream (&s), mp_parent (0), m_first (true), m_inline (false), m_newline (false), m_indent (0)
+{
+  stream () << token << "(";
+}
+
+TokenizedOutput::TokenizedOutput (tl::OutputStream &s, int indent, const std::string &token)
+  : mp_stream (&s), mp_parent (0), m_first (true), m_inline (false), m_newline (false)
+{
+  m_indent = indent;
+  for (int i = 0; i < m_indent; ++i) {
+    stream () << indent1;
+  }
+  stream () << token << "(";
+}
+
+TokenizedOutput::TokenizedOutput (TokenizedOutput &output, const std::string &token, bool inl)
+  : mp_stream (&output.stream ()), mp_parent (&output), m_first (true), m_inline (inl), m_newline (false)
+{
+  m_indent = output.indent () + 1;
+  output.emit_sep ();
+  stream () << token << "(";
+}
+
+TokenizedOutput::~TokenizedOutput ()
+{
+  if (m_newline) {
+    for (int i = 0; i < m_indent; ++i) {
+      stream () << indent1;
+    }
+  }
+  if (m_indent >= 0) {
+    stream () << ")";
+    if (! m_inline) {
+      if (mp_parent) {
+        *mp_parent << endl;
+      } else {
+        stream () << endl;
+      }
+    }
+  }
+}
+
+void TokenizedOutput::emit_sep ()
+{
+  if (m_newline) {
+    for (int i = 0; i <= m_indent; ++i) {
+      stream () << indent1;
+    }
+    m_newline = false;
+  } else if (! m_first) {
+    stream () << " ";
+  }
+  m_first = false;
+}
+
+TokenizedOutput &TokenizedOutput::operator<< (const std::string &s)
+{
+  if (s == endl) {
+    m_newline = true;
+    stream () << s;
+  } else if (! s.empty ()) {
+    emit_sep ();
+    stream () << s;
+  }
+
+  return *this;
+}
+
 // -------------------------------------------------------------------------------------------
 
 namespace l2n_std_format
 {
 
-static const std::string endl ("\n");
-static const std::string indent1 (" ");
-static const std::string indent2 ("  ");
-
 template <class Keys>
 std_writer_impl<Keys>::std_writer_impl (tl::OutputStream &stream, double dbu, const std::string &progress_description)
   : mp_stream (&stream), m_dbu (dbu), mp_netlist (0),
@@ -82,7 +159,10 @@ void std_writer_impl<Keys>::write (const db::LayoutToNetlist *l2n)
     mp_netlist = l2n->netlist ();
     mp_l2n = l2n;
 
-    write (false, 0);
+    {
+      TokenizedOutput stream (*mp_stream);
+      write (false, stream, 0);
+    }
 
     mp_netlist = 0;
     mp_l2n = 0;
@@ -95,14 +175,14 @@ void std_writer_impl<Keys>::write (const db::LayoutToNetlist *l2n)
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::Netlist *netlist, const db::LayoutToNetlist *l2n, bool nested, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, bool nested, const db::Netlist *netlist, const db::LayoutToNetlist *l2n, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
 {
   try {
 
     mp_netlist = netlist;
     mp_l2n = l2n;
 
-    write (nested, net2id_per_circuit);
+    write (nested, stream, net2id_per_circuit);
 
     mp_netlist = 0;
     mp_l2n = 0;
@@ -126,16 +206,20 @@ static bool same_parameter (const DeviceParameterDefinition &a, const DevicePara
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write_device_class (const std::string &indent, const db::DeviceClass *cls, const std::string &temp_name, const db::DeviceClass *temp_class)
+void std_writer_impl<Keys>::write_device_class (TokenizedOutput &stream, const db::DeviceClass *cls, const std::string &temp_name, const db::DeviceClass *temp_class)
 {
-  *mp_stream << indent << Keys::class_key << "(" << tl::to_word_or_quoted_string (cls->name ()) << " " << tl::to_word_or_quoted_string (temp_name);
+  TokenizedOutput out (stream, Keys::class_key);
+  out << tl::to_word_or_quoted_string (cls->name ()) << tl::to_word_or_quoted_string (temp_name);
 
   bool any_def = false;
 
   const std::vector<DeviceParameterDefinition> &pd = cls->parameter_definitions ();
   for (std::vector<DeviceParameterDefinition>::const_iterator p = pd.begin (); p != pd.end (); ++p) {
     if (! temp_class->has_parameter_with_name (p->name ()) || !same_parameter (*p, *temp_class->parameter_definition (temp_class->parameter_id_for_name (p->name ())))) {
-      *mp_stream << endl << indent << indent1 << Keys::param_key << "(" << tl::to_word_or_quoted_string (p->name ()) << " " << tl::to_string (p->is_primary () ? 1 : 0) << " " << tl::to_string (p->default_value ()) << ")";
+      if (! any_def) {
+        out << endl;
+      }
+      TokenizedOutput (out, Keys::param_key) << tl::to_word_or_quoted_string (p->name ()) << tl::to_string (p->is_primary () ? 1 : 0) << tl::to_string (p->default_value ());
       any_def = true;
     }
   }
@@ -143,73 +227,70 @@ void std_writer_impl<Keys>::write_device_class (const std::string &indent, const
   const std::vector<DeviceTerminalDefinition> &td = cls->terminal_definitions ();
   for (std::vector<DeviceTerminalDefinition>::const_iterator t = td.begin (); t != td.end (); ++t) {
     if (! temp_class->has_terminal_with_name (t->name ())) {
-      *mp_stream << endl << indent << indent1 << Keys::terminal_key << "(" << tl::to_word_or_quoted_string (t->name ()) << ")";
+      if (! any_def) {
+        out << endl;
+      }
+      TokenizedOutput (out, Keys::terminal_key) << tl::to_word_or_quoted_string (t->name ());
       any_def = true;
     }
   }
-
-  if (any_def) {
-    *mp_stream << endl << indent << ")" << endl;
-  } else {
-    *mp_stream << ")" << endl;
-  }
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (bool nested, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
+void std_writer_impl<Keys>::write (bool nested, TokenizedOutput &stream, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
 {
-  bool any = false;
-
   const int version = 0;
 
   const db::Layout *ly = mp_l2n ? mp_l2n->internal_layout () : 0;
-  const std::string indent (nested ? indent1 : "");
 
   if (! nested) {
-    *mp_stream << Keys::l2n_magic_string << endl;
+    stream << Keys::l2n_magic_string << endl;
   }
 
   if (version > 0) {
-    *mp_stream << indent << Keys::version_key << "(" << version << ")" << endl;
+    TokenizedOutput (stream, Keys::version_key) << tl::to_string (version);
+    stream << endl;
   }
   if (ly) {
-    *mp_stream << indent << Keys::top_key << "(" << tl::to_word_or_quoted_string (ly->cell_name (mp_l2n->internal_top_cell ()->cell_index ())) << ")" << endl;
-    *mp_stream << indent << Keys::unit_key << "(" << m_dbu << ")" << endl;
+    TokenizedOutput (stream, Keys::top_key) << tl::to_word_or_quoted_string (ly->cell_name (mp_l2n->internal_top_cell ()->cell_index ()));
+    TokenizedOutput (stream, Keys::unit_key) << tl::to_string (m_dbu);
   }
 
+  bool any = false;
+
   if (mp_l2n) {
 
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << "# Layer section" << endl;
-      *mp_stream << indent << "# This section lists the mask layers (drawing or derived) and their connections." << endl;
+      stream << endl << "# Layer section" << endl;
+      stream << "# This section lists the mask layers (drawing or derived) and their connections." << endl;
     }
 
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << "# Mask layers" << endl;
+      stream << endl << "# Mask layers" << endl;
     }
     for (db::Connectivity::layer_iterator l = mp_l2n->connectivity ().begin_layers (); l != mp_l2n->connectivity ().end_layers (); ++l) {
-      *mp_stream << indent << Keys::layer_key << "(" << name_for_layer (mp_l2n, *l);
+      TokenizedOutput out (stream, Keys::layer_key);
+      out << name_for_layer (mp_l2n, *l);
       db::LayerProperties lp = ly->get_properties (*l);
       if (! lp.is_null ()) {
-        *mp_stream << " " << tl::to_word_or_quoted_string (lp.to_string ());
+        out << tl::to_word_or_quoted_string (lp.to_string ());
       }
-      *mp_stream << ")" << endl;
       m_progress.set (mp_stream->pos ());
     }
 
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << "# Mask layer connectivity" << endl;
+      stream << endl << "# Mask layer connectivity" << endl;
     }
     for (db::Connectivity::layer_iterator l = mp_l2n->connectivity ().begin_layers (); l != mp_l2n->connectivity ().end_layers (); ++l) {
 
       db::Connectivity::layer_iterator ce = mp_l2n->connectivity ().end_connected (*l);
       db::Connectivity::layer_iterator cb = mp_l2n->connectivity ().begin_connected (*l);
       if (cb != ce) {
-        *mp_stream << indent << Keys::connect_key << "(" << name_for_layer (mp_l2n, *l);
+        TokenizedOutput out (stream, Keys::connect_key);
+        out << name_for_layer (mp_l2n, *l);
         for (db::Connectivity::layer_iterator c = mp_l2n->connectivity ().begin_connected (*l); c != ce; ++c) {
-          *mp_stream << " " << name_for_layer (mp_l2n, *c);
+          out << name_for_layer (mp_l2n, *c);
         }
-        *mp_stream << ")" << endl;
         m_progress.set (mp_stream->pos ());
       }
 
@@ -223,15 +304,15 @@ void std_writer_impl<Keys>::write (bool nested, std::map<const db::Circuit *, st
       if (gb != ge) {
         if (! any) {
           if (! Keys::is_short ()) {
-            *mp_stream << endl << indent << "# Global nets and connectivity" << endl;
+            stream << endl << "# Global nets and connectivity" << endl;
           }
           any = true;
         }
-        *mp_stream << indent << Keys::global_key << "(" << name_for_layer (mp_l2n, *l);
+        TokenizedOutput out (stream, Keys::global_key);
+        out << name_for_layer (mp_l2n, *l);
         for (db::Connectivity::global_nets_iterator g = gb; g != ge; ++g) {
-          *mp_stream << " " << tl::to_word_or_quoted_string (mp_l2n->connectivity ().global_net_name (*g));
+          out << tl::to_word_or_quoted_string (mp_l2n->connectivity ().global_net_name (*g));
         }
-        *mp_stream << ")" << endl;
         m_progress.set (mp_stream->pos ());
       }
 
@@ -240,68 +321,64 @@ void std_writer_impl<Keys>::write (bool nested, std::map<const db::Circuit *, st
   }
 
   if (mp_netlist->begin_device_classes () != mp_netlist->end_device_classes () && ! Keys::is_short ()) {
-    *mp_stream << endl << indent << "# Device class section" << endl;
+    stream << endl << "# Device class section" << endl;
   }
   for (db::Netlist::const_device_class_iterator c = mp_netlist->begin_device_classes (); c != mp_netlist->end_device_classes (); ++c) {
     db::DeviceClassTemplateBase *temp = db::DeviceClassTemplateBase::is_a (c.operator-> ());
     if (temp) {
       std::unique_ptr<db::DeviceClass> temp_class (temp->create ());
-      write_device_class (indent, c.operator-> (), temp->name (), temp_class.get ());
+      write_device_class (stream, c.operator-> (), temp->name (), temp_class.get ());
     } else {
       db::DeviceClass empty;
-      write_device_class (indent, c.operator-> (), std::string (), &empty);
+      write_device_class (stream, c.operator-> (), std::string (), &empty);
     }
     m_progress.set (mp_stream->pos ());
   }
 
   if (mp_netlist->begin_device_abstracts () != mp_netlist->end_device_abstracts () && ! Keys::is_short ()) {
-    *mp_stream << endl << indent << "# Device abstracts section" << endl;
-    *mp_stream << indent << "# Device abstracts list the pin shapes of the devices." << endl;
+    stream << endl << "# Device abstracts section" << endl;
+    stream << "# Device abstracts list the pin shapes of the devices." << endl;
   }
   for (db::Netlist::const_abstract_model_iterator m = mp_netlist->begin_device_abstracts (); m != mp_netlist->end_device_abstracts (); ++m) {
     if (m->device_class ()) {
-      *mp_stream << indent << Keys::device_key << "(" << tl::to_word_or_quoted_string (m->name ()) << " " << tl::to_word_or_quoted_string (m->device_class ()->name ()) << endl;
-      write (*m, indent);
-      *mp_stream << indent << ")" << endl;
+      TokenizedOutput out (stream, Keys::device_key);
+      out << tl::to_word_or_quoted_string (m->name ()) << tl::to_word_or_quoted_string (m->device_class ()->name ()) << endl;
+      write (out, *m);
       m_progress.set (mp_stream->pos ());
     }
   }
 
   if (! Keys::is_short ()) {
-    *mp_stream << endl << indent << "# Circuit section" << endl;
-    *mp_stream << indent << "# Circuits are the hierarchical building blocks of the netlist." << endl;
+    stream << endl << "# Circuit section" << endl;
+    stream << "# Circuits are the hierarchical building blocks of the netlist." << endl;
   }
   for (db::Netlist::const_bottom_up_circuit_iterator i = mp_netlist->begin_bottom_up (); i != mp_netlist->end_bottom_up (); ++i) {
     const db::Circuit *x = i.operator-> ();
-    *mp_stream << indent << Keys::circuit_key << "(" << tl::to_word_or_quoted_string (x->name ()) << endl;
-    write (*x, indent, net2id_per_circuit);
-    *mp_stream << indent << ")" << endl;
+    TokenizedOutput out (stream, Keys::circuit_key);
+    out << tl::to_word_or_quoted_string (x->name ()) << endl;
+    write (out, *x, net2id_per_circuit);
     m_progress.set (mp_stream->pos ());
   }
 }
 
-void write_point (tl::OutputStream &stream, const db::Point &pt, db::Point &ref, bool relative)
+static void write_point (TokenizedOutput &out, const db::Point &pt, db::Point &ref, bool relative)
 {
   if (relative) {
 
-    stream << "(";
-    stream << pt.x () - ref.x ();
-    stream << " ";
-    stream << pt.y () - ref.y ();
-    stream << ")";
+    TokenizedOutput (out, std::string (), true) << tl::to_string (pt.x () - ref.x ()) << tl::to_string (pt.y () - ref.y ());
 
   } else {
 
     if (pt.x () == 0 || pt.x () != ref.x ()) {
-      stream << pt.x ();
+      out << tl::to_string (pt.x ());
     } else {
-      stream << "*";
+      out << "*";
     }
 
     if (pt.y () == 0 || pt.y () != ref.y ()) {
-      stream << pt.y ();
+      out << tl::to_string (pt.y ());
     } else {
-      stream << "*";
+      out << "*";
     }
 
   }
@@ -310,25 +387,20 @@ void write_point (tl::OutputStream &stream, const db::Point &pt, db::Point &ref,
 }
 
 template <class T, class Tr>
-void write_points (tl::OutputStream &stream, const T &poly, const Tr &tr, db::Point &ref, bool relative)
+static void write_points (TokenizedOutput &out, const T &poly, const Tr &tr, db::Point &ref, bool relative)
 {
   for (typename T::polygon_contour_iterator c = poly.begin_hull (); c != poly.end_hull (); ++c) {
-
-    typename T::point_type pt = tr * *c;
-
-    stream << " ";
-    write_point (stream, pt, ref, relative);
-
+    write_point (out, tr * *c, ref, relative);
   }
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::Circuit &circuit, const std::string &indent, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Circuit &circuit, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit)
 {
   if (circuit.boundary ().vertices () > 0) {
 
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << indent1 << "# Circuit boundary" << endl;
+      stream << endl << "# Circuit boundary" << endl;
     }
 
     reset_geometry_ref ();
@@ -337,22 +409,20 @@ void std_writer_impl<Keys>::write (const db::Circuit &circuit, const std::string
     if (poly.is_box ()) {
 
       db::Box box = poly.box ();
-      *mp_stream << indent << indent1 << Keys::rect_key << "(";
-      write_point (*mp_stream, box.p1 (), m_ref, true);
-      *mp_stream << " ";
-      write_point (*mp_stream, box.p2 (), m_ref, true);
-      *mp_stream << ")" << endl;
+
+      TokenizedOutput out (stream, Keys::rect_key);
+      write_point (out, box.p1 (), m_ref, true);
+      write_point (out, box.p2 (), m_ref, true);
 
     } else {
 
-      *mp_stream << indent << indent1 << Keys::polygon_key << "(";
+      TokenizedOutput out (stream, Keys::polygon_key);
       if (poly.holes () > 0) {
         db::SimplePolygon sp = db::polygon_to_simple_polygon (poly);
-        write_points (*mp_stream, sp, db::UnitTrans (), m_ref, true);
+        write_points (out, sp, db::UnitTrans (), m_ref, true);
       } else {
-        write_points (*mp_stream, poly, db::UnitTrans (), m_ref, true);
+        write_points (out, poly, db::UnitTrans (), m_ref, true);
       }
-      *mp_stream << ")" << endl;
 
     }
 
@@ -360,9 +430,9 @@ void std_writer_impl<Keys>::write (const db::Circuit &circuit, const std::string
 
   for (db::NetlistObject::property_iterator p = circuit.begin_properties (); p != circuit.end_properties (); ++p) {
     if (p == circuit.begin_properties() && ! Keys::is_short ()) {
-      *mp_stream << endl << indent << indent1 << "# Properties" << endl;
+      stream << endl << "# Properties" << endl;
     }
-    *mp_stream << indent << indent1 << Keys::property_key << "(" << p->first.to_parsable_string () << " " << p->second.to_parsable_string () << ")" << endl;
+    TokenizedOutput (stream, Keys::property_key) << p->first.to_parsable_string () << p->second.to_parsable_string ();
   }
 
   std::map<const db::Net *, unsigned int> net2id_local;
@@ -379,60 +449,56 @@ void std_writer_impl<Keys>::write (const db::Circuit &circuit, const std::string
   if (circuit.begin_nets () != circuit.end_nets ()) {
     if (! Keys::is_short ()) {
       if (mp_l2n) {
-        *mp_stream << endl << indent << indent1 << "# Nets with their geometries" << endl;
+        stream << endl << "# Nets with their geometries" << endl;
       } else {
-        *mp_stream << endl << indent << indent1 << "# Nets" << endl;
+        stream << endl << "# Nets" << endl;
       }
     }
     for (db::Circuit::const_net_iterator n = circuit.begin_nets (); n != circuit.end_nets (); ++n) {
-      write (*n, (*net2id) [n.operator-> ()], indent);
+      write (stream, *n, (*net2id) [n.operator-> ()]);
       m_progress.set (mp_stream->pos ());
     }
   }
 
   if (circuit.begin_pins () != circuit.end_pins ()) {
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << indent1 << "# Outgoing pins and their connections to nets" << endl;
+      stream << endl << "# Outgoing pins and their connections to nets" << endl;
     }
     for (db::Circuit::const_pin_iterator p = circuit.begin_pins (); p != circuit.end_pins (); ++p) {
-      *mp_stream << indent << indent1 << Keys::pin_key << "(";
+      TokenizedOutput out (stream, Keys::pin_key);
       const db::Net *net = circuit.net_for_pin (p->id ());
       if (net) {
-        *mp_stream << (*net2id) [net];
+        out << tl::to_string ((*net2id) [net]);
       }
       if (! p->name ().empty ()) {
-        if (net) {
-          *mp_stream << " ";
-        }
-        *mp_stream << Keys::name_key << "(" << tl::to_word_or_quoted_string (p->name ()) << ")";
+        TokenizedOutput (out, Keys::name_key, true) << tl::to_word_or_quoted_string (p->name ());
       }
-      *mp_stream << ")" << endl;
       m_progress.set (mp_stream->pos ());
     }
   }
 
   if (circuit.begin_devices () != circuit.end_devices ()) {
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << indent1 << "# Devices and their connections" << endl;
+      stream << endl << "# Devices and their connections" << endl;
     }
     for (db::Circuit::const_device_iterator d = circuit.begin_devices (); d != circuit.end_devices (); ++d) {
-      write (*d, *net2id, indent);
+      write (stream, *d, *net2id);
       m_progress.set (mp_stream->pos ());
     }
   }
 
   if (circuit.begin_subcircuits () != circuit.end_subcircuits ()) {
     if (! Keys::is_short ()) {
-      *mp_stream << endl << indent << indent1 << "# Subcircuits and their connections" << endl;
+      stream << endl << "# Subcircuits and their connections" << endl;
     }
     for (db::Circuit::const_subcircuit_iterator x = circuit.begin_subcircuits (); x != circuit.end_subcircuits (); ++x) {
-      write (*x, *net2id, indent);
+      write (stream, *x, *net2id);
       m_progress.set (mp_stream->pos ());
     }
   }
 
   if (! Keys::is_short ()) {
-    *mp_stream << endl;
+    stream << endl;
   }
 }
 
@@ -443,7 +509,7 @@ void std_writer_impl<Keys>::reset_geometry_ref ()
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::NetShape *s, const db::ICplxTrans &tr, const std::string &lname, bool relative)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::NetShape *s, const db::ICplxTrans &tr, const std::string &lname, bool relative)
 {
   if (s->type () == db::NetShape::Polygon) {
 
@@ -454,39 +520,36 @@ void std_writer_impl<Keys>::write (const db::NetShape *s, const db::ICplxTrans &
     if (poly.is_box ()) {
 
       db::Box box = t * poly.box ();
-      *mp_stream << Keys::rect_key << "(" << lname;
-      *mp_stream << " ";
-      write_point (*mp_stream, box.p1 (), m_ref, relative);
-      *mp_stream << " ";
-      write_point (*mp_stream, box.p2 (), m_ref, relative);
-      *mp_stream << ")";
+      TokenizedOutput out (stream, Keys::rect_key);
+      out << lname;
+      write_point (out, box.p1 (), m_ref, relative);
+      write_point (out, box.p2 (), m_ref, relative);
 
     } else {
 
-      *mp_stream << Keys::polygon_key << "(" << lname;
+      TokenizedOutput out (stream, Keys::polygon_key);
+      out << lname;
       if (poly.holes () > 0) {
         db::SimplePolygon sp = db::polygon_to_simple_polygon (poly);
-        write_points (*mp_stream, sp, t, m_ref, relative);
+        write_points (out, sp, t, m_ref, relative);
       } else {
-        write_points (*mp_stream, poly, t, m_ref, relative);
+        write_points (out, poly, t, m_ref, relative);
       }
-      *mp_stream << ")";
 
     }
 
   } else if (s->type () == db::NetShape::Text) {
 
-    *mp_stream << Keys::text_key << "(" << lname;
+    TokenizedOutput out (stream, Keys::text_key);
+    out << lname;
 
     db::TextRef txtr = s->text_ref ();
     db::ICplxTrans t = tr * db::ICplxTrans (txtr.trans ());
 
-    *mp_stream << " " << tl::to_word_or_quoted_string (txtr.obj ().string ()) << " ";
+    out << tl::to_word_or_quoted_string (txtr.obj ().string ());
 
     db::Point pt = t * (db::Point () + txtr.obj ().trans ().disp ());
-    write_point (*mp_stream, pt, m_ref, relative);
-
-    *mp_stream << ")";
+    write_point (out, pt, m_ref, relative);
 
   }
 }
@@ -498,13 +561,13 @@ bool std_writer_impl<Keys>::new_cell (cell_index_type ci) const
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::Net &net, unsigned int id, const std::string &indent)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Net &net, unsigned int id)
 {
   const db::hier_clusters<db::NetShape> &clusters = mp_l2n->net_clusters ();
   const db::Circuit *circuit = net.circuit ();
   const db::Connectivity &conn = mp_l2n->connectivity ();
 
-  bool any = false;
+  std::unique_ptr<TokenizedOutput> outp;
 
   if (mp_l2n) {
 
@@ -527,25 +590,24 @@ void std_writer_impl<Keys>::write (const db::Net &net, unsigned int id, const st
 
         } else {
 
-          if (! any) {
+          if (! outp) {
 
-            *mp_stream << indent << indent1 << Keys::net_key << "(" << id;
+            outp.reset (new TokenizedOutput (stream, Keys::net_key));
+
+            *outp << tl::to_string (id);
             if (! net.name ().empty ()) {
-              *mp_stream << " " << Keys::name_key << "(" << tl::to_word_or_quoted_string (net.name ()) << ")";
+              TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.name ());
             }
-            *mp_stream << endl;
+
+            *outp << endl;
 
             for (db::NetlistObject::property_iterator p = net.begin_properties (); p != net.end_properties (); ++p) {
-              *mp_stream << indent << indent2 << Keys::property_key << "(" << p->first.to_parsable_string () << " " << p->second.to_parsable_string () << ")" << endl;
+              TokenizedOutput (*outp, Keys::property_key) << p->first.to_parsable_string () << p->second.to_parsable_string ();
             }
 
-            any = true;
-
           }
 
-          *mp_stream << indent << indent2;
-          write (si.operator-> (), si.trans (), name_for_layer (mp_l2n, *l), true);
-          *mp_stream << endl;
+          write (*outp, si.operator-> (), si.trans (), name_for_layer (mp_l2n, *l), true);
           m_progress.set (mp_stream->pos ());
 
           prev_ci = ci;
@@ -560,80 +622,66 @@ void std_writer_impl<Keys>::write (const db::Net &net, unsigned int id, const st
 
   }
 
-  if (any) {
-    *mp_stream << indent << indent1 << ")" << endl;
-  } else {
+  if (! outp) {
+
+    outp.reset (new TokenizedOutput (stream, Keys::net_key));
+    *outp << tl::to_string (id);
 
-    *mp_stream << indent << indent1 << Keys::net_key << "(" << id;
     if (! net.name ().empty ()) {
-      *mp_stream << " " << Keys::name_key << "(" << tl::to_word_or_quoted_string (net.name ()) << ")";
+      TokenizedOutput (*outp, Keys::name_key, true) << tl::to_word_or_quoted_string (net.name ());
     }
+
     if (net.begin_properties () != net.end_properties ()) {
-      *mp_stream << endl;
+      *outp << endl;
       for (db::NetlistObject::property_iterator p = net.begin_properties (); p != net.end_properties (); ++p) {
-        *mp_stream << indent << indent2 << Keys::property_key << "(" << p->first.to_parsable_string () << " " << p->second.to_parsable_string () << ")" << endl;
+        TokenizedOutput (*outp, Keys::property_key) << p->first.to_parsable_string () << p->second.to_parsable_string ();
       }
-      *mp_stream << indent << ")" << endl;
-    } else {
-      *mp_stream << ")" << endl;
     }
 
   }
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::SubCircuit &subcircuit, std::map<const db::Net *, unsigned int> &net2id, const std::string &indent)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::SubCircuit &subcircuit, std::map<const db::Net *, unsigned int> &net2id)
 {
-  *mp_stream << indent << indent1 << Keys::circuit_key << "(" << tl::to_string (subcircuit.id ());
-  *mp_stream << " " << tl::to_word_or_quoted_string (subcircuit.circuit_ref ()->name ());
+  TokenizedOutput out (stream, Keys::circuit_key);
+  out << tl::to_string (subcircuit.id ());
+  out << tl::to_word_or_quoted_string (subcircuit.circuit_ref ()->name ());
 
   if (! subcircuit.name ().empty ()) {
-    *mp_stream << " " << Keys::name_key << "(" << tl::to_word_or_quoted_string (subcircuit.name ()) << ")";
+    TokenizedOutput (out, Keys::name_key, true) << tl::to_word_or_quoted_string (subcircuit.name ());
   }
 
   if (mp_l2n) {
-    *mp_stream << " ";
-    write (subcircuit.trans ());
+    write (out, subcircuit.trans ());
   }
 
   //  each pin in one line for more than a few pins
   bool separate_lines = (subcircuit.circuit_ref ()->pin_count () > 1) || subcircuit.begin_properties () != subcircuit.end_properties ();
 
   if (separate_lines) {
-    *mp_stream << endl;
+    out << endl;
   }
 
   for (db::NetlistObject::property_iterator p = subcircuit.begin_properties (); p != subcircuit.end_properties (); ++p) {
-    *mp_stream << indent << indent2 << Keys::property_key << "(" << p->first.to_parsable_string () << " " << p->second.to_parsable_string () << ")" << endl;
+    TokenizedOutput (out, Keys::property_key, ! separate_lines) << p->first.to_parsable_string () << p->second.to_parsable_string ();
   }
 
   unsigned int pin_id = 0;
   for (db::Circuit::const_pin_iterator p = subcircuit.circuit_ref ()->begin_pins (); p != subcircuit.circuit_ref ()->end_pins (); ++p, ++pin_id) {
     const db::Net *net = subcircuit.net_for_pin (p->id ());
     if (net) {
-      if (separate_lines) {
-        *mp_stream << indent << indent2;
-      } else {
-        *mp_stream << " ";
-      }
-      *mp_stream << Keys::pin_key << "(" << tl::to_string (pin_id) << " " << net2id [net] << ")";
-      if (separate_lines) {
-        *mp_stream << endl;
-      }
+      TokenizedOutput (out, Keys::pin_key, ! separate_lines) << tl::to_string (pin_id) << tl::to_string (net2id [net]);
       m_progress.set (mp_stream->pos ());
     }
   }
-
-  if (separate_lines) {
-    *mp_stream << indent << indent1;
-  }
-
-  *mp_stream << ")" << endl;
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::DeviceAbstract &device_abstract, const std::string &indent)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::DeviceAbstract &device_abstract)
 {
+  tl_assert (mp_l2n);
+
   const std::vector<db::DeviceTerminalDefinition> &td = device_abstract.device_class ()->terminal_definitions ();
 
   const db::hier_clusters<db::NetShape> &clusters = mp_l2n->net_clusters ();
@@ -641,10 +689,13 @@ void std_writer_impl<Keys>::write (const db::DeviceAbstract &device_abstract, co
 
   for (std::vector<db::DeviceTerminalDefinition>::const_iterator t = td.begin (); t != td.end (); ++t) {
 
-    *mp_stream << indent << indent1 << Keys::terminal_key << "(" << t->name () << endl;
+    TokenizedOutput out (stream, Keys::terminal_key);
+    out << t->name ();
 
     reset_geometry_ref ();
 
+    bool any = false;
+
     for (db::Connectivity::layer_iterator l = conn.begin_layers (); l != conn.end_layers (); ++l) {
 
       size_t cid = device_abstract.cluster_id_for_terminal (t->id ());
@@ -656,72 +707,62 @@ void std_writer_impl<Keys>::write (const db::DeviceAbstract &device_abstract, co
       const db::local_cluster<db::NetShape> &lc = clusters.clusters_per_cell (device_abstract.cell_index ()).cluster_by_id (cid);
       for (db::local_cluster<db::NetShape>::shape_iterator s = lc.begin (*l); ! s.at_end (); ++s) {
 
-        *mp_stream << indent << indent2;
-        write (s.operator-> (), db::ICplxTrans (), name_for_layer (mp_l2n, *l), true);
-        *mp_stream << endl;
+        if (! any) {
+          out << endl;
+        }
+
+        write (out, s.operator-> (), db::ICplxTrans (), name_for_layer (mp_l2n, *l), true);
         m_progress.set (mp_stream->pos ());
 
+        any = true;
+
       }
 
     }
 
-    *mp_stream << indent << indent1 << ")" << endl;
     m_progress.set (mp_stream->pos ());
 
   }
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::DCplxTrans &tr)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::DCplxTrans &tr)
 {
-  bool first = true;
-
   if (tr.is_mag ()) {
-    *mp_stream << Keys::scale_key << "(" << tr.mag () << ")";
-    first = false;
+    TokenizedOutput (stream, Keys::scale_key, true) << tl::to_string (tr.mag ());
   }
 
   if (tr.is_mirror ()) {
-    if (! first) {
-      *mp_stream << " ";
-    }
-    *mp_stream << Keys::mirror_key;
-    first = false;
+    stream << Keys::mirror_key;
   }
 
   if (fabs (tr.angle ()) > 1e-6) {
-    if (! first) {
-      *mp_stream << " ";
-    }
-    *mp_stream << Keys::rotation_key << "(" << tr.angle () << ")";
-    first = false;
+    TokenizedOutput (stream, Keys::rotation_key, true) << tl::to_string (tr.angle ());
   }
 
-  if (! first) {
-    *mp_stream << " ";
-  }
-  *mp_stream << Keys::location_key << "(" << floor (0.5 + tr.disp ().x () / m_dbu) << " " << floor (0.5 + tr.disp ().y () / m_dbu) << ")";
+  TokenizedOutput (stream, Keys::location_key, true) << tl::to_string (floor (0.5 + tr.disp ().x () / m_dbu)) << tl::to_string (floor (0.5 + tr.disp ().y () / m_dbu));
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::Device &device, std::map<const Net *, unsigned int> &net2id, const std::string &indent)
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::Device &device, std::map<const Net *, unsigned int> &net2id)
 {
   tl_assert (device.device_class () != 0);
   const std::vector<DeviceTerminalDefinition> &td = device.device_class ()->terminal_definitions ();
   const std::vector<DeviceParameterDefinition> &pd = device.device_class ()->parameter_definitions ();
 
-  *mp_stream << indent << indent1 << Keys::device_key << "(" << tl::to_string (device.id ());
+  TokenizedOutput out (stream, Keys::device_key);
+  out << tl::to_string (device.id ());
 
   if (device.device_abstract ()) {
 
-    *mp_stream << " " << tl::to_word_or_quoted_string (device.device_abstract ()->name ()) << endl;
+    out << tl::to_word_or_quoted_string (device.device_abstract ()->name ()) << endl;
 
     const std::vector<db::DeviceAbstractRef> &other_abstracts = device.other_abstracts ();
     for (std::vector<db::DeviceAbstractRef>::const_iterator a = other_abstracts.begin (); a != other_abstracts.end (); ++a) {
 
-      *mp_stream << indent << indent2 << Keys::device_key << "(" << tl::to_word_or_quoted_string (a->device_abstract->name ()) << " ";
-      write (a->trans);
-      *mp_stream << ")" << endl;
+      TokenizedOutput o (out, Keys::device_key);
+      o << tl::to_word_or_quoted_string (a->device_abstract->name ());
+      write (o, a->trans);
 
     }
 
@@ -729,41 +770,38 @@ void std_writer_impl<Keys>::write (const db::Device &device, std::map<const Net
     for (std::map<unsigned int, std::vector<db::DeviceReconnectedTerminal> >::const_iterator t = reconnected_terminals.begin (); t != reconnected_terminals.end (); ++t) {
 
       for (std::vector<db::DeviceReconnectedTerminal>::const_iterator c = t->second.begin (); c != t->second.end (); ++c) {
-        *mp_stream << indent << indent2 << Keys::connect_key << "(" << c->device_index << " " << tl::to_word_or_quoted_string (td [t->first].name ()) << " " << tl::to_word_or_quoted_string (td [c->other_terminal_id].name ()) << ")" << endl;
+        TokenizedOutput (out, Keys::connect_key) << tl::to_string (c->device_index) << tl::to_word_or_quoted_string (td [t->first].name ()) << tl::to_word_or_quoted_string (td [c->other_terminal_id].name ());
       }
 
     }
 
-    *mp_stream << indent << indent2;
-    write (device.trans ());
-    *mp_stream << endl;
+    write (out, device.trans ());
+    out << endl;
 
   } else {
-    *mp_stream << " " << tl::to_word_or_quoted_string (device.device_class ()->name ()) << endl;
+    out << tl::to_word_or_quoted_string (device.device_class ()->name ()) << endl;
   }
 
   if (! device.name ().empty ()) {
-    *mp_stream << indent << indent2 << Keys::name_key << "(" << tl::to_word_or_quoted_string (device.name ()) << ")" << endl;
+    TokenizedOutput (out, Keys::name_key) << tl::to_word_or_quoted_string (device.name ());
   }
 
   for (db::NetlistObject::property_iterator p = device.begin_properties (); p != device.end_properties (); ++p) {
-    *mp_stream << indent << indent2 << Keys::property_key << "(" << p->first.to_parsable_string () << " " << p->second.to_parsable_string () << ")" << endl;
+    TokenizedOutput (out, Keys::property_key) << p->first.to_parsable_string () << p->second.to_parsable_string ();
   }
 
   for (std::vector<DeviceParameterDefinition>::const_iterator i = pd.begin (); i != pd.end (); ++i) {
-    *mp_stream << indent << indent2 << Keys::param_key << "(" << tl::to_word_or_quoted_string (i->name ()) << " " << tl::sprintf ("%.12g", device.parameter_value (i->id ())) << ")" << endl;
+    TokenizedOutput (out, Keys::param_key) << tl::to_word_or_quoted_string (i->name ()) << tl::sprintf ("%.12g", device.parameter_value (i->id ()));
   }
 
   for (std::vector<DeviceTerminalDefinition>::const_iterator i = td.begin (); i != td.end (); ++i) {
     const db::Net *net = device.net_for_terminal (i->id ());
+    TokenizedOutput o (out, Keys::terminal_key);
+    o << tl::to_word_or_quoted_string (i->name ());
     if (net) {
-      *mp_stream << indent << indent2 << Keys::terminal_key << "(" << tl::to_word_or_quoted_string (i->name ()) << " " << net2id [net] << ")" << endl;
-    } else {
-      *mp_stream << indent << indent2 << Keys::terminal_key << "(" << tl::to_word_or_quoted_string (i->name ()) << ")" << endl;
+      o << tl::to_string (net2id [net]);
     }
   }
-
-  *mp_stream << indent << indent1 << ")" << endl;
 }
 
 //  explicit instantiation
diff --git a/src/db/db/dbLayoutToNetlistWriter.h b/src/db/db/dbLayoutToNetlistWriter.h
index 55964cb2d..8d960fe36 100644
--- a/src/db/db/dbLayoutToNetlistWriter.h
+++ b/src/db/db/dbLayoutToNetlistWriter.h
@@ -44,6 +44,35 @@ class Netlist;
 class LayoutToNetlist;
 class NetShape;
 
+/**
+ *  @brief A helper class to produce token/list lines
+ *  Such lines are like:
+ *    token(a b c)
+ *  This class takes care of properly handling separation blanks
+ */
+class TokenizedOutput
+{
+public:
+  TokenizedOutput (tl::OutputStream &stream);
+  TokenizedOutput (tl::OutputStream &stream, const std::string &token);
+  TokenizedOutput (tl::OutputStream &stream, int indent, const std::string &token);
+  TokenizedOutput (TokenizedOutput &output, const std::string &token, bool inl = false);
+  ~TokenizedOutput ();
+
+  TokenizedOutput &operator<< (const std::string &s);
+
+  tl::OutputStream &stream () { return *mp_stream; }
+
+private:
+  tl::OutputStream *mp_stream;
+  TokenizedOutput *mp_parent;
+  bool m_first, m_inline, m_newline;
+  int m_indent;
+
+  void emit_sep ();
+  int indent () const { return m_indent; }
+};
+
 namespace l2n_std_format
 {
 
@@ -55,7 +84,7 @@ public:
   std_writer_impl (tl::OutputStream &stream, double dbu, const std::string &progress_description = std::string ());
 
   void write (const db::LayoutToNetlist *l2n);
-  void write (const db::Netlist *netlist, const db::LayoutToNetlist *l2n, bool nested, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
+  void write (TokenizedOutput &stream, bool nested, const db::Netlist *netlist, const db::LayoutToNetlist *l2n, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
 
 protected:
   tl::OutputStream &stream ()
@@ -71,15 +100,15 @@ private:
   const db::LayoutToNetlist *mp_l2n;
   tl::AbsoluteProgress m_progress;
 
-  void write (bool nested, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
-  void write (const db::Circuit &circuit, const std::string &indent, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
-  void write (const db::Net &net, unsigned int id, const std::string &indent);
-  void write (const db::SubCircuit &subcircuit, std::map<const Net *, unsigned int> &net2id, const std::string &indent);
-  void write (const db::Device &device, std::map<const Net *, unsigned int> &net2id, const std::string &indent);
-  void write (const db::DeviceAbstract &device_abstract, const std::string &indent);
-  void write (const db::NetShape *s, const db::ICplxTrans &tr, const std::string &lname, bool relative);
-  void write (const db::DCplxTrans &trans);
-  void write_device_class (const std::string &indent, const db::DeviceClass *cls, const std::string &name, const db::DeviceClass *temp_class);
+  void write (bool nested, TokenizedOutput &stream, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
+  void write (TokenizedOutput &stream, const db::Circuit &circuit, std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > *net2id_per_circuit);
+  void write (TokenizedOutput &stream, const db::Net &net, unsigned int id);
+  void write (TokenizedOutput &stream, const db::SubCircuit &subcircuit, std::map<const Net *, unsigned int> &net2id);
+  void write (TokenizedOutput &stream, const db::Device &device, std::map<const Net *, unsigned int> &net2id);
+  void write (TokenizedOutput &stream, const db::DeviceAbstract &device_abstract);
+  void write (TokenizedOutput &stream, const db::NetShape *s, const db::ICplxTrans &tr, const std::string &lname, bool relative);
+  void write (TokenizedOutput &stream, const db::DCplxTrans &trans);
+  void write_device_class (TokenizedOutput &stream, const db::DeviceClass *cls, const std::string &name, const db::DeviceClass *temp_class);
   void reset_geometry_ref ();
 
   //  implementation of CircuitCallback
diff --git a/src/db/db/dbLayoutVsSchematicFormatDefs.cc b/src/db/db/dbLayoutVsSchematicFormatDefs.cc
index 875429e54..37ad75db1 100644
--- a/src/db/db/dbLayoutVsSchematicFormatDefs.cc
+++ b/src/db/db/dbLayoutVsSchematicFormatDefs.cc
@@ -34,6 +34,8 @@ namespace lvs_std_format
   DB_PUBLIC std::string LongKeys::reference_key ("reference");
   DB_PUBLIC std::string LongKeys::layout_key ("layout");
   DB_PUBLIC std::string LongKeys::xref_key ("xref");
+  DB_PUBLIC std::string LongKeys::log_key ("log");
+  DB_PUBLIC std::string LongKeys::log_entry_key ("entry");
 
   DB_PUBLIC std::string LongKeys::mismatch_key ("mismatch");
   DB_PUBLIC std::string LongKeys::match_key ("match");
@@ -41,15 +43,27 @@ namespace lvs_std_format
   DB_PUBLIC std::string LongKeys::warning_key ("warning");
   DB_PUBLIC std::string LongKeys::skipped_key ("skipped");
 
+  DB_PUBLIC std::string LongKeys::info_severity_key ("info");
+  DB_PUBLIC std::string LongKeys::warning_severity_key ("warning");
+  DB_PUBLIC std::string LongKeys::error_severity_key ("error");
+
+  //  E, H, I, J, L, M, S, W, X, Z, 0, 1
+
   DB_PUBLIC std::string ShortKeys::reference_key ("H");
   DB_PUBLIC std::string ShortKeys::layout_key ("J");
   DB_PUBLIC std::string ShortKeys::xref_key ("Z");
+  DB_PUBLIC std::string ShortKeys::log_key ("L");
+  DB_PUBLIC std::string ShortKeys::log_entry_key ("M");
 
   DB_PUBLIC std::string ShortKeys::mismatch_key ("0");
   DB_PUBLIC std::string ShortKeys::match_key ("1");
   DB_PUBLIC std::string ShortKeys::nomatch_key ("X");
   DB_PUBLIC std::string ShortKeys::warning_key ("W");
   DB_PUBLIC std::string ShortKeys::skipped_key ("S");
+
+  DB_PUBLIC std::string ShortKeys::info_severity_key ("I");
+  DB_PUBLIC std::string ShortKeys::warning_severity_key ("W");
+  DB_PUBLIC std::string ShortKeys::error_severity_key ("E");
 }
 
 }
diff --git a/src/db/db/dbLayoutVsSchematicFormatDefs.h b/src/db/db/dbLayoutVsSchematicFormatDefs.h
index fd60336ce..338a0ec43 100644
--- a/src/db/db/dbLayoutVsSchematicFormatDefs.h
+++ b/src/db/db/dbLayoutVsSchematicFormatDefs.h
@@ -47,80 +47,85 @@ namespace db
  *  The file follows the declaration-before-use principle
  *  (circuits before subcircuits, nets before use ...)
  *
- *  Global statements:
- *
+ *  Main body:
  *    #%lvsdb-klayout                  - header line identifies format
+ *    [version|description|layout-netlist|reference-netlist|xrefs|any]*
+ *
+ *  [version]:
  *    version(<number>)                - file format version [short key: V]
+ *
+ *  [description]:
  *    description(<text>)              - an arbitrary description text [short key: B]
- *    layout([layout])                 - layout part [short key: J]
- *    reference([reference-def]*)      - reference netlist part [short key: H]
- *    xref([xref-def]*)                - cross-reference part [short key: Z]
  *
- *  [layout]:
+ *  [layout-netlist]:
+ *    layout(...)                      - layout netlist part [short key: J]
+ *                                       Content is the LayoutToNetlist dump without version and description
  *
- *      ...                            - the LayoutToNetlist dump without version and description
+ *  [reference-netlist]:
+ *    reference(...)
+ *                                     - reference netlist part [short key: H]
+ *                                       Content is the Netlist dump (reduced version of LayoutToNetlist)
  *
- *  [reference-def]:
+ *  [xrefs]:
+ *    xref([xref|any]*)                - cross-reference part [short key: Z]
  *
- *    circuit(<name> [netlist-circuit-def]*)
- *                                     - circuit [short key: X]
- *  [netlist-circuit-def]:
- *
- *    net(<id> [net-name]?)            - a net declaration [short key: N]
- *    pin(<name> <net-id>)             - outgoing pin connection [short key: P]
- *    device(<name> [device-def]*)     - device with connections [short key: D]
- *    circuit(<name> [subcircuit-def]*)
- *                                     - subcircuit with connections [short key: X]
- *
- *  [net-name]:
- *
- *    name(<net-name>)                 - specify net name [short key: I]
- *
- *  [device-def]:
- *
- *    terminal(<terminal-name> <net-id>)
- *                                     - specifies connection of the terminal with
- *                                       a net [short key: T]
- *
- *  [subcircuit-def]:
- *
- *    pin(<pin-name> <net-id>)         - specifies connection of the pin with a net [short key: P]
- *
- *  [xref-def]:
- *
- *    circuit([non] [non] [status]? [message]? [circuit-xrefs])
+ *  [xref]:
+ *    circuit([non] [non] [status|message|log|circuit-xrefs|any]*)
  *                                     - circuit pair [short key: X]
  *
- *  [circuit-xrefs]:
- *
- *    xref([pair]*)                    - circuit cross-reference part [short key: Z]
- *
- *  [pair]
- *
- *    pin([ion] [ion] [status]? [message]?)       - a pin pair [short key: P]
- *    device([ion] [ion] [status]? [message]?)    - a device pair [short key: D]
- *    circuit([ion] [ion] [status]? [message]?)   - a subcircuit pair [short key: X]
- *    net([ion] [ion] [status]? [message]?)       - a net pair [short key: N]
- *
  *  [non]
- *
  *    <name> | ()
  *
- *  [ion]
+ *  [log]:
+ *    log([log-entry]*)                - log entries [short key: L]
  *
+ *  [log-entry]:
+ *    entry([severity] [message|any]*) - log entry [short key: M]
+ *
+ *  [severity]:
+ *    info |                           - [short key: I]
+ *    warning |                        - [short key: W]
+ *    error                            - [short key: E]
+ *
+ *  [circuit-xrefs]:
+ *    xref([xref-pin|xref-device|xref-circuit|xref-net|any]*)
+ *                                     - circuit cross-reference part [short key: Z]
+ *
+ *  [xref-pin]:
+ *    pin([ion] [ion] [status]? [message]? [any]*)
+ *                                     - a pin pair [short key: P]
+ *
+ *  [xref-device]:
+ *    device([ion] [ion] [status]? [message]? [any]*)
+ *                                     - a device pair [short key: D]
+ *
+ *  [xref-circuit]:
+ *    circuit([ion] [ion] [status]? [message]? [any]*)
+ *                                     - a subcircuit pair [short key: X]
+ *
+ *  [xref-net]:
+ *    net([ion] [ion] [status]? [message]? [any]*)
+ *                                     - a net pair [short key: N]
+ *
+ *  [ion]:
  *    <id> | ()
  *
- *  [message]
- *
+ *  [message]:
  *    description(<name>)              - error description [short key: B]
  *
- *  [status]
- *
+ *  [status]:
  *    mismatch |                       - [short key: 0]
  *    match |                          - [short key: 1]
  *    nomatch |                        - [short key: X]
  *    warning |                        - [short key: W]
  *    skipped                          - [short key: S]
+ *
+ *  [any]:
+ *    * |
+ *    <token> |
+ *    <token> ( [any]* ) |
+ *    <float> |
+ *    <quoted-string>
  */
 
 namespace lvs_std_format
@@ -132,12 +137,18 @@ namespace lvs_std_format
     static std::string reference_key;
     static std::string layout_key;
     static std::string xref_key;
+    static std::string log_key;
+    static std::string log_entry_key;
 
     static std::string mismatch_key;
     static std::string match_key;
     static std::string nomatch_key;
     static std::string warning_key;
     static std::string skipped_key;
+
+    static std::string info_severity_key;
+    static std::string warning_severity_key;
+    static std::string error_severity_key;
   };
 
   struct DB_PUBLIC LongKeys
@@ -147,12 +158,18 @@ namespace lvs_std_format
     static std::string reference_key;
     static std::string layout_key;
     static std::string xref_key;
+    static std::string log_key;
+    static std::string log_entry_key;
 
     static std::string mismatch_key;
     static std::string match_key;
     static std::string nomatch_key;
     static std::string warning_key;
     static std::string skipped_key;
+
+    static std::string info_severity_key;
+    static std::string warning_severity_key;
+    static std::string error_severity_key;
   };
 
   template <bool Short> struct DB_PUBLIC keys;
diff --git a/src/db/db/dbLayoutVsSchematicReader.cc b/src/db/db/dbLayoutVsSchematicReader.cc
index 688934b62..f3dffcaaf 100644
--- a/src/db/db/dbLayoutVsSchematicReader.cc
+++ b/src/db/db/dbLayoutVsSchematicReader.cc
@@ -38,10 +38,10 @@ LayoutVsSchematicStandardReader::LayoutVsSchematicStandardReader (tl::InputStrea
   //  .. nothing yet ..
 }
 
-void LayoutVsSchematicStandardReader::do_read_lvs (db::LayoutVsSchematic *l2n)
+void LayoutVsSchematicStandardReader::do_read_lvs (db::LayoutVsSchematic *lvs)
 {
   try {
-    read_netlist (l2n);
+    read_netlist (lvs);
   } catch (tl::Exception &ex) {
     throw tl::Exception (tl::sprintf (tl::to_string (tr ("%s in line: %d of %s")), ex.msg (), stream ().line_number (), path ()));
   }
@@ -81,14 +81,14 @@ void LayoutVsSchematicStandardReader::read_netlist (db::LayoutVsSchematic *lvs)
     } else if (test (skeys::layout_key) || test (lkeys::layout_key)) {
 
       Brace br (this);
-      LayoutToNetlistStandardReader::read_netlist (0, lvs, true /*nested*/, &m_map_per_circuit_a);
+      LayoutToNetlistStandardReader::read_netlist (0, lvs, &br, &m_map_per_circuit_a);
       br.done ();
 
     } else if (test (skeys::reference_key) || test (lkeys::reference_key)) {
 
       Brace br (this);
       std::unique_ptr<db::Netlist> netlist (new db::Netlist ());
-      LayoutToNetlistStandardReader::read_netlist (netlist.get (), 0, true /*nested*/, &m_map_per_circuit_b);
+      LayoutToNetlistStandardReader::read_netlist (netlist.get (), 0, &br, &m_map_per_circuit_b);
       lvs->set_reference_netlist (netlist.release ());
       br.done ();
 
@@ -106,10 +106,14 @@ void LayoutVsSchematicStandardReader::read_netlist (db::LayoutVsSchematic *lvs)
     } else if (at_end ()) {
       throw tl::Exception (tl::to_string (tr ("Unexpected end of file")));
     } else {
-      throw tl::Exception (tl::to_string (tr ("Invalid keyword")));
+      skip_element ();
     }
 
   }
+
+  if (version > 1) {
+    throw tl::Exception (tl::to_string (tr ("This program version only supports version 1 of the LVS DB format. File version is: ")) + tl::to_string (version));
+  }
 }
 
 bool LayoutVsSchematicStandardReader::read_message (std::string &msg)
@@ -146,6 +150,59 @@ bool LayoutVsSchematicStandardReader::read_status (db::NetlistCrossReference::St
   }
 }
 
+bool LayoutVsSchematicStandardReader::read_severity (db::NetlistCrossReference::Severity &severity)
+{
+  if (test (skeys::info_severity_key) || test (lkeys::info_severity_key)) {
+    severity = db::NetlistCrossReference::Info;
+    return true;
+  } else if (test (skeys::warning_severity_key) || test (lkeys::warning_severity_key)) {
+    severity = db::NetlistCrossReference::Warning;
+    return true;
+  } else if (test (skeys::error_severity_key) || test (lkeys::error_severity_key)) {
+    severity = db::NetlistCrossReference::Error;
+    return true;
+  } else {
+    return false;
+  }
+}
+
+void LayoutVsSchematicStandardReader::read_log_entry (db::NetlistCrossReference *xref)
+{
+  db::NetlistCrossReference::Severity severity = db::NetlistCrossReference::NoSeverity;
+  std::string msg;
+
+  Brace br (this);
+  while (br) {
+    if (read_severity (severity)) {
+      //  continue
+    } else if (read_message (msg)) {
+      //  continue
+    } else {
+      skip_element ();
+    }
+  }
+  br.done ();
+
+  xref->log_entry (severity, msg);
+}
+
+void LayoutVsSchematicStandardReader::read_logs_for_circuits (db::NetlistCrossReference *xref)
+{
+  Brace br (this);
+  while (br) {
+
+    if (test (skeys::log_entry_key) || test (lkeys::log_entry_key)) {
+      read_log_entry (xref);
+    } else if (at_end ()) {
+      throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside circuit definition (net, pin, device or circuit expected)")));
+    } else {
+      skip_element ();
+    }
+
+  }
+  br.done ();
+}
+
 void LayoutVsSchematicStandardReader::read_xrefs_for_circuits (db::NetlistCrossReference *xref, const db::Circuit *circuit_a, const db::Circuit *circuit_b)
 {
   Brace br (this);
@@ -162,7 +219,7 @@ void LayoutVsSchematicStandardReader::read_xrefs_for_circuits (db::NetlistCrossR
     } else if (at_end ()) {
       throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside circuit definition (net, pin, device or circuit expected)")));
     } else {
-      throw tl::Exception (tl::to_string (tr ("Invalid keyword inside circuit definition (net, pin, device or circuit expected)")));
+      skip_element ();
     }
 
   }
@@ -211,10 +268,12 @@ void LayoutVsSchematicStandardReader::read_xref (db::NetlistCrossReference *xref
           //  continue
         } else if (test (skeys::xref_key) || test (lkeys::xref_key)) {
           read_xrefs_for_circuits (xref, circuit_a, circuit_b);
+        } else if (test (skeys::log_key) || test (lkeys::log_key)) {
+          read_logs_for_circuits (xref);
         } else if (at_end ()) {
           throw tl::Exception (tl::to_string (tr ("Unexpected end of file inside circuit definition (status keyword of xrefs expected)")));
         } else {
-          throw tl::Exception (tl::to_string (tr ("Invalid keyword inside circuit definition (status keyword of xrefs expected)")));
+          skip_element ();
         }
 
       }
@@ -223,6 +282,8 @@ void LayoutVsSchematicStandardReader::read_xref (db::NetlistCrossReference *xref
 
       br.done ();
 
+    } else {
+      skip_element ();
     }
 
   }
@@ -344,6 +405,10 @@ void LayoutVsSchematicStandardReader::read_net_pair (db::NetlistCrossReference *
   read_status (status);
   read_message (msg);
 
+  while (br) {
+    skip_element ();
+  }
+
   br.done ();
 
   xref->gen_nets (net_by_numerical_id (circuit_a, ion_a, m_map_per_circuit_a), net_by_numerical_id (circuit_b, ion_b, m_map_per_circuit_b), status, msg);
@@ -362,6 +427,10 @@ void LayoutVsSchematicStandardReader::read_pin_pair (db::NetlistCrossReference *
   read_status (status);
   read_message (msg);
 
+  while (br) {
+    skip_element ();
+  }
+
   br.done ();
 
   xref->gen_pins (pin_by_numerical_id (circuit_a, ion_a), pin_by_numerical_id (circuit_b, ion_b), status, msg);
@@ -380,6 +449,10 @@ void LayoutVsSchematicStandardReader::read_device_pair (db::NetlistCrossReferenc
   read_status (status);
   read_message (msg);
 
+  while (br) {
+    skip_element ();
+  }
+
   br.done ();
 
   xref->gen_devices (device_by_numerical_id (circuit_a, ion_a, m_map_per_circuit_a), device_by_numerical_id (circuit_b, ion_b, m_map_per_circuit_b), status, msg);
@@ -398,6 +471,10 @@ void LayoutVsSchematicStandardReader::read_subcircuit_pair (db::NetlistCrossRefe
   read_status (status);
   read_message (msg);
 
+  while (br) {
+    skip_element ();
+  }
+
   br.done ();
 
   xref->gen_subcircuits (subcircuit_by_numerical_id (circuit_a, ion_a, m_map_per_circuit_a), subcircuit_by_numerical_id (circuit_b, ion_b, m_map_per_circuit_b), status, msg);
diff --git a/src/db/db/dbLayoutVsSchematicReader.h b/src/db/db/dbLayoutVsSchematicReader.h
index 6e8a3b679..0f9c65b92 100644
--- a/src/db/db/dbLayoutVsSchematicReader.h
+++ b/src/db/db/dbLayoutVsSchematicReader.h
@@ -79,6 +79,9 @@ private:
 
   bool read_status (db::NetlistCrossReference::Status &status);
   bool read_message (std::string &msg);
+  void read_log_entry (db::NetlistCrossReference *xref);
+  void read_logs_for_circuits (db::NetlistCrossReference *xref);
+  bool read_severity (db::NetlistCrossReference::Severity &severity);
   void read_xref (db::NetlistCrossReference *xref);
   void read_xrefs_for_circuits (db::NetlistCrossReference *xref, const db::Circuit *circuit_a, const db::Circuit *circuit_b);
   void read_net_pair (db::NetlistCrossReference *xref, const db::Circuit *circuit_a, const db::Circuit *circuit_b);
diff --git a/src/db/db/dbLayoutVsSchematicWriter.cc b/src/db/db/dbLayoutVsSchematicWriter.cc
index d92b7c2d8..ea4f747aa 100644
--- a/src/db/db/dbLayoutVsSchematicWriter.cc
+++ b/src/db/db/dbLayoutVsSchematicWriter.cc
@@ -28,6 +28,8 @@
 namespace db
 {
 
+static const std::string endl ("\n");
+
 // -------------------------------------------------------------------------------------------
 //  LayoutVsSchematicWriterBase implementation
 
@@ -61,25 +63,22 @@ class std_writer_impl
 public:
   std_writer_impl (tl::OutputStream &stream, double dbu, const std::string &progress_description = std::string ());
 
-  void write (const db::LayoutVsSchematic *l2n);
+  void write (const db::LayoutVsSchematic *lvs);
 
 private:
-  tl::OutputStream &stream ()
+  tl::OutputStream &ostream ()
   {
     return l2n_std_format::std_writer_impl<typename Keys::l2n_keys>::stream ();
   }
 
   std::string status_to_s (const db::NetlistCrossReference::Status status);
+  std::string severity_to_s (const db::NetlistCrossReference::Severity severity);
   std::string message_to_s (const std::string &msg);
-  void write (const db::NetlistCrossReference *xref);
+  void write (TokenizedOutput &stream, const db::NetlistCrossReference *xref);
 
   std::map<const db::Circuit *, std::map<const db::Net *, unsigned int> > m_net2id_per_circuit_a, m_net2id_per_circuit_b;
 };
 
-static const std::string endl ("\n");
-static const std::string indent1 (" ");
-static const std::string indent2 ("  ");
-
 template <class Keys>
 std_writer_impl<Keys>::std_writer_impl (tl::OutputStream &stream, double dbu, const std::string &progress_description)
   : l2n_std_format::std_writer_impl<typename Keys::l2n_keys> (stream, dbu, progress_description.empty () ? tl::to_string (tr ("Writing LVS database")) : progress_description)
@@ -90,39 +89,40 @@ std_writer_impl<Keys>::std_writer_impl (tl::OutputStream &stream, double dbu, co
 template <class Keys>
 void std_writer_impl<Keys>::write (const db::LayoutVsSchematic *lvs)
 {
+  TokenizedOutput out (ostream ());
+  out << Keys::lvs_magic_string << endl;
+
   const int version = 0;
 
-  stream () << Keys::lvs_magic_string << endl;
-
   if (version > 0) {
-    stream () << Keys::version_key << "(" << version << ")" << endl;
+    TokenizedOutput (out, Keys::version_key) << tl::to_string (version);
   }
 
   if (lvs->netlist ()) {
     if (! Keys::is_short ()) {
-      stream () << endl << "# Layout" << endl;
+      out << endl << "# Layout" << endl;
     }
-    stream () << Keys::layout_key << "(" << endl;
-    l2n_std_format::std_writer_impl<typename Keys::l2n_keys>::write (lvs->netlist (), lvs, true, &m_net2id_per_circuit_a);
-    stream () << ")" << endl;
+    TokenizedOutput o (out, Keys::layout_key);
+    o << endl;
+    l2n_std_format::std_writer_impl<typename Keys::l2n_keys>::write (o, true, lvs->netlist (), lvs, &m_net2id_per_circuit_a);
   }
 
   if (lvs->reference_netlist ()) {
     if (! Keys::is_short ()) {
-      stream () << endl << "# Reference netlist" << endl;
+      out << endl << "# Reference netlist" << endl;
     }
-    stream () << Keys::reference_key << "(" << endl;
-    l2n_std_format::std_writer_impl<typename Keys::l2n_keys>::write (lvs->reference_netlist (), 0, true, &m_net2id_per_circuit_b);
-    stream () << ")" << endl;
+    TokenizedOutput o (out, Keys::reference_key);
+    o << endl;
+    l2n_std_format::std_writer_impl<typename Keys::l2n_keys>::write (o, true, lvs->reference_netlist (), 0, &m_net2id_per_circuit_b);
   }
 
   if (lvs->cross_ref ()) {
     if (! Keys::is_short ()) {
-      stream () << endl << "# Cross reference" << endl;
+      out << endl << "# Cross reference" << endl;
     }
-    stream () << Keys::xref_key << "(" << endl;
-    write (lvs->cross_ref ());
-    stream () << ")" << endl;
+    TokenizedOutput o (out, Keys::xref_key);
+    o << endl;
+    write (o, lvs->cross_ref ());
   }
 }
 
@@ -184,7 +184,7 @@ std::string std_writer_impl<Keys>::message_to_s (const std::string &msg)
   if (msg.empty ()) {
     return std::string ();
   } else {
-    return " " + Keys::description_key + "(" + tl::to_word_or_quoted_string (msg) + ")";
+    return Keys::description_key + "(" + tl::to_word_or_quoted_string (msg) + ")";
   }
 }
 
@@ -192,54 +192,83 @@ template <class Keys>
 std::string std_writer_impl<Keys>::status_to_s (const db::NetlistCrossReference::Status status)
 {
   if (status == db::NetlistCrossReference::Match) {
-    return " " + Keys::match_key;
+    return Keys::match_key;
   } else if (status == db::NetlistCrossReference::NoMatch) {
-    return " " + Keys::nomatch_key;
+    return Keys::nomatch_key;
   } else if (status == db::NetlistCrossReference::Mismatch) {
-    return " " + Keys::mismatch_key;
+    return Keys::mismatch_key;
   } else if (status == db::NetlistCrossReference::MatchWithWarning) {
-    return " " + Keys::warning_key;
+    return Keys::warning_key;
   } else if (status == db::NetlistCrossReference::Skipped) {
-    return " " + Keys::skipped_key;
+    return Keys::skipped_key;
   } else {
     return std::string ();
   }
 }
 
 template <class Keys>
-void std_writer_impl<Keys>::write (const db::NetlistCrossReference *xref)
+std::string std_writer_impl<Keys>::severity_to_s (const db::NetlistCrossReference::Severity severity)
+{
+  if (severity == db::NetlistCrossReference::Info) {
+    return Keys::info_severity_key;
+  } else if (severity == db::NetlistCrossReference::Warning) {
+    return Keys::warning_severity_key;
+  } else if (severity == db::NetlistCrossReference::Error) {
+    return Keys::error_severity_key;
+  } else {
+    return std::string ();
+  }
+}
+
+template <class Keys>
+void std_writer_impl<Keys>::write (TokenizedOutput &stream, const db::NetlistCrossReference *xref)
 {
   for (db::NetlistCrossReference::circuits_iterator c = xref->begin_circuits (); c != xref->end_circuits (); ++c) {
 
     const db::NetlistCrossReference::PerCircuitData *pcd = xref->per_circuit_data_for (*c);
     tl_assert (pcd != 0);
 
-    stream () << indent1 << Keys::circuit_key << "(" << name_to_s (c->first) << " " << name_to_s (c->second) << status_to_s (pcd->status) << message_to_s (pcd->msg) << endl;
-    stream () << indent2 << Keys::xref_key << "(" << endl;
+    TokenizedOutput out (stream, Keys::circuit_key);
+    out << name_to_s (c->first) << name_to_s (c->second) << status_to_s (pcd->status) << message_to_s (pcd->msg);
+    out << endl;
+
+    if (! pcd->log_entries.empty ()) {
+
+      TokenizedOutput o (out, Keys::log_key);
+      o << endl;
+
+      for (db::NetlistCrossReference::PerCircuitData::log_entries_const_iterator l = pcd->log_entries.begin (); l != pcd->log_entries.end (); ++l) {
+        TokenizedOutput (o, Keys::log_entry_key, true) << severity_to_s (l->severity) << message_to_s (l->msg);
+        o << endl;
+      }
 
-    for (db::NetlistCrossReference::PerCircuitData::net_pairs_const_iterator n = pcd->nets.begin (); n != pcd->nets.end (); ++n) {
-      stream () << indent1 << indent2 << Keys::net_key << "(" << net_id_to_s (n->pair.first, m_net2id_per_circuit_a [c->first]) << " " << net_id_to_s (n->pair.second, m_net2id_per_circuit_b [c->second]) << status_to_s (n->status) << message_to_s (n->msg) << ")" << endl;
     }
 
-    std::map<const db::Pin *, unsigned int> pin2index_a, pin2index_b;
-    build_pin_index_map (c->first, pin2index_a);
-    build_pin_index_map (c->second, pin2index_b);
+    {
+      TokenizedOutput o (out, Keys::xref_key);
+      o << endl;
 
-    for (db::NetlistCrossReference::PerCircuitData::pin_pairs_const_iterator n = pcd->pins.begin (); n != pcd->pins.end (); ++n) {
-      stream () << indent1 << indent2 << Keys::pin_key << "(" << pin_id_to_s (n->pair.first, pin2index_a) << " " << pin_id_to_s (n->pair.second, pin2index_b) << status_to_s (n->status) << message_to_s (n->msg) << ")" << endl;
+      for (db::NetlistCrossReference::PerCircuitData::net_pairs_const_iterator n = pcd->nets.begin (); n != pcd->nets.end (); ++n) {
+        TokenizedOutput (o, Keys::net_key) << net_id_to_s (n->pair.first, m_net2id_per_circuit_a [c->first]) << net_id_to_s (n->pair.second, m_net2id_per_circuit_b [c->second]) << status_to_s (n->status) << message_to_s (n->msg);
+      }
+
+      std::map<const db::Pin *, unsigned int> pin2index_a, pin2index_b;
+      build_pin_index_map (c->first, pin2index_a);
+      build_pin_index_map (c->second, pin2index_b);
+
+      for (db::NetlistCrossReference::PerCircuitData::pin_pairs_const_iterator n = pcd->pins.begin (); n != pcd->pins.end (); ++n) {
+        TokenizedOutput (o, Keys::pin_key) << pin_id_to_s (n->pair.first, pin2index_a) << pin_id_to_s (n->pair.second, pin2index_b) << status_to_s (n->status) << message_to_s (n->msg);
+      }
+
+      for (db::NetlistCrossReference::PerCircuitData::device_pairs_const_iterator n = pcd->devices.begin (); n != pcd->devices.end (); ++n) {
+        TokenizedOutput (o, Keys::device_key) << ion_to_s (n->pair.first) << ion_to_s (n->pair.second) << status_to_s (n->status) << message_to_s (n->msg);
+      }
+
+      for (db::NetlistCrossReference::PerCircuitData::subcircuit_pairs_const_iterator n = pcd->subcircuits.begin (); n != pcd->subcircuits.end (); ++n) {
+        TokenizedOutput (o, Keys::circuit_key) << ion_to_s (n->pair.first) << ion_to_s (n->pair.second) << status_to_s (n->status) << message_to_s (n->msg);
+      }
     }
 
-    for (db::NetlistCrossReference::PerCircuitData::device_pairs_const_iterator n = pcd->devices.begin (); n != pcd->devices.end (); ++n) {
-      stream () << indent1 << indent2 << Keys::device_key << "(" << ion_to_s (n->pair.first) << " " << ion_to_s (n->pair.second) << status_to_s (n->status) << message_to_s (n->msg) << ")" << endl;
-    }
-
-    for (db::NetlistCrossReference::PerCircuitData::subcircuit_pairs_const_iterator n = pcd->subcircuits.begin (); n != pcd->subcircuits.end (); ++n) {
-      stream () << indent1 << indent2 << Keys::circuit_key << "(" << ion_to_s (n->pair.first) << " " << ion_to_s (n->pair.second) << status_to_s (n->status) << message_to_s (n->msg) << ")" << endl;
-    }
-
-    stream () << indent2 << ")" << endl;
-    stream () << indent1 << ")" << endl;
-
   }
 }
 
diff --git a/src/db/db/dbLoadLayoutOptions.cc b/src/db/db/dbLoadLayoutOptions.cc
index 88356b4c5..4bcf972c9 100644
--- a/src/db/db/dbLoadLayoutOptions.cc
+++ b/src/db/db/dbLoadLayoutOptions.cc
@@ -30,6 +30,7 @@
 namespace db
 {
   LoadLayoutOptions::LoadLayoutOptions ()
+    : m_warn_level (1)
   {
     // .. nothing yet ..
   }
@@ -44,6 +45,8 @@ namespace db
   {
     if (&d != this) {
 
+      m_warn_level = d.m_warn_level;
+
       release ();
       for (std::map <std::string, FormatSpecificReaderOptions *>::const_iterator o = d.m_options.begin (); o != d.m_options.end (); ++o) {
         m_options.insert (std::make_pair (o->first, o->second->clone ()));
diff --git a/src/db/db/dbLoadLayoutOptions.h b/src/db/db/dbLoadLayoutOptions.h
index 67262f353..0062cd551 100644
--- a/src/db/db/dbLoadLayoutOptions.h
+++ b/src/db/db/dbLoadLayoutOptions.h
@@ -79,6 +79,26 @@ public:
    */
   ~LoadLayoutOptions ();
 
+  /**
+   *  @brief Gets the warning level
+   *
+   *  The warning level is a reader-specific setting which enables or disables warnings
+   *  on specific levels. Level 0 is always "warnings off". The default level is 1
+   *  which means "reasonable warnings emitted".
+   */
+  int warn_level () const
+  {
+    return m_warn_level;
+  }
+
+  /**
+   *  @brief Sets the warning level
+   */
+  void set_warn_level (int w)
+  {
+    m_warn_level = w;
+  }
+
   /**
    *  @brief Sets specific options for the given format
    *
@@ -217,6 +237,7 @@ public:
 
 private:
   std::map <std::string, FormatSpecificReaderOptions *> m_options;
+  int m_warn_level;
 
   void release ();
 };
diff --git a/src/db/db/dbNetlistCompare.cc b/src/db/db/dbNetlistCompare.cc
index 4c2999db9..d999017fd 100644
--- a/src/db/db/dbNetlistCompare.cc
+++ b/src/db/db/dbNetlistCompare.cc
@@ -62,6 +62,8 @@ NetlistComparer::NetlistComparer (NetlistCompareLogger *logger)
 
   m_dont_consider_net_names = false;
   m_case_sensitive = false;
+
+  m_with_log = true;
 }
 
 NetlistComparer::~NetlistComparer ()
@@ -379,8 +381,16 @@ NetlistComparer::compare_impl (const db::Netlist *a, const db::Netlist *b) const
     } else {
 
       if (mp_logger) {
-        mp_logger->circuit_skipped (ca, cb, generate_subcircuits_not_verified_warning (ca, verified_circuits_a, cb, verified_circuits_b));
+
+        std::string msg = generate_subcircuits_not_verified_warning (ca, verified_circuits_a, cb, verified_circuits_b);
+
+        if (m_with_log) {
+          mp_logger->log_entry (db::NetlistCompareLogger::Error, msg);
+        }
+
+        mp_logger->circuit_skipped (ca, cb, msg);
         good = false;
+
       }
 
     }
@@ -442,7 +452,6 @@ NetlistComparer::all_subcircuits_verified (const db::Circuit *c, const std::set<
       return false;
     }
   }
-
   return true;
 }
 
@@ -889,6 +898,10 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
       //  in must_match mode, check if the nets are identical
       if (mp_logger) {
         if (p->second && ! exact_match) {
+          if (m_with_log) {
+            mp_logger->log_entry (db::NetlistCompareLogger::Error,
+                                  tl::sprintf (tl::to_string (tr ("Nets %s are paired explicitly, but are not identical topologically")), nets2string (p->first)));
+          }
           mp_logger->net_mismatch (p->first.first, p->first.second);
         } else {
           mp_logger->match_nets (p->first.first, p->first.second);
@@ -944,7 +957,8 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
 
   //  Three passes: one without ambiguities, the second one with ambiguities and names (optional) and a third with ambiguities with topology
 
-  for (int pass = 0; pass < 3 && ! good; ++pass) {
+  int num_passes = 3;
+  for (int pass = 0; pass < num_passes && ! good; ++pass) {
 
     if (pass == 1 && m_dont_consider_net_names) {
       //  skip the named pass in "don't consider net names" mode
@@ -971,8 +985,11 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
     compare.subcircuit_equivalence = &subcircuit_equivalence;
     compare.device_equivalence = &device_equivalence;
     compare.logger = mp_logger;
+    compare.with_log = m_with_log;
     compare.progress = &progress;
 
+    std::vector<NodeEdgePair> nodes, other_nodes;
+
     good = true;
     while (true) {
 
@@ -1015,7 +1032,8 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
 
       //  derive new identities through topology: first collect all nets with the same topological signature
 
-      std::vector<NodeEdgePair> nodes, other_nodes;
+      nodes.clear ();
+      other_nodes.clear ();
 
       std::vector<NetGraphNode::edge_type> no_edges;
       no_edges.push_back (NetGraphNode::edge_type ());
@@ -1070,6 +1088,10 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
 
     }
 
+    if (pass + 1 == num_passes && ! good && mp_logger && m_with_log) {
+      compare.analyze_failed_matches ();
+    }
+
   }
 
   //  Report missing net assignment
@@ -1119,6 +1141,33 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
   return good;
 }
 
+static void
+analyze_pin_mismatch (const db::Pin *pin1, const db::Circuit *c1, const db::Pin *pin2, const db::Circuit * /*c2*/, db::NetlistCompareLogger *logger)
+{
+  if (! pin1) {
+    logger->log_entry (db::NetlistCompareLogger::Error, tl::sprintf (tl::to_string (tr ("No equivalent pin %s from reference netlist found in netlist.\nThis is an indication that a physical connection is not made to the subcircuit.")), pin2->expanded_name ()));
+  }
+
+  if (! pin2) {
+
+    logger->log_entry (db::NetlistCompareLogger::Error, tl::sprintf (tl::to_string (tr ("No equivalent pin %s from netlist found in reference netlist.\nThis is an indication that additional physical connections are made to the subcircuit cell.")), pin1->expanded_name ()));
+
+    //  attempt to identify pins which are creating invalid connections
+    for (auto p = c1->begin_parents (); p != c1->end_parents (); ++p) {
+      for (auto c = p->begin_subcircuits (); c != p->end_subcircuits (); ++c) {
+        const db::SubCircuit &sc = *c;
+        if (sc.circuit_ref () == c1) {
+          const db::Net *net = sc.net_for_pin (pin1->id ());
+          if (net && (net->subcircuit_pin_count () > 1 || net->terminal_count () > 0 || net->pin_count () > 0)) {
+            logger->log_entry (db::NetlistCompareLogger::Info, tl::sprintf (tl::to_string (tr ("Potential invalid connection in circuit %s, subcircuit cell reference at %s")), p->name (), sc.trans ().to_string ()));
+          }
+        }
+      }
+    }
+
+  }
+}
+
 bool
 NetlistComparer::handle_pin_mismatch (const db::NetGraph &g1, const db::Circuit *c1, const db::Pin *pin1, const db::NetGraph &g2, const db::Circuit *c2, const db::Pin *pin2) const
 {
@@ -1163,7 +1212,11 @@ NetlistComparer::handle_pin_mismatch (const db::NetGraph &g1, const db::Circuit
     }
     return true;
   } else {
+
     if (mp_logger) {
+      if (m_with_log) {
+        analyze_pin_mismatch (pin1, c1, pin2, c2, mp_logger);
+      }
       mp_logger->pin_mismatch (pin1, pin2);
     }
     return false;
diff --git a/src/db/db/dbNetlistCompare.h b/src/db/db/dbNetlistCompare.h
index 9160a45a8..7f69dd7d7 100644
--- a/src/db/db/dbNetlistCompare.h
+++ b/src/db/db/dbNetlistCompare.h
@@ -50,6 +50,16 @@ public:
   NetlistCompareLogger () { }
   virtual ~NetlistCompareLogger () { }
 
+  /**
+   *  @brief An enum describing the severity for the log_entry function
+   */
+  enum Severity {
+    NoSeverity = 0,   //  unspecific
+    Info = 1,         //  information only
+    Warning = 2,      //  a warning
+    Error = 3         //  an error
+  };
+
   /**
    *  @brief Begin logging for netlist a and b
    */
@@ -88,6 +98,11 @@ public:
    */
   virtual void circuit_mismatch (const db::Circuit * /*a*/, const db::Circuit * /*b*/, const std::string & /*msg*/ = std::string ()) { }
 
+  /**
+   *  @brief Receives log entries for the current circuit pair
+   */
+  virtual void log_entry (Severity /*level*/, const std::string & /*msg*/) { }
+
   /**
    *  @brief Nets a and b match exactly
    */
@@ -257,6 +272,24 @@ public:
     return m_max_depth;
   }
 
+  /**
+   *  @brief Sets a value indicating that log messages are generated
+   *  Log messages may be expensive to compute, hence they can be turned off.
+   *  By default, log messages are generated.
+   */
+  void set_with_log (bool f)
+  {
+    m_with_log = f;
+  }
+
+  /**
+   *  @brief Gets a value indicating that log messages are generated
+   */
+  bool with_log () const
+  {
+    return m_with_log;
+  }
+
   /**
    *  @brief Sets a value indicating whether not to consider net names
    *  This feature is mainly intended for testing.
@@ -365,6 +398,7 @@ protected:
   bool handle_pin_mismatch (const NetGraph &g1, const db::Circuit *c1, const db::Pin *pin1, const NetGraph &g2, const db::Circuit *c2, const db::Pin *p2) const;
 
   mutable NetlistCompareLogger *mp_logger;
+  bool m_with_log;
   std::map<std::pair<const db::Circuit *, const db::Circuit *>, std::vector<std::pair<std::pair<const Net *, const Net *>, bool> > > m_same_nets;
   std::unique_ptr<CircuitPinCategorizer> mp_circuit_pin_categorizer;
   std::unique_ptr<DeviceCategorizer> mp_device_categorizer;
diff --git a/src/db/db/dbNetlistCompareCore.cc b/src/db/db/dbNetlistCompareCore.cc
index 52c0a1bfc..9dfe56018 100644
--- a/src/db/db/dbNetlistCompareCore.cc
+++ b/src/db/db/dbNetlistCompareCore.cc
@@ -31,6 +31,7 @@
 
 #include "tlAssert.h"
 #include "tlLog.h"
+#include "tlInternational.h"
 
 namespace db
 {
@@ -402,6 +403,7 @@ NetlistCompareCore::NetlistCompareCore (NetGraph *graph, NetGraph *other_graph)
     dont_consider_net_names (false),
     with_ambiguous (false),
     logger (0),
+    with_log (true),
     circuit_pin_mapper (0),
     subcircuit_equivalence (0),
     device_equivalence (0),
@@ -1049,6 +1051,10 @@ NetlistCompareCore::derive_node_identities_from_ambiguity_group (const NodeRange
 
       if (ambiguous) {
         if (logger) {
+          if (with_log) {
+            logger->log_entry (db::NetlistCompareLogger::Warning,
+                               tl::sprintf (tl::to_string (tr ("Matching nets %s from an ambiguous group of nets")), nets2string (p->first->net (), p->second->net ())));
+          }
           logger->match_ambiguous_nets (p->first->net (), p->second->net ());
         }
         for (db::Net::const_pin_iterator i = p->first->net ()->begin_pins (); i != p->first->net ()->end_pins (); ++i) {
@@ -1070,9 +1076,11 @@ NetlistCompareCore::derive_node_identities_from_ambiguity_group (const NodeRange
     std::vector<std::pair<const NetGraphNode *, const NetGraphNode *> >::const_iterator p = pairs.begin ();
     for (std::list<TentativeNodeMapping>::iterator tn_of_pair = tn_for_pairs.begin (); tn_of_pair != tn_for_pairs.end (); ++tn_of_pair, ++p) {
 
+      bool was_ambiguous = equivalent_other_nodes.has_attribute (p->second);
+
       //  Note: this would propagate ambiguities to all *derived* mappings. But this probably goes too far:
-      //    bool ambiguous = equivalent_other_nodes.has_attribute (p->second);
-      //  Instead we ignore propagated ambiguities for now:
+      //    bool ambiguous = was_ambiguous;
+      //  Instead we ignore propagated ambiguitied for now:
       bool ambiguous = false;
 
       if (db::NetlistCompareGlobalOptions::options ()->debug_netcompare || tl::verbosity () >= 40) {
@@ -1100,13 +1108,18 @@ NetlistCompareCore::derive_node_identities_from_ambiguity_group (const NodeRange
         NetGraphNode *n_other = & mp_other_graph->node (other_net_index);
 
         if (db::NetlistCompareGlobalOptions::options ()->debug_netcompare || tl::verbosity () >= 40) {
-          if (ambiguous) {
-            tl::info << indent_s << "deduced ambiguous match: " << n->net ()->expanded_name () << " vs. " << n_other->net ()->expanded_name ();
+          if (was_ambiguous) {
+            tl::info << indent_s << "deduced from ambiguous match: " << n->net ()->expanded_name () << " vs. " << n_other->net ()->expanded_name ();
           } else {
             tl::info << indent_s << "deduced match: " << n->net ()->expanded_name () << " vs. " << n_other->net ()->expanded_name ();
           }
         }
 
+        if (logger && with_log && was_ambiguous) {
+          logger->log_entry (db::NetlistCompareLogger::Info,
+                             tl::sprintf (tl::to_string (tr ("Matching nets %s following an ambiguous match")), nets2string (n->net (), n_other->net ())));
+        }
+
         if (ambiguous) {
           if (logger) {
             logger->match_ambiguous_nets (n->net (), n_other->net ());
@@ -1244,6 +1257,263 @@ NetlistCompareCore::derive_node_identities_from_singular_match (const NetGraphNo
   }
 }
 
+static size_t distance (const NetGraphNode &a, const NetGraphNode &b)
+{
+  auto i = a.begin ();
+  auto j = b.begin ();
+
+  size_t fuzz = 0;
+
+  while (i != a.end () || j != b.end ()) {
+
+    if (j == b.end ()) {
+      ++fuzz;
+      ++i;
+      continue;
+    }
+    if (i == a.end ()) {
+      ++fuzz;
+      ++j;
+      continue;
+    }
+
+    if (i->first < j->first) {
+      ++fuzz;
+      ++i;
+      continue;
+    } else if (j->first < i->first) {
+      ++fuzz;
+      ++j;
+      continue;
+    }
+
+    ++i;
+    ++j;
+
+  }
+
+  return fuzz;
+}
+
+static size_t distance3 (const NetGraphNode &a, const NetGraphNode &b1, const NetGraphNode &b2, const NetGraph &gb)
+{
+  bool needs_join = false;
+
+  for (auto e = b1.begin (); e != b1.end () && ! needs_join; ++e) {
+    needs_join = (e->second.second == b1.net () || e->second.second == b2.net ());
+  }
+
+  for (auto e = b2.begin (); e != b2.end () && ! needs_join; ++e) {
+    needs_join = (e->second.second == b1.net () || e->second.second == b2.net ());
+  }
+
+  if (needs_join) {
+    return distance (a, gb.joined (b1, b2));
+  }
+
+  auto i = a.begin ();
+  auto j1 = b1.begin ();
+  auto j2 = b2.begin ();
+
+  size_t fuzz = 0;
+
+  while (i != a.end () || j1 != b1.end () || j2 != b2.end ()) {
+
+    if (j1 == b1.end () && j2 == b2.end ()) {
+      ++fuzz;
+      ++i;
+      continue;
+    }
+
+    bool use_j1 = j2 == b2.end () || (j1 != b1.end () && *j1 < *j2);
+    auto &j = use_j1 ? j1 : j2;
+
+    if (i == a.end ()) {
+      ++fuzz;
+      ++j;
+      continue;
+    }
+
+    if (i->first < j->first) {
+      ++fuzz;
+      ++i;
+      continue;
+    } else if (j->first < i->first) {
+      ++fuzz;
+      ++j;
+      continue;
+    }
+
+    ++i;
+    ++j;
+
+  }
+
+  return fuzz;
+}
+
+static void
+analyze_nodes_for_close_matches (const std::multimap<size_t, const NetGraphNode *> &nodes_by_edges1, const std::multimap<size_t, const NetGraphNode *> &nodes_by_edges2, bool layout2ref, db::NetlistCompareLogger *logger, const db::NetGraph &g2)
+{
+  size_t max_search = 100;
+  double max_fuzz_factor = 0.25;
+  size_t max_fuzz_count = 3;
+  size_t max_edges_split = 3;  //  by how many edges joining will reduce the edge count at max
+  size_t min_edges = 2;
+
+  std::string msg;
+  if (layout2ref) {
+    msg = tl::to_string (tr ("Net %s may be shorting nets %s and %s from reference netlist (fuzziness %d nodes)"));
+  } else {
+    msg = tl::to_string (tr ("Connecting nets %s and %s is making a better match to net %s from reference netlist (fuzziness %d nodes)"));
+  }
+
+  for (auto i = nodes_by_edges1.begin (); i != nodes_by_edges1.end (); ++i) {
+
+    if (i->first < min_edges) {
+      continue;
+    }
+
+    std::set<const db::NetGraphNode *> seen;
+
+    for (auto j = nodes_by_edges2.begin (); j != nodes_by_edges2.end (); ++j) {
+
+      seen.insert (j->second);
+
+      if (j->first > i->first + max_fuzz_count - 1) {
+        break;
+      }
+
+      size_t ne = i->first > j->first ? i->first - j->first : 0;
+      if (ne > max_fuzz_count) {
+        ne -= max_fuzz_count;
+      }
+
+      if (ne == 0 && layout2ref) {
+
+        //  analyze nets for similarities (only layout -> ref as the other case is symmetric)
+
+        size_t fuzz = distance (*i->second, *j->second);
+        double fuzz_factor = double (fuzz) / ne;
+        if (fuzz_factor < max_fuzz_factor) {
+          std::string msg = tl::to_string (tr ("Net %s from netlist approximately matches net %s from reference netlist (fuzziness %d nodes)"));
+          logger->log_entry (db::NetlistCompareLogger::Info, tl::sprintf (msg,
+                                  i->second->net ()->expanded_name (),
+                                  j->second->net ()->expanded_name (),
+                                  int (fuzz)));
+        }
+
+      }
+
+      auto k = nodes_by_edges2.lower_bound (ne);
+
+      size_t tries = max_search;
+      for ( ; k != nodes_by_edges2.end () && j->first + k->first < i->first + max_fuzz_count + max_edges_split && tries > 0; ++k) {
+
+        if (seen.find (k->second) != seen.end ()) {
+          continue;
+        }
+
+        size_t fuzz = distance3 (*i->second, *j->second, *k->second, g2);
+        double fuzz_factor = double (fuzz) / i->first;
+        if (fuzz_factor < max_fuzz_factor) {
+          logger->log_entry (db::NetlistCompareLogger::Info, tl::sprintf (msg,
+                                  (layout2ref ? i : j)->second->net ()->expanded_name (),
+                                  (layout2ref ? j : k)->second->net ()->expanded_name (),
+                                  (layout2ref ? k : i)->second->net ()->expanded_name (),
+                                  int (fuzz)));
+        }
+
+        --tries;
+
+      }
+
+    }
+
+  }
+}
+
+void
+NetlistCompareCore::analyze_failed_matches () const
+{
+  //  Determine the range of nodes with same identity
+
+  std::vector<NetGraphNode::edge_type> no_edges;
+  no_edges.push_back (NetGraphNode::edge_type ());
+
+  std::vector<NodeEdgePair> nodes, other_nodes;
+
+  nodes.reserve (mp_graph->end () - mp_graph->begin ());
+  for (db::NetGraph::node_iterator i1 = mp_graph->begin (); i1 != mp_graph->end (); ++i1) {
+    if (i1->net ()) {
+      nodes.push_back (NodeEdgePair (i1.operator-> (), no_edges.begin ()));
+    }
+  }
+
+  other_nodes.reserve (mp_other_graph->end () - mp_other_graph->begin ());
+  for (db::NetGraph::node_iterator i2 = mp_other_graph->begin (); i2 != mp_other_graph->end (); ++i2) {
+    if (i2->net ()) {
+      other_nodes.push_back (NodeEdgePair (i2.operator-> (), no_edges.begin ()));
+    }
+  }
+
+  std::sort (nodes.begin (), nodes.end (), CompareNodeEdgePair ());
+  std::sort (other_nodes.begin (), other_nodes.end (), CompareNodeEdgePair ());
+
+  auto n1 = nodes.begin ();
+  auto n2 = other_nodes.begin ();
+
+  std::vector<const db::NetGraphNode *> singular1, singular2;
+
+  while (n1 != nodes.end () || n2 != other_nodes.end ()) {
+
+    if (n2 == other_nodes.end ()) {
+      singular1.push_back (n1->node);
+      ++n1;
+      continue;
+    } else if (n1 == nodes.end ()) {
+      singular2.push_back (n2->node);
+      ++n2;
+      continue;
+    }
+
+    if (*n1->node < *n2->node) {
+      singular1.push_back (n1->node);
+      ++n1;
+      continue;
+    } else if (*n2->node < *n1->node) {
+      singular2.push_back (n2->node);
+      ++n2;
+      continue;
+    }
+
+    ++n1;
+    ++n2;
+
+  }
+
+  for (auto i = singular1.begin (); i != singular1.end (); ++i) {
+    logger->log_entry (db::NetlistCompareLogger::Error, tl::sprintf (tl::to_string (tr ("Net %s is not matching any net from reference netlist")), (*i)->net ()->expanded_name ()));
+  }
+
+  //  attempt some analysis for close matches (including shorts / opens)
+
+  std::multimap<size_t, const NetGraphNode *> nodes_by_edges1, nodes_by_edges2;
+
+  for (auto i = singular1.begin (); i != singular1.end (); ++i) {
+    const NetGraphNode *n = *i;
+    nodes_by_edges1.insert (std::make_pair (n->end () - n->begin (), n));
+  }
+
+  for (auto i = singular2.begin (); i != singular2.end (); ++i) {
+    const NetGraphNode *n = *i;
+    nodes_by_edges2.insert (std::make_pair (n->end () - n->begin (), n));
+  }
+
+  analyze_nodes_for_close_matches (nodes_by_edges1, nodes_by_edges2, true, logger, *mp_other_graph);
+  analyze_nodes_for_close_matches (nodes_by_edges2, nodes_by_edges1, false, logger, *mp_graph);
+}
+
 size_t
 NetlistCompareCore::derive_node_identities_from_node_set (std::vector<NodeEdgePair> &nodes, std::vector<NodeEdgePair> &other_nodes) const
 {
@@ -1281,6 +1551,9 @@ NetlistCompareCore::derive_node_identities_from_node_set (std::vector<NodeEdgePa
   }
 
   if (max_depth != std::numeric_limits<size_t>::max() && depth > max_depth) {
+    if (with_log) {
+      logger->log_entry (db::NetlistCompareLogger::Warning, tl::sprintf (tl::to_string (tr ("Maximum depth exhausted (max depth is %d)")), int (max_depth)));
+    }
     if (db::NetlistCompareGlobalOptions::options ()->debug_netcompare) {
       tl::info << indent_s << "max. depth exhausted (" << depth << ">" << max_depth << ")";
     }
@@ -1396,6 +1669,9 @@ NetlistCompareCore::derive_node_identities_from_node_set (std::vector<NodeEdgePa
 
     } else if (max_n_branch != std::numeric_limits<size_t>::max () && double (std::max (nr->num1, nr->num2)) * double (n_branch) > double (max_n_branch)) {
 
+      if (with_log) {
+        logger->log_entry (db::NetlistCompareLogger::Warning, tl::sprintf (tl::to_string (tr ("Maximum complexity exhausted (max complexity is %s, needs at least %s)")), tl::to_string (max_n_branch), tl::to_string (std::max (nr->num1, nr->num2) * n_branch)));
+      }
       if (db::NetlistCompareGlobalOptions::options ()->debug_netcompare) {
         tl::info << indent_s << "max. complexity exhausted (" << std::max (nr->num1, nr->num2) << "*" << n_branch << ">" << max_n_branch << ") - mismatch.";
       }
diff --git a/src/db/db/dbNetlistCompareCore.h b/src/db/db/dbNetlistCompareCore.h
index 659fe7498..ba4a378e7 100644
--- a/src/db/db/dbNetlistCompareCore.h
+++ b/src/db/db/dbNetlistCompareCore.h
@@ -85,12 +85,18 @@ public:
    */
   size_t derive_node_identities_from_node_set (std::vector<NodeEdgePair> &nodes, std::vector<NodeEdgePair> &other_nodes) const;
 
+  /**
+   *  @brief Analyzes the non-matched remaining nodes and produces log output
+   */
+  void analyze_failed_matches () const;
+
   size_t max_depth;
   size_t max_n_branch;
   bool depth_first;
   bool dont_consider_net_names;
   bool with_ambiguous;
   NetlistCompareLogger *logger;
+  bool with_log;
   CircuitPinCategorizer *circuit_pin_mapper;
   SubCircuitEquivalenceTracker *subcircuit_equivalence;
   DeviceEquivalenceTracker *device_equivalence;
diff --git a/src/db/db/dbNetlistCompareGraph.cc b/src/db/db/dbNetlistCompareGraph.cc
index 66e593c27..eb7001a1f 100644
--- a/src/db/db/dbNetlistCompareGraph.cc
+++ b/src/db/db/dbNetlistCompareGraph.cc
@@ -624,4 +624,48 @@ NetGraph::build (const db::Circuit *c, DeviceCategorizer &device_categorizer, Ci
   }
 }
 
+NetGraphNode
+NetGraph::joined (const NetGraphNode &a, const NetGraphNode &b) const
+{
+  NetGraphNode nj = a;
+
+  nj.edges ().clear ();
+  nj.edges ().reserve ((a.end () - a.begin ()) + (b.end () - b.begin ()));
+
+  std::map<const db::Net *, NetGraphNode::edge_type> joined;
+
+  for (int m = 0; m < 2; ++m) {
+
+    const NetGraphNode &n = (m == 0 ? a : b);
+
+    for (auto i = n.begin (); i != n.end (); ++i) {
+
+      if (i->second.second) {
+
+        const db::Net *net = i->second.second == b.net () ? a.net () : i->second.second;
+
+        auto j = joined.find (net);
+        if (j != joined.end ()) {
+          j->second.first.insert (j->second.first.end (), i->first.begin (), i->first.end ());
+        } else {
+          j = joined.insert (std::make_pair (net, *i)).first;
+          j->second.second.second = net;
+        }
+
+      } else {
+        nj.edges ().push_back (*i);
+      }
+
+    }
+
+  }
+
+  for (auto i = joined.begin (); i != joined.end (); ++i) {
+    nj.edges ().push_back (i->second);
+  }
+
+  nj.apply_net_index (m_net_index);
+  return nj;
+}
+
 }
diff --git a/src/db/db/dbNetlistCompareGraph.h b/src/db/db/dbNetlistCompareGraph.h
index 115138997..7ee8a94c3 100644
--- a/src/db/db/dbNetlistCompareGraph.h
+++ b/src/db/db/dbNetlistCompareGraph.h
@@ -272,6 +272,11 @@ public:
     }
   }
 
+  std::vector<edge_type> &edges ()
+  {
+    return m_edges;
+  }
+
 private:
   const db::Net *mp_net;
   size_t m_other_net_index;
@@ -414,6 +419,11 @@ public:
     return const_cast<db::NetGraphNode &> (((const NetGraph *) this)->virtual_node (sc));
   }
 
+  /**
+   * @brief Creates a new node representing two joined nodes
+   */
+  NetGraphNode joined (const NetGraphNode &a, const NetGraphNode &b) const;
+
   /**
    *  @brief Gets the net for a given node index
    */
diff --git a/src/db/db/dbNetlistCompareUtils.cc b/src/db/db/dbNetlistCompareUtils.cc
index 11608333a..e3325dab5 100644
--- a/src/db/db/dbNetlistCompareUtils.cc
+++ b/src/db/db/dbNetlistCompareUtils.cc
@@ -61,7 +61,8 @@ NetlistCompareGlobalOptions::options ()
 // --------------------------------------------------------------------------------------------------------------------
 //   Some utilities
 
-std::string nl_compare_debug_indent (size_t depth)
+std::string
+nl_compare_debug_indent (size_t depth)
 {
   std::string s;
   for (size_t d = 0; d < depth; ++d) {
@@ -70,6 +71,38 @@ std::string nl_compare_debug_indent (size_t depth)
   return s;
 }
 
+const std::string var_sep = tl::to_string (tr (" vs. "));
+
+static std::string
+expanded_name (const db::Net *a)
+{
+  if (a == 0) {
+    return tl::to_string (tr ("(not connected)"));
+  } else {
+    return a->expanded_name ();
+  }
+}
+
+std::string
+nets2string (const db::Net *a, const db::Net *b)
+{
+  std::string na = expanded_name (a);
+  std::string nb = expanded_name (b);
+  if (na != nb) {
+    return na + var_sep + nb;
+  } else {
+    return nb;
+  }
+}
+
+std::string
+nets2string (const std::pair<const db::Net *, const db::Net *> &np)
+{
+  return nets2string (np.first, np.second);
+}
+
+
+
 // --------------------------------------------------------------------------------------------------------------------
 //   Some functions
 
diff --git a/src/db/db/dbNetlistCompareUtils.h b/src/db/db/dbNetlistCompareUtils.h
index fc74c4193..7570fabb6 100644
--- a/src/db/db/dbNetlistCompareUtils.h
+++ b/src/db/db/dbNetlistCompareUtils.h
@@ -83,6 +83,8 @@ const size_t unknown_id = std::numeric_limits<size_t>::max () - 1;
 //  Some utilities
 
 std::string nl_compare_debug_indent (size_t depth);
+std::string nets2string (const db::Net *a, const db::Net *b);
+std::string nets2string (const std::pair<const db::Net *, const db::Net *> &np);
 
 // --------------------------------------------------------------------------------------------------------------------
 //  Net name compare
diff --git a/src/db/db/dbNetlistCrossReference.cc b/src/db/db/dbNetlistCrossReference.cc
index 6363323ec..3ad0d62f4 100644
--- a/src/db/db/dbNetlistCrossReference.cc
+++ b/src/db/db/dbNetlistCrossReference.cc
@@ -416,6 +416,16 @@ NetlistCrossReference::gen_end_circuit (const db::Circuit *, const db::Circuit *
   mp_per_circuit_data = 0;
 }
 
+void
+NetlistCrossReference::gen_log_entry (Severity severity, const std::string &msg)
+{
+  if (mp_per_circuit_data) {
+    mp_per_circuit_data->log_entries.push_back (LogEntryData (severity, msg));
+  } else {
+    m_other_log_entries.push_back (LogEntryData (severity, msg));
+  }
+}
+
 void
 NetlistCrossReference::gen_nets (const db::Net *a, const db::Net *b, Status status, const std::string &msg)
 {
diff --git a/src/db/db/dbNetlistCrossReference.h b/src/db/db/dbNetlistCrossReference.h
index 2ea8997a2..2a5e87fec 100644
--- a/src/db/db/dbNetlistCrossReference.h
+++ b/src/db/db/dbNetlistCrossReference.h
@@ -105,6 +105,15 @@ public:
     std::string msg;
   };
 
+  struct LogEntryData
+  {
+    LogEntryData (Severity s, const std::string &m) : severity (s), msg (m) { }
+    LogEntryData () : severity (NoSeverity) { }
+
+    Severity severity;
+    std::string msg;
+  };
+
   struct PerCircuitData
   {
     PerCircuitData () : status (None) { }
@@ -117,6 +126,8 @@ public:
     typedef pin_pairs_type::const_iterator pin_pairs_const_iterator;
     typedef std::vector<SubCircuitPairData> subcircuit_pairs_type;
     typedef subcircuit_pairs_type::const_iterator subcircuit_pairs_const_iterator;
+    typedef std::vector<LogEntryData> log_entries_type;
+    typedef log_entries_type::const_iterator log_entries_const_iterator;
 
     Status status;
     std::string msg;
@@ -124,6 +135,7 @@ public:
     device_pairs_type devices;
     pin_pairs_type pins;
     subcircuit_pairs_type subcircuits;
+    log_entries_type log_entries;
   };
 
   struct PerNetData
@@ -145,6 +157,7 @@ public:
   void gen_end_netlist (const db::Netlist *a, const db::Netlist *b);
   void gen_begin_circuit (const db::Circuit *a, const db::Circuit *b);
   void gen_end_circuit (const db::Circuit *a, const db::Circuit *b, Status status, const std::string &msg);
+  void gen_log_entry (Severity severity, const std::string &msg);
   void gen_nets (const db::Net *a, const db::Net *b, Status status, const std::string &msg);
   void gen_devices (const db::Device *a, const db::Device *b, Status status, const std::string &msg);
   void gen_pins (const db::Pin *a, const db::Pin *b, Status status, const std::string &msg);
@@ -185,6 +198,11 @@ public:
     gen_end_circuit (a, b, Mismatch, msg);
   }
 
+  virtual void log_entry (Severity severity, const std::string &msg)
+  {
+    gen_log_entry (severity, msg);
+  }
+
   virtual void match_nets (const db::Net *a, const db::Net *b)
   {
     gen_nets (a, b, Match, std::string ());
@@ -261,6 +279,11 @@ public:
     return m_circuits.end ();
   }
 
+  const PerCircuitData::log_entries_type &other_log_entries () const
+  {
+    return m_other_log_entries;
+  }
+
   const db::Pin *other_pin_for (const db::Pin *pin) const;
   const db::Device *other_device_for (const db::Device *device) const;
   const db::SubCircuit *other_subcircuit_for (const db::SubCircuit *subcircuit) const;
@@ -295,6 +318,7 @@ private:
   std::map<const db::SubCircuit *, const db::SubCircuit *> m_other_subcircuit;
   std::pair<const db::Circuit *, const db::Circuit *> m_current_circuits;
   PerCircuitData *mp_per_circuit_data;
+  PerCircuitData::log_entries_type m_other_log_entries;
 
   void establish_pair (const db::Circuit *a, const db::Circuit *b);
   void establish_pair (const db::Net *a, const db::Net *b, Status status, const std::string &msg);
diff --git a/src/db/db/dbReader.cc b/src/db/db/dbReader.cc
index b48026113..93f49a354 100644
--- a/src/db/db/dbReader.cc
+++ b/src/db/db/dbReader.cc
@@ -61,7 +61,7 @@ join_layer_names (std::string &s, const std::string &n)
 //  ReaderBase implementation
 
 ReaderBase::ReaderBase () 
-  : m_warnings_as_errors (false)
+  : m_warnings_as_errors (false), m_warn_level (1)
 { 
 }
 
@@ -75,6 +75,12 @@ ReaderBase::set_warnings_as_errors (bool f)
   m_warnings_as_errors = f;
 }
 
+void
+ReaderBase::init (const db::LoadLayoutOptions &options)
+{
+  m_warn_level = options.warn_level ();
+}
+
 // ---------------------------------------------------------------
 //  Reader implementation
 
diff --git a/src/db/db/dbReader.h b/src/db/db/dbReader.h
index d4dd83d9f..53b259dca 100644
--- a/src/db/db/dbReader.h
+++ b/src/db/db/dbReader.h
@@ -89,8 +89,20 @@ public:
     return m_warnings_as_errors;
   }
 
+  /**
+   *  @brief Gets the warning level
+   */
+  int warn_level () const
+  {
+    return m_warn_level;
+  }
+
+protected:
+  virtual void init (const db::LoadLayoutOptions &options);
+
 private:
   bool m_warnings_as_errors;
+  int m_warn_level;
 };
 
 /**
diff --git a/src/db/db/dbShapes.cc b/src/db/db/dbShapes.cc
index 250918349..962234ee1 100644
--- a/src/db/db/dbShapes.cc
+++ b/src/db/db/dbShapes.cc
@@ -998,6 +998,8 @@ Shapes::clear ()
 {
   if (!m_layers.empty ()) {
 
+    invalidate_state ();  //  HINT: must come before the change is done!
+
     for (tl::vector<LayerBase *>::const_iterator l = m_layers.end (); l != m_layers.begin (); ) {
       //  because the undo stack will do a push, we need to remove layers from the back (this is the last undo
       //  element to be executed)
@@ -1010,7 +1012,6 @@ Shapes::clear ()
       }
     }
 
-    invalidate_state ();  //  HINT: must come before the change is done!
     m_layers.clear ();
 
   }
diff --git a/src/db/db/gsiDeclDbCell.cc b/src/db/db/gsiDeclDbCell.cc
index 634716370..a03c27290 100644
--- a/src/db/db/gsiDeclDbCell.cc
+++ b/src/db/db/gsiDeclDbCell.cc
@@ -141,6 +141,55 @@ struct cell_inst_array_defs
     }
   }
 
+  //  Cell-based constructors
+
+  static C *
+  new_cell_inst_vector2 (const db::Cell *cell, const vector_type &v)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst_vector (cell->cell_index (), v);
+  }
+
+  static C *
+  new_cell_inst2 (const db::Cell *cell, const trans_type &t)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst (cell->cell_index (), t);
+  }
+
+  static C *
+  new_cell_inst_cplx2 (const db::Cell *cell, const complex_trans_type &t)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst_cplx (cell->cell_index (), t);
+  }
+
+  static C *
+  new_cell_inst_array_vector2 (const db::Cell *cell, const vector_type &v,
+                               const vector_type &a, const vector_type &b, unsigned long na, unsigned long nb)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst_array_vector (cell->cell_index (), v, a, b, na, nb);
+  }
+
+  static C *
+  new_cell_inst_array2 (const db::Cell *cell, const trans_type &t,
+                        const vector_type &a, const vector_type &b, unsigned long na, unsigned long nb)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst_array (cell->cell_index (), t, a, b, na, nb);
+  }
+
+  static C *
+  new_cell_inst_array_cplx2 (const db::Cell *cell, const complex_trans_type &t,
+                             const vector_type &a, const vector_type &b, unsigned long na, unsigned long nb)
+  {
+    tl_assert (cell != 0);
+    return new_cell_inst_array_cplx (cell->cell_index (), t, a, b, na, nb);
+  }
+
+  //  Methods
+
   static db::cell_index_type cell_index (const C *a)
   {
     return a->object ().cell_index ();
@@ -151,6 +200,12 @@ struct cell_inst_array_defs
     a->object ().cell_index (cell_index);
   }
 
+  static void set_cell (C *a, db::Cell *cell)
+  {
+    tl_assert (cell != 0);
+    a->object ().cell_index (cell->cell_index ());
+  }
+
   static C transformed_simple (const C *arr, const coord_trans_type &t)
   {
     return arr->transformed (t);
@@ -421,17 +476,41 @@ struct cell_inst_array_defs
       "@param cell_index The cell to instantiate\n"
       "@param trans The transformation by which to instantiate the cell\n"
     ) +
+    gsi::constructor ("new", &new_cell_inst2, gsi::arg ("cell"), gsi::arg ("trans"),
+      "@brief Creates a single cell instance\n"
+      "@param cell The cell to instantiate\n"
+      "@param trans The transformation by which to instantiate the cell\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::constructor ("new", &new_cell_inst_vector, gsi::arg ("cell_index"), gsi::arg ("disp"),
       "@brief Creates a single cell instance\n"
       "@param cell_index The cell to instantiate\n"
       "@param disp The displacement\n"
       "This convenience initializer has been introduced in version 0.28."
     ) +
+    gsi::constructor ("new", &new_cell_inst_vector2, gsi::arg ("cell"), gsi::arg ("disp"),
+      "@brief Creates a single cell instance\n"
+      "@param cell The cell to instantiate\n"
+      "@param disp The displacement\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::constructor ("new", &new_cell_inst_cplx, gsi::arg ("cell_index"), gsi::arg ("trans"),
       "@brief Creates a single cell instance with a complex transformation\n"
       "@param cell_index The cell to instantiate\n"
       "@param trans The complex transformation by which to instantiate the cell\n"
     ) +
+    gsi::constructor ("new", &new_cell_inst_cplx2, gsi::arg ("cell"), gsi::arg ("trans"),
+      "@brief Creates a single cell instance with a complex transformation\n"
+      "@param cell The cell to instantiate\n"
+      "@param trans The complex transformation by which to instantiate the cell\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::constructor ("new", &new_cell_inst_array, gsi::arg ("cell_index"), gsi::arg ("trans"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
       "@brief Creates a single cell instance\n"
       "@param cell_index The cell to instantiate\n"
@@ -445,6 +524,18 @@ struct cell_inst_array_defs
         "Starting with version 0.25 the displacements are of vector type."
       )
     ) +
+    gsi::constructor ("new", &new_cell_inst_array2, gsi::arg ("cell"), gsi::arg ("trans"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
+      "@brief Creates a single cell instance\n"
+      "@param cell The cell to instantiate\n"
+      "@param trans The transformation by which to instantiate the cell\n"
+      "@param a The displacement vector of the array in the 'a' axis\n"
+      "@param b The displacement vector of the array in the 'b' axis\n"
+      "@param na The number of placements in the 'a' axis\n"
+      "@param nb The number of placements in the 'b' axis\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::constructor ("new", &new_cell_inst_array_vector, gsi::arg ("cell_index"), gsi::arg ("disp"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
       "@brief Creates a single cell instance\n"
       "@param cell_index The cell to instantiate\n"
@@ -456,6 +547,18 @@ struct cell_inst_array_defs
       "\n"
       "This convenience initializer has been introduced in version 0.28."
     ) +
+    gsi::constructor ("new", &new_cell_inst_array_vector2, gsi::arg ("cell"), gsi::arg ("disp"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
+      "@brief Creates a single cell instance\n"
+      "@param cell The cell to instantiate\n"
+      "@param disp The basic displacement of the first instance\n"
+      "@param a The displacement vector of the array in the 'a' axis\n"
+      "@param b The displacement vector of the array in the 'b' axis\n"
+      "@param na The number of placements in the 'a' axis\n"
+      "@param nb The number of placements in the 'b' axis\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::constructor ("new", &new_cell_inst_array_cplx, gsi::arg ("cell_index"), gsi::arg ("trans"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
       "@brief Creates a single cell instance with a complex transformation\n"
       "@param cell_index The cell to instantiate\n"
@@ -469,6 +572,18 @@ struct cell_inst_array_defs
         "Starting with version 0.25 the displacements are of vector type."
       )
     ) +
+    gsi::constructor ("new", &new_cell_inst_array_cplx2, gsi::arg ("cell"), gsi::arg ("trans"), gsi::arg ("a"), gsi::arg ("b"), gsi::arg ("na"), gsi::arg ("nb"),
+      "@brief Creates a single cell instance with a complex transformation\n"
+      "@param cell The cell to instantiate\n"
+      "@param trans The complex transformation by which to instantiate the cell\n"
+      "@param a The displacement vector of the array in the 'a' axis\n"
+      "@param b The displacement vector of the array in the 'b' axis\n"
+      "@param na The number of placements in the 'a' axis\n"
+      "@param nb The number of placements in the 'b' axis\n"
+      "\n"
+      "This convenience variant takes a \\Cell pointer and is equivalent to using 'cell.cell_index()'. It "
+      "has been introduced in version 0.28."
+    ) +
     gsi::iterator ("each_trans", (typename C::iterator (C::*) () const) &C::begin,
       "@brief Gets the simple transformations represented by this instance\n"
       "For a single instance, this iterator will deliver the single, simple transformation. "
@@ -500,10 +615,18 @@ struct cell_inst_array_defs
     ) +
     gsi::method_ext ("cell_index", &cell_index,
       "@brief Gets the cell index of the cell instantiated \n"
+      "Use \\Layout#cell to get the \\Cell object from the cell index."
     ) +
     method_ext ("cell_index=", &set_cell_index, gsi::arg ("index"),
       "@brief Sets the index of the cell this instance refers to\n"
     ) +
+    method_ext ("cell=", &set_cell, gsi::arg ("cell"),
+      "@brief Sets the cell this instance refers to\n"
+      "This is a convenience method and equivalent to 'cell_index = cell.cell_index()'. There is no getter for "
+      "the cell pointer because the \\CellInstArray object only knows about cell indexes.\n"
+      "\n"
+      "This convenience method has been introduced in version 0.28.\n"
+    ) +
     gsi::method ("cplx_trans", (complex_trans_type (C::*) () const) &C::complex_trans,
       "@brief Gets the complex transformation of the first instance in the array\n"
       "This method is always applicable, compared to \\trans, since simple transformations can be expressed as complex transformations as well."
diff --git a/src/db/db/gsiDeclDbLayoutToNetlist.cc b/src/db/db/gsiDeclDbLayoutToNetlist.cc
index 6f8b86c47..4d98e4f17 100644
--- a/src/db/db/gsiDeclDbLayoutToNetlist.cc
+++ b/src/db/db/gsiDeclDbLayoutToNetlist.cc
@@ -98,7 +98,7 @@ static std::vector<std::string> l2n_layer_names (const db::LayoutToNetlist *l2n)
   return ln;
 }
 
-static db::Region antenna_check3 (db::LayoutToNetlist *l2n, const db::Region &poly, double poly_area_factor, double poly_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<tl::Variant> &diodes)
+static db::Region antenna_check3 (db::LayoutToNetlist *l2n, const db::Region &poly, double poly_area_factor, double poly_perimeter_factor, const db::Region &metal, double metal_area_factor, double metal_perimeter_factor, double ratio, const std::vector<tl::Variant> &diodes, db::Texts *texts)
 {
   std::vector<std::pair<const db::Region *, double> > diode_pairs;
 
@@ -127,17 +127,17 @@ static db::Region antenna_check3 (db::LayoutToNetlist *l2n, const db::Region &po
 
   }
 
-  return l2n->antenna_check (poly, poly_area_factor, poly_perimeter_factor, metal, metal_area_factor, metal_perimeter_factor, ratio, diode_pairs);
+  return l2n->antenna_check (poly, poly_area_factor, poly_perimeter_factor, metal, metal_area_factor, metal_perimeter_factor, ratio, diode_pairs, texts);
 }
 
-static db::Region antenna_check2 (db::LayoutToNetlist *l2n, const db::Region &poly, double poly_perimeter_factor, const db::Region &metal, double metal_perimeter_factor, double ratio, const std::vector<tl::Variant> &diodes)
+static db::Region antenna_check2 (db::LayoutToNetlist *l2n, const db::Region &poly, double poly_perimeter_factor, const db::Region &metal, double metal_perimeter_factor, double ratio, const std::vector<tl::Variant> &diodes, db::Texts *texts)
 {
-  return antenna_check3 (l2n, poly, 1, poly_perimeter_factor, metal, 1, metal_perimeter_factor, ratio, diodes);
+  return antenna_check3 (l2n, poly, 1, poly_perimeter_factor, metal, 1, metal_perimeter_factor, ratio, diodes, texts);
 }
 
-static db::Region antenna_check (db::LayoutToNetlist *l2n, const db::Region &poly, const db::Region &metal, double ratio, const std::vector<tl::Variant> &diodes)
+static db::Region antenna_check (db::LayoutToNetlist *l2n, const db::Region &poly, const db::Region &metal, double ratio, const std::vector<tl::Variant> &diodes, db::Texts *texts)
 {
-  return antenna_check3 (l2n, poly, 1, 0, metal, 1, 0, ratio, diodes);
+  return antenna_check3 (l2n, poly, 1, 0, metal, 1, 0, ratio, diodes, texts);
 }
 
 static void join_net_names (db::LayoutToNetlist *l2n, const std::string &s)
@@ -701,7 +701,7 @@ Class<db::LayoutToNetlist> decl_dbLayoutToNetlist ("db", "LayoutToNetlist",
     "@brief Reads the extracted netlist from the file.\n"
     "This method employs the native format of KLayout.\n"
   ) +
-  gsi::method_ext ("antenna_check", &antenna_check, gsi::arg ("gate"), gsi::arg ("metal"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"),
+  gsi::method_ext ("antenna_check", &antenna_check, gsi::arg ("gate"), gsi::arg ("metal"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"), gsi::arg ("texts", (db::Texts *) 0, "nil"),
    "@brief Runs an antenna check on the extracted clusters\n"
    "\n"
    "The antenna check will traverse all clusters and run an antenna check\n"
@@ -741,8 +741,13 @@ Class<db::LayoutToNetlist> decl_dbLayoutToNetlist ("db", "LayoutToNetlist",
    "# diode_layer1 increases the ratio by 50 per square micrometer area:\n"
    "errors = l2n.antenna(poly, metal, 10.0 [ [ diode_layer, 50.0 ] ])\n"
    "@/code\n"
+   "\n"
+   "If 'texts' is non-nil, this text collection will receive labels explaining the error in "
+   "terms of area values and relevant ratio.\n"
+   "\n"
+   "The 'texts' parameter has been added in version 0.27.11."
   ) +
-  gsi::method_ext ("antenna_check", &antenna_check2, gsi::arg ("gate"), gsi::arg ("gate_perimeter_factor"), gsi::arg ("metal"), gsi::arg ("metal_perimeter_factor"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"),
+  gsi::method_ext ("antenna_check", &antenna_check2, gsi::arg ("gate"), gsi::arg ("gate_perimeter_factor"), gsi::arg ("metal"), gsi::arg ("metal_perimeter_factor"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"), gsi::arg ("texts", (db::Texts *) 0, "nil"),
    "@brief Runs an antenna check on the extracted clusters taking the perimeter into account\n"
    "\n"
    "This version of the \\antenna_check method allows taking the perimeter of gate or metal into account. "
@@ -759,7 +764,7 @@ Class<db::LayoutToNetlist> decl_dbLayoutToNetlist ("db", "LayoutToNetlist",
    "\n"
    "This variant has been introduced in version 0.26.6.\n"
   ) +
-  gsi::method_ext ("antenna_check", &antenna_check3, gsi::arg ("gate"), gsi::arg ("gate_area_factor"), gsi::arg ("gate_perimeter_factor"), gsi::arg ("metal"), gsi::arg ("metal_area_factor"), gsi::arg ("metal_perimeter_factor"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"),
+  gsi::method_ext ("antenna_check", &antenna_check3, gsi::arg ("gate"), gsi::arg ("gate_area_factor"), gsi::arg ("gate_perimeter_factor"), gsi::arg ("metal"), gsi::arg ("metal_area_factor"), gsi::arg ("metal_perimeter_factor"), gsi::arg ("ratio"), gsi::arg ("diodes", std::vector<tl::Variant> (), "[]"), gsi::arg ("texts", (db::Texts *) 0, "nil"),
    "@brief Runs an antenna check on the extracted clusters taking the perimeter into account and providing an area factor\n"
    "\n"
    "This (most generic) version of the \\antenna_check method allows taking the perimeter of gate or metal into account and also "
diff --git a/src/db/db/gsiDeclDbNetlistCompare.cc b/src/db/db/gsiDeclDbNetlistCompare.cc
index 1d1a13b7b..5c8ed79f3 100644
--- a/src/db/db/gsiDeclDbNetlistCompare.cc
+++ b/src/db/db/gsiDeclDbNetlistCompare.cc
@@ -21,6 +21,7 @@
 */
 
 #include "gsiDecl.h"
+#include "gsiEnums.h"
 #include "dbNetlistCompare.h"
 
 namespace {
@@ -127,7 +128,7 @@ public:
     if (cb_circuit_mismatch.can_issue ()) {
       cb_circuit_mismatch.issue<GenericNetlistCompareLogger, const db::Circuit *, const db::Circuit *, const std::string &> (&GenericNetlistCompareLogger::circuit_mismatch_fb, a, b, msg);
     } else {
-      db::NetlistCompareLogger::circuit_mismatch (a, b);
+      db::NetlistCompareLogger::circuit_mismatch (a, b, msg);
     }
   }
 
@@ -136,6 +137,20 @@ public:
     db::NetlistCompareLogger::circuit_mismatch (a, b, msg);
   }
 
+  virtual void log_entry (db::NetlistCompareLogger::Severity severity, const std::string &msg)
+  {
+    if (cb_log_entry.can_issue ()) {
+      cb_log_entry.issue<GenericNetlistCompareLogger, db::NetlistCompareLogger::Severity, const std::string &> (&GenericNetlistCompareLogger::log_entry, severity, msg);
+    } else {
+      db::NetlistCompareLogger::log_entry (severity, msg);
+    }
+  }
+
+  void log_entry_fb (db::NetlistCompareLogger::Severity severity, const std::string &msg)
+  {
+    db::NetlistCompareLogger::log_entry (severity, msg);
+  }
+
   virtual void match_nets (const db::Net *a, const db::Net *b)
   {
     if (cb_match_nets.can_issue ()) {
@@ -297,8 +312,9 @@ public:
   gsi::Callback cb_end_circuit;
   gsi::Callback cb_circuit_skipped;
   gsi::Callback cb_match_nets;
-  gsi::Callback cb_net_mismatch;
   gsi::Callback cb_circuit_mismatch;
+  gsi::Callback cb_log_entry;
+  gsi::Callback cb_net_mismatch;
   gsi::Callback cb_match_ambiguous_nets;
   gsi::Callback cb_match_devices;
   gsi::Callback cb_match_devices_with_different_parameters;
@@ -368,6 +384,13 @@ Class<GenericNetlistCompareLogger> decl_GenericNetlistCompareLogger (decl_dbNetl
     "\n"
     "This method is called instead of \\begin_circuit and \\end_circuit."
   ) +
+  gsi::callback ("log_entry", &GenericNetlistCompareLogger::log_entry, &GenericNetlistCompareLogger::cb_log_entry, gsi::arg ("level"), gsi::arg ("msg"),
+    "@brief Issues an entry for the compare log.\n"
+    "This method delivers a log message generated during the compare of two circuits.\n"
+    "It is called between of \\begin_circuit and \\end_circuit.\n"
+    "\n"
+    "This method has been added in version 0.28."
+  ) +
   gsi::callback ("match_nets", &GenericNetlistCompareLogger::match_nets, &GenericNetlistCompareLogger::cb_match_nets, gsi::arg ("a"), gsi::arg ("b"),
     "@brief This function is called when two nets are identified.\n"
     "If two nets are identified as a corresponding pair, this method will be called with both nets.\n"
@@ -471,6 +494,19 @@ Class<db::NetlistComparer> decl_dbNetlistComparer ("db", "NetlistComparer",
     "The logger is a delegate or event receiver which the comparer will send compare events to. "
     "See the class description for more details."
   ) +
+  gsi::method ("with_log=", &db::NetlistComparer::set_with_log, gsi::arg ("flag"),
+    "@brief Sets a value indicating that log messages are generated.\n"
+    "Log messages may be expensive to compute, hence they can be turned off.\n"
+    "By default, log messages are generated.\n"
+    "\n"
+    "This attribute have been introduced in version 0.28.\n"
+  ) +
+  gsi::method ("with_log", &db::NetlistComparer::with_log,
+    "@brief Gets a value indicating that log messages are generated.\n"
+    "See \\with_log= for details about this flag.\n"
+    "\n"
+    "This attribute have been introduced in version 0.28.\n"
+  ) +
   gsi::method ("same_nets", (void (db::NetlistComparer::*) (const db::Net *, const db::Net *, bool)) &db::NetlistComparer::same_nets, gsi::arg ("net_a"), gsi::arg ("net_b"), gsi::arg ("must_match", false),
     "@brief Marks two nets as identical.\n"
     "This makes a net net_a in netlist a identical to the corresponding\n"
@@ -621,4 +657,21 @@ Class<db::NetlistComparer> decl_dbNetlistComparer ("db", "NetlistComparer",
   "This class has been introduced in version 0.26."
 );
 
+gsi::EnumIn<GenericNetlistCompareLogger, db::NetlistCompareLogger::Severity> decl_CompareLoggerSeverity ("db", "Severity",
+  gsi::enum_const ("NoSeverity", db::NetlistCompareLogger::NoSeverity,
+    "@brief Unspecific severity\n"
+  ) +
+  gsi::enum_const ("Info", db::NetlistCompareLogger::Info,
+    "@brief Information only\n"
+  ) +
+  gsi::enum_const ("Warning", db::NetlistCompareLogger::Warning,
+    "@brief A warning\n"
+  ) +
+  gsi::enum_const ("Error", db::NetlistCompareLogger::Error,
+    "@brief An error\n"
+  ),
+  "@brief This class represents the log severity level for \\GenericNetlistCompareLogger#log_entry.\n"
+  "This enum has been introduced in version 0.28."
+);
+
 }
diff --git a/src/db/db/gsiDeclDbReader.cc b/src/db/db/gsiDeclDbReader.cc
index 2b97afcc2..d1909a6f0 100644
--- a/src/db/db/gsiDeclDbReader.cc
+++ b/src/db/db/gsiDeclDbReader.cc
@@ -384,7 +384,20 @@ namespace gsi
 
   //  NOTE: the contribution comes from format specific extensions.
   Class<db::LoadLayoutOptions> decl_LoadLayoutOptions ("db", "LoadLayoutOptions",
-    gsi::Methods (),
+    gsi::method ("warn_level=", &db::LoadLayoutOptions::set_warn_level, gsi::arg ("level"),
+      "@brief Sets the warning level.\n"
+      "The warning level is a reader-specific setting which enables or disables warnings\n"
+      "on specific levels. Level 0 is always \"warnings off\". The default level is 1\n"
+      "which means \"reasonable warnings emitted\".\n"
+      "\n"
+      "This attribute has been added in version 0.28."
+    ) +
+    gsi::method ("warn_level", &db::LoadLayoutOptions::warn_level,
+      "@brief Sets the warning level.\n"
+      "See \\warn_level= for details about this attribute.\n"
+      "\n"
+      "This attribute has been added in version 0.28."
+    ),
     "@brief Layout reader options\n"
     "\n"
     "This object describes various layer reader options used for loading layouts.\n"
diff --git a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
index 6f29b26c5..a51174990 100644
--- a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc
@@ -473,3 +473,27 @@ TEST(4_ReaderCombinedDevices)
   }
 }
 
+TEST(5_ReaderFuture)
+{
+  db::LayoutToNetlist l2n;
+
+  std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_5.l2n");
+  tl::InputStream is_in (in_path);
+
+  db::LayoutToNetlistStandardReader reader (is_in);
+  reader.read (&l2n);
+
+  //  verify against the input
+
+  std::string path = tmp_file ("tmp.txt");
+  {
+    tl::OutputStream stream (path);
+    db::LayoutToNetlistStandardWriter writer (stream, false);
+    writer.write (&l2n);
+  }
+
+  std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au_5.l2n");
+
+  compare_text_files (path, au_path);
+}
+
diff --git a/src/db/unit_tests/dbLayoutVsSchematicTests.cc b/src/db/unit_tests/dbLayoutVsSchematicTests.cc
index f617ae11d..3bf8fa629 100644
--- a/src/db/unit_tests/dbLayoutVsSchematicTests.cc
+++ b/src/db/unit_tests/dbLayoutVsSchematicTests.cc
@@ -443,3 +443,19 @@ TEST(2_FlowWithErrors)
   compare_lvsdbs (_this, path2, au_path2);
 }
 
+TEST(3_ReaderFuture)
+{
+  db::LayoutVsSchematic lvs;
+
+  std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test3.lvsdb");
+  lvs.load (in_path);
+
+  //  verify against the input
+
+  std::string path = tmp_file ("tmp.txt");
+  lvs.save (path, false);
+
+  std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test3_au.lvsdb");
+
+  compare_text_files (path, au_path);
+}
diff --git a/src/drc/drc/built-in-macros/_drc_netter.rb b/src/drc/drc/built-in-macros/_drc_netter.rb
index 7e8de64e0..6b81ceb41 100644
--- a/src/drc/drc/built-in-macros/_drc_netter.rb
+++ b/src/drc/drc/built-in-macros/_drc_netter.rb
@@ -351,7 +351,7 @@ module DRC
     # %DRC%
     # @brief Performs an antenna check
     # @name antenna_check
-    # @synopsis antenna_check(gate, metal, ratio, [ diode_specs ... ])
+    # @synopsis antenna_check(gate, metal, ratio, [ diode_specs ... ] [, texts ])
     #
     # The antenna check is used to avoid plasma induced damage. Physically, 
     # the damage happes if during the manufacturing of a metal layer with
@@ -486,8 +486,13 @@ module DRC
     # The error shapes produced by the antenna check are copies
     # of the metal shapes on the metal layers of each network 
     # violating the antenna rule.
+    # 
+    # You can specify a text layer (use "labels" to create one). It will receive
+    # error labels describing the measured values and computation parameters for debugging
+    # the layout. This option has been introduced in version 0.27.11.
+    # 
 
-    def antenna_check(agate, ametal, ratio, *diodes)
+    def antenna_check(agate, ametal, ratio, *args)
 
       @engine._context("antenna_check") do
 
@@ -529,18 +534,31 @@ module DRC
           raise("Ratio argument is not a number")
         end
 
-        dl = diodes.collect do |d|
-          if d.is_a?(Array)
-            d.size == 2 || raise("Diode specification pair expects two elements")
-            d[0].requires_region
-            [ d[0].data, d[1].to_f ]
-          else 
-            d.requires_region
-            [ d.data, 0.0 ]
+        dl = []
+        texts = nil
+        n = 3
+        args.each do |a|
+          if a.is_a?(Array)
+            a.size == 2 || raise("Diode specification pair expects two elements for argument #{n + 1}")
+            if ! a[0].is_a?(DRC::DRCLayer)
+              raise("Diode specification pair needs a layer for the first argument of argument #{n + 1}")
+            end
+            a[0].requires_region
+            dl << [ a[0].data, a[1].to_f ]
+          elsif ! a.is_a?(DRC::DRCLayer)
+            raise("Argument #{n + 1} has to be a layer")
+          else
+            a.requires_texts_or_region
+            if a.data.is_a?(RBA::Region)
+              dl << [ a.data, 0.0 ]
+            else
+              texts = a.data
+            end
           end
+          n += 1
         end
 
-        DRC::DRCLayer::new(@engine, @engine._cmd(l2n_data, :antenna_check, gate.data, gate_area_factor, gate_perimeter_factor, metal.data, metal_area_factor, metal_perimeter_factor, ratio, dl))
+        DRC::DRCLayer::new(@engine, @engine._cmd(l2n_data, :antenna_check, gate.data, gate_area_factor, gate_perimeter_factor, metal.data, metal_area_factor, metal_perimeter_factor, ratio, dl, texts))
 
       end
 
diff --git a/src/drc/drc/built-in-macros/_drc_source.rb b/src/drc/drc/built-in-macros/_drc_source.rb
index 600630949..0af32c75a 100644
--- a/src/drc/drc/built-in-macros/_drc_source.rb
+++ b/src/drc/drc/built-in-macros/_drc_source.rb
@@ -367,6 +367,7 @@ CODE
     # %DRC%
     # @name input
     # @brief Specifies input from a source
+    # @synopsis source.input
     # @synopsis source.input(layer)
     # @synopsis source.input(layer, datatype)
     # @synopsis source.input(layer_into)
@@ -405,6 +406,8 @@ CODE
     # True text layers should be preferred over mixed polygon/text layers if text object processing
     # is required.
     #
+    # "input" without any arguments will create a new, empty original layer.
+    #
     # Use the global version of "input" without a source object to address the default source.
     
     def input(*args)
@@ -417,6 +420,7 @@ CODE
     # %DRC%
     # @name labels
     # @brief Gets the labels (texts) from an input layer
+    # @synopsis source.labels
     # @synopsis source.labels(layer)
     # @synopsis source.labels(layer, datatype)
     # @synopsis source.labels(layer_into)
@@ -429,6 +433,8 @@ CODE
     # to provide text support but a layer type which is provided for carrying text objects
     # explicitly.
     #
+    # "labels" without any arguments will create a new, empty original layer.
+    #
     # Use the global version of "labels" without a source object to address the default source.
     
     def labels(*args)
@@ -441,6 +447,7 @@ CODE
     # %DRC%
     # @name polygons
     # @brief Gets the polygon shapes (or shapes that can be converted polygons) from an input layer
+    # @synopsis source.polygons
     # @synopsis source.polygons(layer)
     # @synopsis source.polygons(layer, datatype)
     # @synopsis source.polygons(layer_into)
@@ -452,6 +459,8 @@ CODE
     # 
     # This method is identical to \input with respect to the options supported.
     #
+    # "polygons" without any arguments will create a new, empty original layer.
+    #
     # Use the global version of "polygons" without a source object to address the default source.
     
     def polygons(*args)
@@ -464,6 +473,7 @@ CODE
     # %DRC%
     # @name edges
     # @brief Gets the edge shapes (or shapes that can be converted edges) from an input layer
+    # @synopsis source.edges
     # @synopsis source.edges(layer)
     # @synopsis source.edges(layer, datatype)
     # @synopsis source.edges(layer_into)
@@ -478,6 +488,8 @@ CODE
     #
     # Use the global version of "edges" without a source object to address the default source.
     # 
+    # "edges" without any arguments will create a new, empty original layer.
+    #
     # This method has been introduced in version 0.27.
     
     def edges(*args)
@@ -490,6 +502,7 @@ CODE
     # %DRC%
     # @name edge_pairs
     # @brief Gets the edge pairs from an input layer
+    # @synopsis source.edge_pairs
     # @synopsis source.edge_pairs(layer)
     # @synopsis source.edge_pairs(layer, datatype)
     # @synopsis source.edge_pairs(layer_into)
@@ -504,6 +517,8 @@ CODE
     #
     # Use the global version of "edge_pairs" without a source object to address the default source.
     # 
+    # "edge_pairs" without any arguments will create a new, empty original layer.
+    #
     # This method has been introduced in version 0.27.
     
     def edge_pairs(*args)
@@ -517,7 +532,8 @@ CODE
     # @name make_layer
     # @brief Creates an empty polygon layer based on the hierarchy of the layout
     # @synopsis make_layer
-    # This method delivers a new empty original layer.
+    # This method delivers a new empty original layer. It is provided to keep old code working.
+    # Use "input" without arguments instead.
 
     def make_layer
       layers = []
diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc
index 30681c13b..741646c9e 100644
--- a/src/drc/unit_tests/drcSimpleTests.cc
+++ b/src/drc/unit_tests/drcSimpleTests.cc
@@ -1117,18 +1117,18 @@ TEST(24_enclosing)
   db::compare_layouts (_this, layout, au, db::NoNormalization);
 }
 
-static void run_test (tl::TestBase *_this, const std::string &number, bool deep)
+static void run_test (tl::TestBase *_this, const std::string &number, bool deep, bool oasis = false)
 {
   std::string rs = tl::testdata ();
   rs += "/drc/drcSimpleTests_" + number + ".drc";
 
   std::string input = tl::testdata ();
-  input += "/drc/drcSimpleTests_" + number + ".gds";
+  input += "/drc/drcSimpleTests_" + number + "." + (oasis ? "oas" : "gds");
 
   std::string au = tl::testdata ();
-  au += "/drc/drcSimpleTests_au" + number + std::string (deep ? "d" : "") + ".gds";
+  au += "/drc/drcSimpleTests_au" + number + std::string (deep ? "d" : "") + "." + (oasis ? "oas" : "gds");
 
-  std::string output = _this->tmp_file ("tmp.gds");
+  std::string output = _this->tmp_file (oasis ? "tmp.oas" : "tmp.gds");
 
   {
     //  Set some variables
@@ -1295,7 +1295,7 @@ TEST(49d_epAngle)
 
 TEST(50_issue826)
 {
-  run_test (_this, "50", false);
+  run_test (_this, "50", false, true /*OASIS*/);
 }
 
 TEST(51_epInternalAngle)
diff --git a/src/gsi/gsi/gsiMethods.cc b/src/gsi/gsi/gsiMethods.cc
index 2c5ae63d1..f49813aeb 100644
--- a/src/gsi/gsi/gsiMethods.cc
+++ b/src/gsi/gsi/gsiMethods.cc
@@ -85,7 +85,7 @@ void MethodBase::parse_name (const std::string &name)
 {
   const char *n = name.c_str ();
 
-  if (*n == '*' && n[1]) {
+  if (*n == '*' && n[1] && n[1] != '*' && n[1] != '=') {
     m_protected = true;
     ++n;
   }
diff --git a/src/lay/lay/doc/about/drc_ref_layer.xml b/src/lay/lay/doc/about/drc_ref_layer.xml
index 9c6966097..f475254c3 100644
--- a/src/lay/lay/doc/about/drc_ref_layer.xml
+++ b/src/lay/lay/doc/about/drc_ref_layer.xml
@@ -3037,6 +3037,12 @@ The effect of the operation is shown in these examples:
 </tr>
 </table>
 </p>
+<a name="texts?"/><h2>"texts?" - Returns true, if the layer is a text collection</h2>
+<keyword name="texts?"/>
+<p>Usage:</p>
+<ul>
+<li><tt>layer.texts?</tt></li>
+</ul>
 <a name="texts_not"/><h2>"texts_not" - Selects texts from an original layer not matching a specific selection</h2>
 <keyword name="texts_not"/>
 <p>Usage:</p>
diff --git a/src/lay/lay/doc/about/drc_ref_netter.xml b/src/lay/lay/doc/about/drc_ref_netter.xml
index 5d9c091da..2b317dcc1 100644
--- a/src/lay/lay/doc/about/drc_ref_netter.xml
+++ b/src/lay/lay/doc/about/drc_ref_netter.xml
@@ -65,7 +65,7 @@ More methods will be added in the future to support network-related features.
 <keyword name="antenna_check"/>
 <p>Usage:</p>
 <ul>
-<li><tt>antenna_check(gate, metal, ratio, [ diode_specs ... ])</tt></li>
+<li><tt>antenna_check(gate, metal, ratio, [ diode_specs ... ] [, texts ])</tt></li>
 </ul>
 <p>
 The antenna check is used to avoid plasma induced damage. Physically, 
@@ -201,6 +201,10 @@ errors = antenna_check(perimeter_only(gate, 0.5), ...)
 The error shapes produced by the antenna check are copies
 of the metal shapes on the metal layers of each network 
 violating the antenna rule.
+</p><p>
+You can specify a text layer (use "labels" to create one). It will receive
+error labels describing the measured values and computation parameters for debugging
+the layout. This option has been introduced in version 0.27.11.
 </p>
 <a name="clear_connections"/><h2>"clear_connections" - Clears all connections stored so far</h2>
 <keyword name="clear_connections"/>
diff --git a/src/lay/lay/doc/about/drc_ref_source.xml b/src/lay/lay/doc/about/drc_ref_source.xml
index 20a46bee9..439157065 100644
--- a/src/lay/lay/doc/about/drc_ref_source.xml
+++ b/src/lay/lay/doc/about/drc_ref_source.xml
@@ -58,6 +58,7 @@ same but without clipping is <a href="#touching">touching</a> or <a href="#overl
 <keyword name="edge_pairs"/>
 <p>Usage:</p>
 <ul>
+<li><tt>source.edge_pairs</tt></li>
 <li><tt>source.edge_pairs(layer)</tt></li>
 <li><tt>source.edge_pairs(layer, datatype)</tt></li>
 <li><tt>source.edge_pairs(layer_into)</tt></li>
@@ -73,12 +74,15 @@ This method is identical to <a href="#input">input</a> with respect to the optio
 </p><p>
 Use the global version of "edge_pairs" without a source object to address the default source.
 </p><p>
+"edge_pairs" without any arguments will create a new, empty original layer.
+</p><p>
 This method has been introduced in version 0.27.
 </p>
 <a name="edges"/><h2>"edges" - Gets the edge shapes (or shapes that can be converted edges) from an input layer</h2>
 <keyword name="edges"/>
 <p>Usage:</p>
 <ul>
+<li><tt>source.edges</tt></li>
 <li><tt>source.edges(layer)</tt></li>
 <li><tt>source.edges(layer, datatype)</tt></li>
 <li><tt>source.edges(layer_into)</tt></li>
@@ -94,6 +98,8 @@ This method is identical to <a href="#input">input</a> with respect to the optio
 </p><p>
 Use the global version of "edges" without a source object to address the default source.
 </p><p>
+"edges" without any arguments will create a new, empty original layer.
+</p><p>
 This method has been introduced in version 0.27.
 </p>
 <a name="extent"/><h2>"extent" - Returns a layer with the bounding box of the selected layout or cells</h2>
@@ -160,6 +166,7 @@ source.global_transform(shift(0, 100.um), rotate(90.0))
 <keyword name="input"/>
 <p>Usage:</p>
 <ul>
+<li><tt>source.input</tt></li>
 <li><tt>source.input(layer)</tt></li>
 <li><tt>source.input(layer, datatype)</tt></li>
 <li><tt>source.input(layer_into)</tt></li>
@@ -200,12 +207,15 @@ operations is available for these objects, such as boolean "and" and "not" with
 True text layers should be preferred over mixed polygon/text layers if text object processing
 is required.
 </p><p>
+"input" without any arguments will create a new, empty original layer.
+</p><p>
 Use the global version of "input" without a source object to address the default source.
 </p>
 <a name="labels"/><h2>"labels" - Gets the labels (texts) from an input layer</h2>
 <keyword name="labels"/>
 <p>Usage:</p>
 <ul>
+<li><tt>source.labels</tt></li>
 <li><tt>source.labels(layer)</tt></li>
 <li><tt>source.labels(layer, datatype)</tt></li>
 <li><tt>source.labels(layer_into)</tt></li>
@@ -219,6 +229,8 @@ layer. Starting with version 0.27, the result is no longer a polygon layer that
 to provide text support but a layer type which is provided for carrying text objects
 explicitly.
 </p><p>
+"labels" without any arguments will create a new, empty original layer.
+</p><p>
 Use the global version of "labels" without a source object to address the default source.
 </p>
 <a name="layers"/><h2>"layers" - Gets the layers the source contains</h2>
@@ -258,7 +270,8 @@ layers.each { |l| (input(l) &amp; clip_box).output(l) }
 <li><tt>make_layer</tt></li>
 </ul>
 <p>
-This method delivers a new empty original layer.
+This method delivers a new empty original layer. It is provided to keep old code working.
+Use "input" without arguments instead.
 </p>
 <a name="overlapping"/><h2>"overlapping" - Specifies input selected from a region in overlapping mode</h2>
 <keyword name="overlapping"/>
@@ -286,6 +299,7 @@ the search region with their bounding box (without the requirement to overlap)
 <keyword name="polygons"/>
 <p>Usage:</p>
 <ul>
+<li><tt>source.polygons</tt></li>
 <li><tt>source.polygons(layer)</tt></li>
 <li><tt>source.polygons(layer, datatype)</tt></li>
 <li><tt>source.polygons(layer_into)</tt></li>
@@ -298,6 +312,8 @@ Those are boxes, paths and real polygons.
 </p><p>
 This method is identical to <a href="#input">input</a> with respect to the options supported.
 </p><p>
+"polygons" without any arguments will create a new, empty original layer.
+</p><p>
 Use the global version of "polygons" without a source object to address the default source.
 </p>
 <a name="select"/><h2>"select" - Adds cell name expressions to the cell filters</h2>
diff --git a/src/lay/lay/doc/images/drc_and1.png b/src/lay/lay/doc/images/drc_and1.png
index d1f6d3fb9..8f480bfe7 100644
Binary files a/src/lay/lay/doc/images/drc_and1.png and b/src/lay/lay/doc/images/drc_and1.png differ
diff --git a/src/lay/lay/doc/images/drc_and2.png b/src/lay/lay/doc/images/drc_and2.png
index 20592ffce..5b8511d14 100644
Binary files a/src/lay/lay/doc/images/drc_and2.png and b/src/lay/lay/doc/images/drc_and2.png differ
diff --git a/src/lay/lay/doc/images/drc_and3.png b/src/lay/lay/doc/images/drc_and3.png
index 81b678059..607deea18 100644
Binary files a/src/lay/lay/doc/images/drc_and3.png and b/src/lay/lay/doc/images/drc_and3.png differ
diff --git a/src/lay/lay/doc/images/drc_centers1.png b/src/lay/lay/doc/images/drc_centers1.png
index 11980e56d..909553ab4 100644
Binary files a/src/lay/lay/doc/images/drc_centers1.png and b/src/lay/lay/doc/images/drc_centers1.png differ
diff --git a/src/lay/lay/doc/images/drc_centers2.png b/src/lay/lay/doc/images/drc_centers2.png
index e79d76598..69c7ecb7f 100644
Binary files a/src/lay/lay/doc/images/drc_centers2.png and b/src/lay/lay/doc/images/drc_centers2.png differ
diff --git a/src/lay/lay/doc/images/drc_corners1.png b/src/lay/lay/doc/images/drc_corners1.png
index 48adba3ca..d1557f3a2 100644
Binary files a/src/lay/lay/doc/images/drc_corners1.png and b/src/lay/lay/doc/images/drc_corners1.png differ
diff --git a/src/lay/lay/doc/images/drc_corners2.png b/src/lay/lay/doc/images/drc_corners2.png
index 13fbbd89c..b595ea398 100644
Binary files a/src/lay/lay/doc/images/drc_corners2.png and b/src/lay/lay/doc/images/drc_corners2.png differ
diff --git a/src/lay/lay/doc/images/drc_corners3.png b/src/lay/lay/doc/images/drc_corners3.png
index 55a909efd..00b978bb3 100644
Binary files a/src/lay/lay/doc/images/drc_corners3.png and b/src/lay/lay/doc/images/drc_corners3.png differ
diff --git a/src/lay/lay/doc/images/drc_covering.png b/src/lay/lay/doc/images/drc_covering.png
index a149730c7..a96d88a7b 100644
Binary files a/src/lay/lay/doc/images/drc_covering.png and b/src/lay/lay/doc/images/drc_covering.png differ
diff --git a/src/lay/lay/doc/images/drc_enc1.png b/src/lay/lay/doc/images/drc_enc1.png
index 69abadec6..2bef4ab3c 100644
Binary files a/src/lay/lay/doc/images/drc_enc1.png and b/src/lay/lay/doc/images/drc_enc1.png differ
diff --git a/src/lay/lay/doc/images/drc_enc1u.png b/src/lay/lay/doc/images/drc_enc1u.png
index 02f4d14b0..5d6e58bb9 100644
Binary files a/src/lay/lay/doc/images/drc_enc1u.png and b/src/lay/lay/doc/images/drc_enc1u.png differ
diff --git a/src/lay/lay/doc/images/drc_enc2.png b/src/lay/lay/doc/images/drc_enc2.png
index 16bbda855..df854246d 100644
Binary files a/src/lay/lay/doc/images/drc_enc2.png and b/src/lay/lay/doc/images/drc_enc2.png differ
diff --git a/src/lay/lay/doc/images/drc_enc2u.png b/src/lay/lay/doc/images/drc_enc2u.png
index a7a70d48c..8a56c4e66 100644
Binary files a/src/lay/lay/doc/images/drc_enc2u.png and b/src/lay/lay/doc/images/drc_enc2u.png differ
diff --git a/src/lay/lay/doc/images/drc_encd1.png b/src/lay/lay/doc/images/drc_encd1.png
index 4be32165a..b53da5730 100644
Binary files a/src/lay/lay/doc/images/drc_encd1.png and b/src/lay/lay/doc/images/drc_encd1.png differ
diff --git a/src/lay/lay/doc/images/drc_encd1u.png b/src/lay/lay/doc/images/drc_encd1u.png
index 8c9403be8..f19b3d6c9 100644
Binary files a/src/lay/lay/doc/images/drc_encd1u.png and b/src/lay/lay/doc/images/drc_encd1u.png differ
diff --git a/src/lay/lay/doc/images/drc_encd2.png b/src/lay/lay/doc/images/drc_encd2.png
index 88e7ad63e..5e810437c 100644
Binary files a/src/lay/lay/doc/images/drc_encd2.png and b/src/lay/lay/doc/images/drc_encd2.png differ
diff --git a/src/lay/lay/doc/images/drc_encd2u.png b/src/lay/lay/doc/images/drc_encd2u.png
index ec3615fca..d85dbca67 100644
Binary files a/src/lay/lay/doc/images/drc_encd2u.png and b/src/lay/lay/doc/images/drc_encd2u.png differ
diff --git a/src/lay/lay/doc/images/drc_end_segments1.png b/src/lay/lay/doc/images/drc_end_segments1.png
index d8ac09404..71fbae69e 100644
Binary files a/src/lay/lay/doc/images/drc_end_segments1.png and b/src/lay/lay/doc/images/drc_end_segments1.png differ
diff --git a/src/lay/lay/doc/images/drc_end_segments2.png b/src/lay/lay/doc/images/drc_end_segments2.png
index 666e81a31..63f6feee9 100644
Binary files a/src/lay/lay/doc/images/drc_end_segments2.png and b/src/lay/lay/doc/images/drc_end_segments2.png differ
diff --git a/src/lay/lay/doc/images/drc_extended1.png b/src/lay/lay/doc/images/drc_extended1.png
index 0acf06f9f..3ff0f23f4 100644
Binary files a/src/lay/lay/doc/images/drc_extended1.png and b/src/lay/lay/doc/images/drc_extended1.png differ
diff --git a/src/lay/lay/doc/images/drc_extended2.png b/src/lay/lay/doc/images/drc_extended2.png
index fe016af38..8860625aa 100644
Binary files a/src/lay/lay/doc/images/drc_extended2.png and b/src/lay/lay/doc/images/drc_extended2.png differ
diff --git a/src/lay/lay/doc/images/drc_extended3.png b/src/lay/lay/doc/images/drc_extended3.png
index ce7e24be2..a585d84c2 100644
Binary files a/src/lay/lay/doc/images/drc_extended3.png and b/src/lay/lay/doc/images/drc_extended3.png differ
diff --git a/src/lay/lay/doc/images/drc_extended4.png b/src/lay/lay/doc/images/drc_extended4.png
index 7d4bc6d9d..47a09728b 100644
Binary files a/src/lay/lay/doc/images/drc_extended4.png and b/src/lay/lay/doc/images/drc_extended4.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs1.png b/src/lay/lay/doc/images/drc_extent_refs1.png
index a0ce25631..d3c89b5f9 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs1.png and b/src/lay/lay/doc/images/drc_extent_refs1.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs10.png b/src/lay/lay/doc/images/drc_extent_refs10.png
index 4616764b0..fd1785e21 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs10.png and b/src/lay/lay/doc/images/drc_extent_refs10.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs11.png b/src/lay/lay/doc/images/drc_extent_refs11.png
index 06b354453..ba28f7c6f 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs11.png and b/src/lay/lay/doc/images/drc_extent_refs11.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs12.png b/src/lay/lay/doc/images/drc_extent_refs12.png
index 84569ccad..ee0848fe8 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs12.png and b/src/lay/lay/doc/images/drc_extent_refs12.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs13.png b/src/lay/lay/doc/images/drc_extent_refs13.png
index 5234c4ccc..90eb6e900 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs13.png and b/src/lay/lay/doc/images/drc_extent_refs13.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs20.png b/src/lay/lay/doc/images/drc_extent_refs20.png
index 6f2e21b15..c5c7384a8 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs20.png and b/src/lay/lay/doc/images/drc_extent_refs20.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs21.png b/src/lay/lay/doc/images/drc_extent_refs21.png
index e8a0efae4..cd7ba9a21 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs21.png and b/src/lay/lay/doc/images/drc_extent_refs21.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs22.png b/src/lay/lay/doc/images/drc_extent_refs22.png
index cc53d2e58..5864bfd3f 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs22.png and b/src/lay/lay/doc/images/drc_extent_refs22.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs23.png b/src/lay/lay/doc/images/drc_extent_refs23.png
index 799244e8a..753dfadcf 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs23.png and b/src/lay/lay/doc/images/drc_extent_refs23.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs24.png b/src/lay/lay/doc/images/drc_extent_refs24.png
index 5e0fa248d..dada72737 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs24.png and b/src/lay/lay/doc/images/drc_extent_refs24.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs25.png b/src/lay/lay/doc/images/drc_extent_refs25.png
index e698483b7..97a3e4ffe 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs25.png and b/src/lay/lay/doc/images/drc_extent_refs25.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs26.png b/src/lay/lay/doc/images/drc_extent_refs26.png
index ffaac3ccc..a281ba6ad 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs26.png and b/src/lay/lay/doc/images/drc_extent_refs26.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs27.png b/src/lay/lay/doc/images/drc_extent_refs27.png
index 0ffd732a0..580ee7363 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs27.png and b/src/lay/lay/doc/images/drc_extent_refs27.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs30.png b/src/lay/lay/doc/images/drc_extent_refs30.png
index f10836f89..8971fe0f2 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs30.png and b/src/lay/lay/doc/images/drc_extent_refs30.png differ
diff --git a/src/lay/lay/doc/images/drc_extent_refs31.png b/src/lay/lay/doc/images/drc_extent_refs31.png
index 2ecb4b3fc..0c1273866 100644
Binary files a/src/lay/lay/doc/images/drc_extent_refs31.png and b/src/lay/lay/doc/images/drc_extent_refs31.png differ
diff --git a/src/lay/lay/doc/images/drc_extents1.png b/src/lay/lay/doc/images/drc_extents1.png
index 4da7f777e..494f98de6 100644
Binary files a/src/lay/lay/doc/images/drc_extents1.png and b/src/lay/lay/doc/images/drc_extents1.png differ
diff --git a/src/lay/lay/doc/images/drc_extents2.png b/src/lay/lay/doc/images/drc_extents2.png
index 2d9c743be..849ef4b8f 100644
Binary files a/src/lay/lay/doc/images/drc_extents2.png and b/src/lay/lay/doc/images/drc_extents2.png differ
diff --git a/src/lay/lay/doc/images/drc_holes.png b/src/lay/lay/doc/images/drc_holes.png
index 7234bdc9d..f8d0d5767 100644
Binary files a/src/lay/lay/doc/images/drc_holes.png and b/src/lay/lay/doc/images/drc_holes.png differ
diff --git a/src/lay/lay/doc/images/drc_hulls.png b/src/lay/lay/doc/images/drc_hulls.png
index 05294e60a..a86927915 100644
Binary files a/src/lay/lay/doc/images/drc_hulls.png and b/src/lay/lay/doc/images/drc_hulls.png differ
diff --git a/src/lay/lay/doc/images/drc_in.png b/src/lay/lay/doc/images/drc_in.png
index 6abd1f525..d490a4a25 100644
Binary files a/src/lay/lay/doc/images/drc_in.png and b/src/lay/lay/doc/images/drc_in.png differ
diff --git a/src/lay/lay/doc/images/drc_inside.png b/src/lay/lay/doc/images/drc_inside.png
index ad110260a..61b9f0385 100644
Binary files a/src/lay/lay/doc/images/drc_inside.png and b/src/lay/lay/doc/images/drc_inside.png differ
diff --git a/src/lay/lay/doc/images/drc_inside_part.png b/src/lay/lay/doc/images/drc_inside_part.png
index 4f60b0e88..632836c75 100644
Binary files a/src/lay/lay/doc/images/drc_inside_part.png and b/src/lay/lay/doc/images/drc_inside_part.png differ
diff --git a/src/lay/lay/doc/images/drc_interacting.png b/src/lay/lay/doc/images/drc_interacting.png
index cf8ccb394..b0ca9711d 100644
Binary files a/src/lay/lay/doc/images/drc_interacting.png and b/src/lay/lay/doc/images/drc_interacting.png differ
diff --git a/src/lay/lay/doc/images/drc_interacting2.png b/src/lay/lay/doc/images/drc_interacting2.png
index a67ed9efc..c924a17d1 100644
Binary files a/src/lay/lay/doc/images/drc_interacting2.png and b/src/lay/lay/doc/images/drc_interacting2.png differ
diff --git a/src/lay/lay/doc/images/drc_interacting3.png b/src/lay/lay/doc/images/drc_interacting3.png
index 91daa8762..1ca5f6703 100644
Binary files a/src/lay/lay/doc/images/drc_interacting3.png and b/src/lay/lay/doc/images/drc_interacting3.png differ
diff --git a/src/lay/lay/doc/images/drc_interacting4.png b/src/lay/lay/doc/images/drc_interacting4.png
index 38a4fd033..4eff34e8d 100644
Binary files a/src/lay/lay/doc/images/drc_interacting4.png and b/src/lay/lay/doc/images/drc_interacting4.png differ
diff --git a/src/lay/lay/doc/images/drc_interacting5.png b/src/lay/lay/doc/images/drc_interacting5.png
index 72b1316f7..63aa03f67 100644
Binary files a/src/lay/lay/doc/images/drc_interacting5.png and b/src/lay/lay/doc/images/drc_interacting5.png differ
diff --git a/src/lay/lay/doc/images/drc_join1.png b/src/lay/lay/doc/images/drc_join1.png
index d76202b20..b5acb1b0a 100644
Binary files a/src/lay/lay/doc/images/drc_join1.png and b/src/lay/lay/doc/images/drc_join1.png differ
diff --git a/src/lay/lay/doc/images/drc_join2.png b/src/lay/lay/doc/images/drc_join2.png
index f0e5afc18..b3d66c286 100644
Binary files a/src/lay/lay/doc/images/drc_join2.png and b/src/lay/lay/doc/images/drc_join2.png differ
diff --git a/src/lay/lay/doc/images/drc_merged1.png b/src/lay/lay/doc/images/drc_merged1.png
index f8902eb65..ff025981e 100644
Binary files a/src/lay/lay/doc/images/drc_merged1.png and b/src/lay/lay/doc/images/drc_merged1.png differ
diff --git a/src/lay/lay/doc/images/drc_merged2.png b/src/lay/lay/doc/images/drc_merged2.png
index 6e8aee84f..c66432764 100644
Binary files a/src/lay/lay/doc/images/drc_merged2.png and b/src/lay/lay/doc/images/drc_merged2.png differ
diff --git a/src/lay/lay/doc/images/drc_merged3.png b/src/lay/lay/doc/images/drc_merged3.png
index a6cc97752..24d14f99c 100644
Binary files a/src/lay/lay/doc/images/drc_merged3.png and b/src/lay/lay/doc/images/drc_merged3.png differ
diff --git a/src/lay/lay/doc/images/drc_merged4.png b/src/lay/lay/doc/images/drc_merged4.png
index fcdd01725..f66a7a02c 100644
Binary files a/src/lay/lay/doc/images/drc_merged4.png and b/src/lay/lay/doc/images/drc_merged4.png differ
diff --git a/src/lay/lay/doc/images/drc_middle1.png b/src/lay/lay/doc/images/drc_middle1.png
index ba9dca0d2..109ee09ad 100644
Binary files a/src/lay/lay/doc/images/drc_middle1.png and b/src/lay/lay/doc/images/drc_middle1.png differ
diff --git a/src/lay/lay/doc/images/drc_moved1.png b/src/lay/lay/doc/images/drc_moved1.png
index f7f0d3235..9fbd96ea1 100644
Binary files a/src/lay/lay/doc/images/drc_moved1.png and b/src/lay/lay/doc/images/drc_moved1.png differ
diff --git a/src/lay/lay/doc/images/drc_not1.png b/src/lay/lay/doc/images/drc_not1.png
index b222eed5d..c44c4d55e 100644
Binary files a/src/lay/lay/doc/images/drc_not1.png and b/src/lay/lay/doc/images/drc_not1.png differ
diff --git a/src/lay/lay/doc/images/drc_not2.png b/src/lay/lay/doc/images/drc_not2.png
index 17e258276..2e4c3784f 100644
Binary files a/src/lay/lay/doc/images/drc_not2.png and b/src/lay/lay/doc/images/drc_not2.png differ
diff --git a/src/lay/lay/doc/images/drc_not3.png b/src/lay/lay/doc/images/drc_not3.png
index a558b73eb..3a51db056 100644
Binary files a/src/lay/lay/doc/images/drc_not3.png and b/src/lay/lay/doc/images/drc_not3.png differ
diff --git a/src/lay/lay/doc/images/drc_not_covering.png b/src/lay/lay/doc/images/drc_not_covering.png
index 4a89f993a..a192aecd3 100644
Binary files a/src/lay/lay/doc/images/drc_not_covering.png and b/src/lay/lay/doc/images/drc_not_covering.png differ
diff --git a/src/lay/lay/doc/images/drc_not_in.png b/src/lay/lay/doc/images/drc_not_in.png
index 588a5ddec..784aab798 100644
Binary files a/src/lay/lay/doc/images/drc_not_in.png and b/src/lay/lay/doc/images/drc_not_in.png differ
diff --git a/src/lay/lay/doc/images/drc_not_inside.png b/src/lay/lay/doc/images/drc_not_inside.png
index 069afb6b3..16146f7aa 100644
Binary files a/src/lay/lay/doc/images/drc_not_inside.png and b/src/lay/lay/doc/images/drc_not_inside.png differ
diff --git a/src/lay/lay/doc/images/drc_not_interacting.png b/src/lay/lay/doc/images/drc_not_interacting.png
index e1124a818..66f1d8478 100644
Binary files a/src/lay/lay/doc/images/drc_not_interacting.png and b/src/lay/lay/doc/images/drc_not_interacting.png differ
diff --git a/src/lay/lay/doc/images/drc_not_interacting2.png b/src/lay/lay/doc/images/drc_not_interacting2.png
index d6105f972..cb6ec6d38 100644
Binary files a/src/lay/lay/doc/images/drc_not_interacting2.png and b/src/lay/lay/doc/images/drc_not_interacting2.png differ
diff --git a/src/lay/lay/doc/images/drc_not_interacting3.png b/src/lay/lay/doc/images/drc_not_interacting3.png
index 32604950c..069e09508 100644
Binary files a/src/lay/lay/doc/images/drc_not_interacting3.png and b/src/lay/lay/doc/images/drc_not_interacting3.png differ
diff --git a/src/lay/lay/doc/images/drc_not_interacting4.png b/src/lay/lay/doc/images/drc_not_interacting4.png
index 6a02f22cc..d78b0219e 100644
Binary files a/src/lay/lay/doc/images/drc_not_interacting4.png and b/src/lay/lay/doc/images/drc_not_interacting4.png differ
diff --git a/src/lay/lay/doc/images/drc_not_interacting5.png b/src/lay/lay/doc/images/drc_not_interacting5.png
index a7a81e180..ee77c5bdd 100644
Binary files a/src/lay/lay/doc/images/drc_not_interacting5.png and b/src/lay/lay/doc/images/drc_not_interacting5.png differ
diff --git a/src/lay/lay/doc/images/drc_not_outside.png b/src/lay/lay/doc/images/drc_not_outside.png
index 00e0104f5..f2519219a 100644
Binary files a/src/lay/lay/doc/images/drc_not_outside.png and b/src/lay/lay/doc/images/drc_not_outside.png differ
diff --git a/src/lay/lay/doc/images/drc_not_overlapping.png b/src/lay/lay/doc/images/drc_not_overlapping.png
index 40661ce0e..9909a7f36 100644
Binary files a/src/lay/lay/doc/images/drc_not_overlapping.png and b/src/lay/lay/doc/images/drc_not_overlapping.png differ
diff --git a/src/lay/lay/doc/images/drc_or1.png b/src/lay/lay/doc/images/drc_or1.png
index 0763b79d2..7357a705c 100644
Binary files a/src/lay/lay/doc/images/drc_or1.png and b/src/lay/lay/doc/images/drc_or1.png differ
diff --git a/src/lay/lay/doc/images/drc_or2.png b/src/lay/lay/doc/images/drc_or2.png
index fdd7cab47..0aa51b9fa 100644
Binary files a/src/lay/lay/doc/images/drc_or2.png and b/src/lay/lay/doc/images/drc_or2.png differ
diff --git a/src/lay/lay/doc/images/drc_outside.png b/src/lay/lay/doc/images/drc_outside.png
index a3913d379..0345e4258 100644
Binary files a/src/lay/lay/doc/images/drc_outside.png and b/src/lay/lay/doc/images/drc_outside.png differ
diff --git a/src/lay/lay/doc/images/drc_outside_part.png b/src/lay/lay/doc/images/drc_outside_part.png
index 213f7a15e..34cc504d2 100644
Binary files a/src/lay/lay/doc/images/drc_outside_part.png and b/src/lay/lay/doc/images/drc_outside_part.png differ
diff --git a/src/lay/lay/doc/images/drc_overlap1.png b/src/lay/lay/doc/images/drc_overlap1.png
index e4bd2d325..f58070e79 100644
Binary files a/src/lay/lay/doc/images/drc_overlap1.png and b/src/lay/lay/doc/images/drc_overlap1.png differ
diff --git a/src/lay/lay/doc/images/drc_overlap1u.png b/src/lay/lay/doc/images/drc_overlap1u.png
index 4fa168ee3..72401d229 100644
Binary files a/src/lay/lay/doc/images/drc_overlap1u.png and b/src/lay/lay/doc/images/drc_overlap1u.png differ
diff --git a/src/lay/lay/doc/images/drc_overlap2.png b/src/lay/lay/doc/images/drc_overlap2.png
index 108b48822..4da4a00ab 100644
Binary files a/src/lay/lay/doc/images/drc_overlap2.png and b/src/lay/lay/doc/images/drc_overlap2.png differ
diff --git a/src/lay/lay/doc/images/drc_overlap2u.png b/src/lay/lay/doc/images/drc_overlap2u.png
index 9c246f0e8..6b4666f18 100644
Binary files a/src/lay/lay/doc/images/drc_overlap2u.png and b/src/lay/lay/doc/images/drc_overlap2u.png differ
diff --git a/src/lay/lay/doc/images/drc_overlapping.png b/src/lay/lay/doc/images/drc_overlapping.png
index c066614e0..d3f803281 100644
Binary files a/src/lay/lay/doc/images/drc_overlapping.png and b/src/lay/lay/doc/images/drc_overlapping.png differ
diff --git a/src/lay/lay/doc/images/drc_raw1.png b/src/lay/lay/doc/images/drc_raw1.png
index 38490f5c1..81d56369b 100644
Binary files a/src/lay/lay/doc/images/drc_raw1.png and b/src/lay/lay/doc/images/drc_raw1.png differ
diff --git a/src/lay/lay/doc/images/drc_raw2.png b/src/lay/lay/doc/images/drc_raw2.png
index e788362dc..2803f371f 100644
Binary files a/src/lay/lay/doc/images/drc_raw2.png and b/src/lay/lay/doc/images/drc_raw2.png differ
diff --git a/src/lay/lay/doc/images/drc_raw3.png b/src/lay/lay/doc/images/drc_raw3.png
index dffd596e6..f335740ad 100644
Binary files a/src/lay/lay/doc/images/drc_raw3.png and b/src/lay/lay/doc/images/drc_raw3.png differ
diff --git a/src/lay/lay/doc/images/drc_rotated1.png b/src/lay/lay/doc/images/drc_rotated1.png
index f16aaf3d3..10f561f25 100644
Binary files a/src/lay/lay/doc/images/drc_rotated1.png and b/src/lay/lay/doc/images/drc_rotated1.png differ
diff --git a/src/lay/lay/doc/images/drc_rounded_corners.png b/src/lay/lay/doc/images/drc_rounded_corners.png
index 984f71ae2..49dfb4495 100644
Binary files a/src/lay/lay/doc/images/drc_rounded_corners.png and b/src/lay/lay/doc/images/drc_rounded_corners.png differ
diff --git a/src/lay/lay/doc/images/drc_scaled1.png b/src/lay/lay/doc/images/drc_scaled1.png
index a0ae3fdbc..10595dfee 100644
Binary files a/src/lay/lay/doc/images/drc_scaled1.png and b/src/lay/lay/doc/images/drc_scaled1.png differ
diff --git a/src/lay/lay/doc/images/drc_separation1.png b/src/lay/lay/doc/images/drc_separation1.png
index e982d2871..1dfa0e9f3 100644
Binary files a/src/lay/lay/doc/images/drc_separation1.png and b/src/lay/lay/doc/images/drc_separation1.png differ
diff --git a/src/lay/lay/doc/images/drc_separation10.png b/src/lay/lay/doc/images/drc_separation10.png
index af8fdeac7..041e66910 100644
Binary files a/src/lay/lay/doc/images/drc_separation10.png and b/src/lay/lay/doc/images/drc_separation10.png differ
diff --git a/src/lay/lay/doc/images/drc_separation11.png b/src/lay/lay/doc/images/drc_separation11.png
index de975994c..bfa3d688f 100644
Binary files a/src/lay/lay/doc/images/drc_separation11.png and b/src/lay/lay/doc/images/drc_separation11.png differ
diff --git a/src/lay/lay/doc/images/drc_separation1u.png b/src/lay/lay/doc/images/drc_separation1u.png
index 1f0db1ee8..c3bbe1416 100644
Binary files a/src/lay/lay/doc/images/drc_separation1u.png and b/src/lay/lay/doc/images/drc_separation1u.png differ
diff --git a/src/lay/lay/doc/images/drc_separation1un.png b/src/lay/lay/doc/images/drc_separation1un.png
index 26a5fbd91..f3cd674a9 100644
Binary files a/src/lay/lay/doc/images/drc_separation1un.png and b/src/lay/lay/doc/images/drc_separation1un.png differ
diff --git a/src/lay/lay/doc/images/drc_separation2.png b/src/lay/lay/doc/images/drc_separation2.png
index 9878580aa..9859e8e4b 100644
Binary files a/src/lay/lay/doc/images/drc_separation2.png and b/src/lay/lay/doc/images/drc_separation2.png differ
diff --git a/src/lay/lay/doc/images/drc_separation3.png b/src/lay/lay/doc/images/drc_separation3.png
index 54425378d..cfdd7f26b 100644
Binary files a/src/lay/lay/doc/images/drc_separation3.png and b/src/lay/lay/doc/images/drc_separation3.png differ
diff --git a/src/lay/lay/doc/images/drc_separation4.png b/src/lay/lay/doc/images/drc_separation4.png
index 818d2ef7d..7c3d58d68 100644
Binary files a/src/lay/lay/doc/images/drc_separation4.png and b/src/lay/lay/doc/images/drc_separation4.png differ
diff --git a/src/lay/lay/doc/images/drc_separation5.png b/src/lay/lay/doc/images/drc_separation5.png
index dea235507..7087dfe60 100644
Binary files a/src/lay/lay/doc/images/drc_separation5.png and b/src/lay/lay/doc/images/drc_separation5.png differ
diff --git a/src/lay/lay/doc/images/drc_separation6.png b/src/lay/lay/doc/images/drc_separation6.png
index f21d778a8..dfa38c475 100644
Binary files a/src/lay/lay/doc/images/drc_separation6.png and b/src/lay/lay/doc/images/drc_separation6.png differ
diff --git a/src/lay/lay/doc/images/drc_separation7.png b/src/lay/lay/doc/images/drc_separation7.png
index 0a76ec4de..95006d6af 100644
Binary files a/src/lay/lay/doc/images/drc_separation7.png and b/src/lay/lay/doc/images/drc_separation7.png differ
diff --git a/src/lay/lay/doc/images/drc_separation8.png b/src/lay/lay/doc/images/drc_separation8.png
index 638722f9b..1dc539958 100644
Binary files a/src/lay/lay/doc/images/drc_separation8.png and b/src/lay/lay/doc/images/drc_separation8.png differ
diff --git a/src/lay/lay/doc/images/drc_separation9.png b/src/lay/lay/doc/images/drc_separation9.png
index c6a675e18..a6da75eaa 100644
Binary files a/src/lay/lay/doc/images/drc_separation9.png and b/src/lay/lay/doc/images/drc_separation9.png differ
diff --git a/src/lay/lay/doc/images/drc_shielded1.png b/src/lay/lay/doc/images/drc_shielded1.png
index aa788f104..22b98c231 100644
Binary files a/src/lay/lay/doc/images/drc_shielded1.png and b/src/lay/lay/doc/images/drc_shielded1.png differ
diff --git a/src/lay/lay/doc/images/drc_shielded2.png b/src/lay/lay/doc/images/drc_shielded2.png
index 1ee78bb0e..0116e6229 100644
Binary files a/src/lay/lay/doc/images/drc_shielded2.png and b/src/lay/lay/doc/images/drc_shielded2.png differ
diff --git a/src/lay/lay/doc/images/drc_shielded3.png b/src/lay/lay/doc/images/drc_shielded3.png
index ba1ab8312..d7c3abf0b 100644
Binary files a/src/lay/lay/doc/images/drc_shielded3.png and b/src/lay/lay/doc/images/drc_shielded3.png differ
diff --git a/src/lay/lay/doc/images/drc_shielded4.png b/src/lay/lay/doc/images/drc_shielded4.png
index c1644a2ec..f7fbc75fc 100644
Binary files a/src/lay/lay/doc/images/drc_shielded4.png and b/src/lay/lay/doc/images/drc_shielded4.png differ
diff --git a/src/lay/lay/doc/images/drc_sized1.png b/src/lay/lay/doc/images/drc_sized1.png
index daae1b5ec..445a60538 100644
Binary files a/src/lay/lay/doc/images/drc_sized1.png and b/src/lay/lay/doc/images/drc_sized1.png differ
diff --git a/src/lay/lay/doc/images/drc_sized2.png b/src/lay/lay/doc/images/drc_sized2.png
index 1e5f2514d..db23995c6 100644
Binary files a/src/lay/lay/doc/images/drc_sized2.png and b/src/lay/lay/doc/images/drc_sized2.png differ
diff --git a/src/lay/lay/doc/images/drc_sized3.png b/src/lay/lay/doc/images/drc_sized3.png
index 63946cc16..247bda8b2 100644
Binary files a/src/lay/lay/doc/images/drc_sized3.png and b/src/lay/lay/doc/images/drc_sized3.png differ
diff --git a/src/lay/lay/doc/images/drc_sized4.png b/src/lay/lay/doc/images/drc_sized4.png
index c4d470f98..5e180f7d2 100644
Binary files a/src/lay/lay/doc/images/drc_sized4.png and b/src/lay/lay/doc/images/drc_sized4.png differ
diff --git a/src/lay/lay/doc/images/drc_sized5.png b/src/lay/lay/doc/images/drc_sized5.png
index 4426443b4..7caace4de 100644
Binary files a/src/lay/lay/doc/images/drc_sized5.png and b/src/lay/lay/doc/images/drc_sized5.png differ
diff --git a/src/lay/lay/doc/images/drc_sized6.png b/src/lay/lay/doc/images/drc_sized6.png
index 0849455da..83677eef9 100644
Binary files a/src/lay/lay/doc/images/drc_sized6.png and b/src/lay/lay/doc/images/drc_sized6.png differ
diff --git a/src/lay/lay/doc/images/drc_space1.png b/src/lay/lay/doc/images/drc_space1.png
index a4d6a8877..96caf65c2 100644
Binary files a/src/lay/lay/doc/images/drc_space1.png and b/src/lay/lay/doc/images/drc_space1.png differ
diff --git a/src/lay/lay/doc/images/drc_space1u.png b/src/lay/lay/doc/images/drc_space1u.png
index 617e6af62..c3fc2f8a1 100644
Binary files a/src/lay/lay/doc/images/drc_space1u.png and b/src/lay/lay/doc/images/drc_space1u.png differ
diff --git a/src/lay/lay/doc/images/drc_space2.png b/src/lay/lay/doc/images/drc_space2.png
index 713378517..5b7b015c6 100644
Binary files a/src/lay/lay/doc/images/drc_space2.png and b/src/lay/lay/doc/images/drc_space2.png differ
diff --git a/src/lay/lay/doc/images/drc_space2u.png b/src/lay/lay/doc/images/drc_space2u.png
index d223d9663..0f3303314 100644
Binary files a/src/lay/lay/doc/images/drc_space2u.png and b/src/lay/lay/doc/images/drc_space2u.png differ
diff --git a/src/lay/lay/doc/images/drc_space3.png b/src/lay/lay/doc/images/drc_space3.png
index a9ddcd213..9273739f0 100644
Binary files a/src/lay/lay/doc/images/drc_space3.png and b/src/lay/lay/doc/images/drc_space3.png differ
diff --git a/src/lay/lay/doc/images/drc_space3u.png b/src/lay/lay/doc/images/drc_space3u.png
index 41b7853de..2d304de7c 100644
Binary files a/src/lay/lay/doc/images/drc_space3u.png and b/src/lay/lay/doc/images/drc_space3u.png differ
diff --git a/src/lay/lay/doc/images/drc_start_segments1.png b/src/lay/lay/doc/images/drc_start_segments1.png
index bdd7c7051..377a6ac57 100644
Binary files a/src/lay/lay/doc/images/drc_start_segments1.png and b/src/lay/lay/doc/images/drc_start_segments1.png differ
diff --git a/src/lay/lay/doc/images/drc_start_segments2.png b/src/lay/lay/doc/images/drc_start_segments2.png
index 8c23e1c0b..ad269e32d 100644
Binary files a/src/lay/lay/doc/images/drc_start_segments2.png and b/src/lay/lay/doc/images/drc_start_segments2.png differ
diff --git a/src/lay/lay/doc/images/drc_textpoly1.png b/src/lay/lay/doc/images/drc_textpoly1.png
index d43240264..487cfcc9c 100644
Binary files a/src/lay/lay/doc/images/drc_textpoly1.png and b/src/lay/lay/doc/images/drc_textpoly1.png differ
diff --git a/src/lay/lay/doc/images/drc_textpoly2.png b/src/lay/lay/doc/images/drc_textpoly2.png
index ff84fb7b0..e6eec02b4 100644
Binary files a/src/lay/lay/doc/images/drc_textpoly2.png and b/src/lay/lay/doc/images/drc_textpoly2.png differ
diff --git a/src/lay/lay/doc/images/drc_texts1.png b/src/lay/lay/doc/images/drc_texts1.png
index 44e30c5bb..a3c5eabf2 100644
Binary files a/src/lay/lay/doc/images/drc_texts1.png and b/src/lay/lay/doc/images/drc_texts1.png differ
diff --git a/src/lay/lay/doc/images/drc_texts2.png b/src/lay/lay/doc/images/drc_texts2.png
index 010c0abca..2e672d4ce 100644
Binary files a/src/lay/lay/doc/images/drc_texts2.png and b/src/lay/lay/doc/images/drc_texts2.png differ
diff --git a/src/lay/lay/doc/images/drc_transformed1.png b/src/lay/lay/doc/images/drc_transformed1.png
index 3fbbc5af2..1c8f240f0 100644
Binary files a/src/lay/lay/doc/images/drc_transformed1.png and b/src/lay/lay/doc/images/drc_transformed1.png differ
diff --git a/src/lay/lay/doc/images/drc_width1.png b/src/lay/lay/doc/images/drc_width1.png
index afc906e51..e603ea2ec 100644
Binary files a/src/lay/lay/doc/images/drc_width1.png and b/src/lay/lay/doc/images/drc_width1.png differ
diff --git a/src/lay/lay/doc/images/drc_width1u.png b/src/lay/lay/doc/images/drc_width1u.png
index dfdc2267f..0620c9f52 100644
Binary files a/src/lay/lay/doc/images/drc_width1u.png and b/src/lay/lay/doc/images/drc_width1u.png differ
diff --git a/src/lay/lay/doc/images/drc_width2.png b/src/lay/lay/doc/images/drc_width2.png
index e27d018ef..adbd23e3e 100644
Binary files a/src/lay/lay/doc/images/drc_width2.png and b/src/lay/lay/doc/images/drc_width2.png differ
diff --git a/src/lay/lay/doc/images/drc_width2u.png b/src/lay/lay/doc/images/drc_width2u.png
index da04841dd..72059ed49 100644
Binary files a/src/lay/lay/doc/images/drc_width2u.png and b/src/lay/lay/doc/images/drc_width2u.png differ
diff --git a/src/lay/lay/doc/images/drc_width3.png b/src/lay/lay/doc/images/drc_width3.png
index 47a5c108f..b6e4f245d 100644
Binary files a/src/lay/lay/doc/images/drc_width3.png and b/src/lay/lay/doc/images/drc_width3.png differ
diff --git a/src/lay/lay/doc/images/drc_width3u.png b/src/lay/lay/doc/images/drc_width3u.png
index 3766720b1..d8b9975fa 100644
Binary files a/src/lay/lay/doc/images/drc_width3u.png and b/src/lay/lay/doc/images/drc_width3u.png differ
diff --git a/src/lay/lay/doc/images/drc_width4.png b/src/lay/lay/doc/images/drc_width4.png
index afef4849c..10024dbfd 100644
Binary files a/src/lay/lay/doc/images/drc_width4.png and b/src/lay/lay/doc/images/drc_width4.png differ
diff --git a/src/lay/lay/doc/images/drc_width4u.png b/src/lay/lay/doc/images/drc_width4u.png
index 6434c0e14..481c252f2 100644
Binary files a/src/lay/lay/doc/images/drc_width4u.png and b/src/lay/lay/doc/images/drc_width4u.png differ
diff --git a/src/lay/lay/doc/images/drc_width5u.png b/src/lay/lay/doc/images/drc_width5u.png
index 9bcd5eadf..df054f8b5 100644
Binary files a/src/lay/lay/doc/images/drc_width5u.png and b/src/lay/lay/doc/images/drc_width5u.png differ
diff --git a/src/lay/lay/doc/images/drc_width6u.png b/src/lay/lay/doc/images/drc_width6u.png
index 664e44a3e..5c25d49a4 100644
Binary files a/src/lay/lay/doc/images/drc_width6u.png and b/src/lay/lay/doc/images/drc_width6u.png differ
diff --git a/src/lay/lay/doc/images/drc_with_angle1.png b/src/lay/lay/doc/images/drc_with_angle1.png
index ec941dbbb..77e234653 100644
Binary files a/src/lay/lay/doc/images/drc_with_angle1.png and b/src/lay/lay/doc/images/drc_with_angle1.png differ
diff --git a/src/lay/lay/doc/images/drc_with_angle2.png b/src/lay/lay/doc/images/drc_with_angle2.png
index 7deb564f0..c122a281b 100644
Binary files a/src/lay/lay/doc/images/drc_with_angle2.png and b/src/lay/lay/doc/images/drc_with_angle2.png differ
diff --git a/src/lay/lay/doc/images/drc_with_angle3.png b/src/lay/lay/doc/images/drc_with_angle3.png
index 98df2c5f8..1e04a839b 100644
Binary files a/src/lay/lay/doc/images/drc_with_angle3.png and b/src/lay/lay/doc/images/drc_with_angle3.png differ
diff --git a/src/lay/lay/doc/images/drc_with_angle4.png b/src/lay/lay/doc/images/drc_with_angle4.png
index 605b45d14..2fc74b3c7 100644
Binary files a/src/lay/lay/doc/images/drc_with_angle4.png and b/src/lay/lay/doc/images/drc_with_angle4.png differ
diff --git a/src/lay/lay/doc/images/drc_xor1.png b/src/lay/lay/doc/images/drc_xor1.png
index 9e7b24970..d33f65b84 100644
Binary files a/src/lay/lay/doc/images/drc_xor1.png and b/src/lay/lay/doc/images/drc_xor1.png differ
diff --git a/src/lay/lay/doc/images/drc_xor2.png b/src/lay/lay/doc/images/drc_xor2.png
index 246364a18..ec9da5c2b 100644
Binary files a/src/lay/lay/doc/images/drc_xor2.png and b/src/lay/lay/doc/images/drc_xor2.png differ
diff --git a/src/lay/lay/layMacroEditorDialog.cc b/src/lay/lay/layMacroEditorDialog.cc
index 90a0b1f27..dd1f2725f 100644
--- a/src/lay/lay/layMacroEditorDialog.cc
+++ b/src/lay/lay/layMacroEditorDialog.cc
@@ -392,6 +392,15 @@ MacroEditorDialog::MacroEditorDialog (lay::Dispatcher *pr, lym::MacroCollection
   connect (tabWidget, SIGNAL (tabCloseRequested (int)), this, SLOT (tab_close_requested (int)));
 #endif
 
+  tabWidget->setContextMenuPolicy (Qt::ActionsContextMenu);
+
+  QAction *action = new QAction (tr ("Close All"), this);
+  connect (action, SIGNAL (triggered ()), this, SLOT (close_all ()));
+  tabWidget->addAction (action);
+  action = new QAction (tr ("Close All Except Current"), this);
+  connect (action, SIGNAL (triggered ()), this, SLOT (close_all_but_current ()));
+  tabWidget->addAction (action);
+
   dbgOn->setEnabled (true);
   runButton->setEnabled (true);
   runThisButton->setEnabled (true);
@@ -2228,6 +2237,75 @@ MacroEditorDialog::new_macro()
   return m;
 }
 
+void
+MacroEditorDialog::close_all ()
+{
+  if (m_in_exec) {
+    return;
+  }
+
+BEGIN_PROTECTED
+
+  tabWidget->clear ();
+
+  for (std::map <lym::Macro *, MacroEditorPage *>::iterator p = m_tab_widgets.begin (); p != m_tab_widgets.end (); ++p) {
+    if (p->second) {
+      p->second->connect_macro (0);
+    }
+    delete p->second;
+  }
+
+  m_tab_widgets.clear ();
+
+  refresh_file_watcher ();
+
+END_PROTECTED
+}
+
+void
+MacroEditorDialog::close_all_but_current ()
+{
+  if (m_in_exec) {
+    return;
+  }
+
+BEGIN_PROTECTED
+
+  QWidget *cw = tabWidget->currentWidget ();
+  int ci = tabWidget->currentIndex ();
+
+  if (ci < 0) {
+    close_all ();
+    return;
+  }
+
+  for (int i = tabWidget->count (); i > 0; ) {
+    --i;
+    if (i != ci) {
+      tabWidget->removeTab (i);
+    }
+  }
+
+  std::map <lym::Macro *, MacroEditorPage *> new_widgets;
+
+  for (std::map <lym::Macro *, MacroEditorPage *>::iterator p = m_tab_widgets.begin (); p != m_tab_widgets.end (); ++p) {
+    if (cw && p->second == cw) {
+      new_widgets.insert (*p);
+    } else {
+      if (p->second) {
+        p->second->connect_macro (0);
+      }
+      delete p->second;
+    }
+  }
+
+  m_tab_widgets.swap (new_widgets);
+
+  refresh_file_watcher ();
+
+END_PROTECTED
+}
+
 void
 MacroEditorDialog::tab_close_requested (int index)
 {
@@ -3405,7 +3483,12 @@ MacroEditorDialog::editor_for_macro (lym::Macro *macro)
     if (macro == mp_run_macro) {
       tabWidget->setTabIcon (index, QIcon (QString::fromUtf8 (m_in_exec ? (m_in_breakpoint ? ":/pause.png" : ":/stop.png") : ":/run.png")));
     }
+
+    bool f = m_add_edit_trace_enabled;
+    m_add_edit_trace_enabled = false;
     tabWidget->setCurrentWidget (editor);
+    m_add_edit_trace_enabled = f;
+
     m_tab_widgets.insert (std::make_pair (macro, editor));
 
     refresh_file_watcher ();
diff --git a/src/lay/lay/layMacroEditorDialog.h b/src/lay/lay/layMacroEditorDialog.h
index 7e6e363e0..e3c14c68d 100644
--- a/src/lay/lay/layMacroEditorDialog.h
+++ b/src/lay/lay/layMacroEditorDialog.h
@@ -212,6 +212,8 @@ private slots:
   void search_editing ();
   void search_finished ();
   void tab_close_requested (int);
+  void close_all ();
+  void close_all_but_current ();
   void replace_mode_button_clicked ();
   void replace_next_button_clicked ();
   void replace_all_button_clicked ();
diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
index 1a4e28170..742c1f635 100644
--- a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
+++ b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
@@ -33,13 +33,6 @@
 #include "dbLayoutVsSchematic.h"
 #include "tlStream.h"
 
-#if defined(HAVE_QTBINDINGS)
-# include "gsiQtGuiExternals.h"
-# include "gsiQtWidgetsExternals.h"  // for Qt5
-#else
-# define QT_EXTERNAL_BASE(x)
-#endif
-
 namespace gsi
 {
 
@@ -466,11 +459,7 @@ static lay::AbstractMenu *menu (lay::LayoutViewBase *view)
   return view->menu ();
 }
 
-#if defined(HAVE_QT)
-LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase (QT_EXTERNAL_BASE (QWidget) "lay", "LayoutViewBase",
-#else
-LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase (QT_EXTERNAL_BASE (QWidget) "lay", "LayoutViewBase",
-#endif
+LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase ("lay", "LayoutViewBase",
   gsi::constant ("LV_NoLayers", (unsigned int) lay::LayoutViewBase::LV_NoLayers,
     "@brief With this option, no layers view will be provided (see \\layer_control_frame)\n"
     "Use this value with the constructor's 'options' argument.\n"
diff --git a/src/layui/layui/NetlistBrowserPage.ui b/src/layui/layui/NetlistBrowserPage.ui
index 19d7438c1..74697088b 100644
--- a/src/layui/layui/NetlistBrowserPage.ui
+++ b/src/layui/layui/NetlistBrowserPage.ui
@@ -30,364 +30,599 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QSplitter" name="splitter_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+    <widget class="QFrame" name="frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <widget class="QFrame" name="frame">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>5</number>
       </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
+      <property name="leftMargin">
+       <number>0</number>
       </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+      <property name="topMargin">
+       <number>0</number>
       </property>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>5</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QFrame" name="frame_4">
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QFrame" name="frame_4">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="spacing">
+          <number>2</number>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <property name="spacing">
-           <number>2</number>
-          </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QToolButton" name="backward">
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../lay/lay/layResources.qrc">
+             <normaloff>:/back_16.png</normaloff>:/back_16.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="forward">
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../lay/lay/layResources.qrc">
+             <normaloff>:/forward_16.png</normaloff>:/forward_16.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="info_button">
+           <property name="toolTip">
+            <string>Show more information about nets</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../lay/lay/layResources.qrc">
+             <normaloff>:/info_16.png</normaloff>:/info_16.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="rerun_button">
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../lay/lay/layResources.qrc">
+             <normaloff>:/run.png</normaloff>:/run.png</iconset>
+           </property>
+           <property name="shortcut">
+            <string>F5</string>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="lay::DecoratedLineEdit" name="find_text">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+             <horstretch>1</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>250</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="find_button">
+           <property name="toolTip">
+            <string>Find in netlist</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../lay/lay/layResources.qrc">
+             <normaloff>:/find.png</normaloff>:/find.png</iconset>
+           </property>
+           <property name="autoRaise">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>6</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTabWidget" name="mode_tab">
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="tab">
+         <attribute name="title">
+          <string>Netlist</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
           <property name="leftMargin">
-           <number>0</number>
+           <number>4</number>
           </property>
           <property name="topMargin">
-           <number>0</number>
+           <number>4</number>
           </property>
           <property name="rightMargin">
-           <number>0</number>
+           <number>4</number>
           </property>
           <property name="bottomMargin">
-           <number>0</number>
+           <number>4</number>
           </property>
           <item>
-           <widget class="QToolButton" name="backward">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
-              <normaloff>:/back_16.png</normaloff>:/back_16.png</iconset>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="forward">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
-              <normaloff>:/forward_16.png</normaloff>:/forward_16.png</iconset>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="info_button">
-            <property name="toolTip">
-             <string>Show more information about nets</string>
-            </property>
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
-              <normaloff>:/info_16.png</normaloff>:/info_16.png</iconset>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="rerun_button">
-            <property name="text">
-             <string>...</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
-              <normaloff>:/run.png</normaloff>:/run.png</iconset>
-            </property>
-            <property name="shortcut">
-             <string>F5</string>
-            </property>
-            <property name="autoRaise">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>32</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="show_netlist">
-            <property name="text">
-             <string>Netlist</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="show_xref">
-            <property name="text">
-             <string>Cross-Ref</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="lay::DecoratedLineEdit" name="find_text">
+           <widget class="QFrame" name="frame_2">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-              <horstretch>1</horstretch>
-              <verstretch>0</verstretch>
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>1</verstretch>
              </sizepolicy>
             </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>250</width>
-              <height>16777215</height>
-             </size>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
+            <layout class="QHBoxLayout" name="horizontalLayout">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QSplitter" name="splitter">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <widget class="QTreeView" name="nl_hierarchy_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <attribute name="headerDefaultSectionSize">
+                 <number>100</number>
+                </attribute>
+               </widget>
+               <widget class="QTreeView" name="nl_directory_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>1</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="baseSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="contextMenuPolicy">
+                 <enum>Qt::ActionsContextMenu</enum>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="selectionBehavior">
+                 <enum>QAbstractItemView::SelectRows</enum>
+                </property>
+                <property name="uniformRowHeights">
+                 <bool>true</bool>
+                </property>
+                <property name="sortingEnabled">
+                 <bool>true</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerVisible">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerCascadingSectionResizes">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerShowSortIndicator" stdset="0">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_2">
+         <attribute name="title">
+          <string>Schematic</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
           <item>
-           <widget class="QToolButton" name="find_button">
-            <property name="toolTip">
-             <string>Find in netlist</string>
+           <widget class="QFrame" name="frame_5">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>1</verstretch>
+             </sizepolicy>
             </property>
-            <property name="text">
-             <string>...</string>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
             </property>
-            <property name="icon">
-             <iconset resource="../../lay/lay/layResources.qrc">
-              <normaloff>:/find.png</normaloff>:/find.png</iconset>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
             </property>
-            <property name="autoRaise">
+            <layout class="QHBoxLayout" name="horizontalLayout_4">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QSplitter" name="splitter_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <widget class="QTreeView" name="sch_hierarchy_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <attribute name="headerDefaultSectionSize">
+                 <number>100</number>
+                </attribute>
+               </widget>
+               <widget class="QTreeView" name="sch_directory_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>1</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="baseSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="contextMenuPolicy">
+                 <enum>Qt::ActionsContextMenu</enum>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="selectionBehavior">
+                 <enum>QAbstractItemView::SelectRows</enum>
+                </property>
+                <property name="uniformRowHeights">
+                 <bool>true</bool>
+                </property>
+                <property name="sortingEnabled">
+                 <bool>true</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerVisible">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerCascadingSectionResizes">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerShowSortIndicator" stdset="0">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_3">
+         <attribute name="title">
+          <string>Cross Reference</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <item>
+           <widget class="QFrame" name="frame_6">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>1</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::NoFrame</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QSplitter" name="splitter_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <widget class="QTreeView" name="xref_hierarchy_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <attribute name="headerDefaultSectionSize">
+                 <number>100</number>
+                </attribute>
+               </widget>
+               <widget class="QTreeView" name="xref_directory_tree">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+                  <horstretch>1</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="baseSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="contextMenuPolicy">
+                 <enum>Qt::ActionsContextMenu</enum>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="selectionBehavior">
+                 <enum>QAbstractItemView::SelectRows</enum>
+                </property>
+                <property name="uniformRowHeights">
+                 <bool>true</bool>
+                </property>
+                <property name="sortingEnabled">
+                 <bool>true</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <attribute name="headerVisible">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerCascadingSectionResizes">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerShowSortIndicator" stdset="0">
+                 <bool>false</bool>
+                </attribute>
+                <attribute name="headerStretchLastSection">
+                 <bool>false</bool>
+                </attribute>
+               </widget>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="tab_4">
+         <attribute name="title">
+          <string>Log</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>4</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <item>
+           <widget class="QTreeView" name="log_view">
+            <property name="contextMenuPolicy">
+             <enum>Qt::ActionsContextMenu</enum>
+            </property>
+            <property name="headerHidden">
              <bool>true</bool>
             </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>6</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QFrame" name="frame_2">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>1</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QSplitter" name="splitter">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <widget class="QTreeView" name="hierarchy_tree">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <attribute name="headerDefaultSectionSize">
-              <number>100</number>
-             </attribute>
-            </widget>
-            <widget class="QTreeView" name="directory_tree">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-               <horstretch>1</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="baseSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="contextMenuPolicy">
-              <enum>Qt::ActionsContextMenu</enum>
-             </property>
-             <property name="selectionMode">
-              <enum>QAbstractItemView::ExtendedSelection</enum>
-             </property>
-             <property name="selectionBehavior">
-              <enum>QAbstractItemView::SelectRows</enum>
-             </property>
-             <property name="uniformRowHeights">
-              <bool>true</bool>
-             </property>
-             <property name="sortingEnabled">
-              <bool>true</bool>
-             </property>
-             <property name="allColumnsShowFocus">
-              <bool>true</bool>
-             </property>
-             <attribute name="headerVisible">
-              <bool>false</bool>
-             </attribute>
-             <attribute name="headerCascadingSectionResizes">
-              <bool>false</bool>
-             </attribute>
-             <attribute name="headerShowSortIndicator" stdset="0">
-              <bool>false</bool>
-             </attribute>
-             <attribute name="headerStretchLastSection">
-              <bool>false</bool>
-             </attribute>
-            </widget>
+            <attribute name="headerVisible">
+             <bool>false</bool>
+            </attribute>
            </widget>
           </item>
          </layout>
         </widget>
-       </item>
-       <item>
-        <widget class="QFrame" name="frame_3">
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="frame_3">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+         <property name="topMargin">
+          <number>0</number>
          </property>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="info_label">
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="info_label">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
-  <action name="actionCollapseAll">
-   <property name="text">
-    <string>Collapse All</string>
-   </property>
-  </action>
-  <action name="actionExpandAll">
-   <property name="text">
-    <string>Expand All</string>
-   </property>
-  </action>
   <action name="actionUseRegularExpressions">
    <property name="checkable">
     <bool>true</bool>
@@ -436,60 +671,9 @@
   <tabstop>info_button</tabstop>
   <tabstop>find_text</tabstop>
   <tabstop>find_button</tabstop>
-  <tabstop>hierarchy_tree</tabstop>
-  <tabstop>directory_tree</tabstop>
  </tabstops>
  <resources>
   <include location="../../lay/lay/layResources.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>actionCollapseAll</sender>
-   <signal>triggered()</signal>
-   <receiver>directory_tree</receiver>
-   <slot>collapseAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>281</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionExpandAll</sender>
-   <signal>triggered()</signal>
-   <receiver>directory_tree</receiver>
-   <slot>expandAll()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>281</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>actionUnselectAll</sender>
-   <signal>triggered()</signal>
-   <receiver>directory_tree</receiver>
-   <slot>clearSelection()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>324</x>
-     <y>289</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/src/layui/layui/layNetlistBrowserDialog.cc b/src/layui/layui/layNetlistBrowserDialog.cc
index e71706ae8..9a4eac92e 100644
--- a/src/layui/layui/layNetlistBrowserDialog.cc
+++ b/src/layui/layui/layNetlistBrowserDialog.cc
@@ -476,9 +476,15 @@ BEGIN_PROTECTED
 
       mp_ui->browser_page->set_db (0);
       try {
-        l2ndb->load (l2ndb->filename ());
-        mp_ui->browser_page->set_db (l2ndb);
+
+        m_l2ndb_name = l2ndb->name ();
+        db::LayoutToNetlist *new_l2ndb = db::LayoutToNetlist::create_from_file (l2ndb->filename ());
+
+        view ()->replace_l2ndb (m_l2n_index, new_l2ndb);
+        mp_ui->browser_page->set_db (new_l2ndb);
+
         current_db_changed_event ();
+
       } catch (...) {
         current_db_changed_event ();
         throw;
diff --git a/src/layui/layui/layNetlistBrowserModel.cc b/src/layui/layui/layNetlistBrowserModel.cc
index c70e6455d..82ffa4f81 100644
--- a/src/layui/layui/layNetlistBrowserModel.cc
+++ b/src/layui/layui/layNetlistBrowserModel.cc
@@ -101,6 +101,74 @@ NetlistObjectsPath::second () const
   return p;
 }
 
+static bool
+translate_circuit (const db::Circuit *&a, const db::NetlistCrossReference &xref)
+{
+  if (a) {
+    a = xref.other_circuit_for (a);
+    if (! a) {
+      return false;
+    }
+  }
+  return true;
+}
+
+static bool
+translate_subcircuit (const db::SubCircuit *&a, const db::NetlistCrossReference &xref)
+{
+  if (a) {
+    a = xref.other_subcircuit_for (a);
+    if (! a) {
+      return false;
+    }
+  }
+  return true;
+}
+
+static bool
+translate_device (const db::Device *&a, const db::NetlistCrossReference &xref)
+{
+  if (a) {
+    a = xref.other_device_for (a);
+    if (! a) {
+      return false;
+    }
+  }
+  return true;
+}
+
+static bool
+translate_net (const db::Net *&a, const db::NetlistCrossReference &xref)
+{
+  if (a) {
+    a = xref.other_net_for (a);
+    if (! a) {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool
+NetlistObjectsPath::translate (NetlistObjectsPath &p, const db::NetlistCrossReference &xref)
+{
+  if (! translate_circuit (p.root.first, xref) || ! translate_circuit (p.root.second, xref)) {
+    return false;
+  }
+  for (NetlistObjectsPath::path_type::iterator i = p.path.begin (); i != p.path.end (); ++i) {
+    if (! translate_subcircuit (i->first, xref) || ! translate_subcircuit (i->second, xref)) {
+      return false;
+    }
+  }
+  if (! translate_device (p.device.first, xref) || ! translate_device (p.device.second, xref)) {
+    return false;
+  }
+  if (! translate_net (p.net.first, xref) || ! translate_net (p.net.second, xref)) {
+    return false;
+  }
+  return true;
+}
+
 // ----------------------------------------------------------------------------------
 //  Implementation of the item classes
 
@@ -2377,6 +2445,19 @@ CircuitDeviceTerminalItemData::search_text ()
 // ----------------------------------------------------------------------------------
 //  NetlistBrowserModel implementation
 
+NetlistBrowserModel::NetlistBrowserModel (QWidget *parent, db::Netlist *netlist, NetColorizer *colorizer)
+  : QAbstractItemModel (parent), mp_l2ndb (0), mp_lvsdb (0), mp_colorizer (colorizer)
+{
+  mp_root.reset (new RootItemData ());
+  mp_indexer.reset (new SingleIndexedNetlistModel (netlist));
+  mp_colorizer->colors_changed.add (this, &NetlistBrowserModel::colors_changed);
+
+  m_object_column = 0;
+  m_status_column = -1;
+  m_first_column = 2;
+  m_second_column = -1;
+}
+
 NetlistBrowserModel::NetlistBrowserModel (QWidget *parent, db::LayoutToNetlist *l2ndb, NetColorizer *colorizer)
   : QAbstractItemModel (parent), mp_l2ndb (l2ndb), mp_lvsdb (0), mp_colorizer (colorizer)
 {
diff --git a/src/layui/layui/layNetlistBrowserModel.h b/src/layui/layui/layNetlistBrowserModel.h
index 9fd6a0a98..8e7f0290c 100644
--- a/src/layui/layui/layNetlistBrowserModel.h
+++ b/src/layui/layui/layNetlistBrowserModel.h
@@ -183,8 +183,9 @@ public:
     return ! root.first && ! root.second;
   }
 
-  static NetlistObjectsPath from_first(const NetlistObjectPath &p);
+  static NetlistObjectsPath from_first (const NetlistObjectPath &p);
   static NetlistObjectsPath from_second (const NetlistObjectPath &p);
+  static bool translate (NetlistObjectsPath &p, const db::NetlistCrossReference &xref);
 
   NetlistObjectPath first () const;
   NetlistObjectPath second () const;
@@ -229,6 +230,7 @@ class LAYUI_PUBLIC NetlistBrowserModel
 Q_OBJECT
 
 public:
+  NetlistBrowserModel (QWidget *parent, db::Netlist *netlist, NetColorizer *colorizer);
   NetlistBrowserModel (QWidget *parent, db::LayoutToNetlist *l2ndb, NetColorizer *colorizer);
   NetlistBrowserModel (QWidget *parent, db::LayoutVsSchematic *lvsdb, NetColorizer *colorizer);
   ~NetlistBrowserModel ();
diff --git a/src/layui/layui/layNetlistBrowserPage.cc b/src/layui/layui/layNetlistBrowserPage.cc
index b22b0eb6c..ee30ee713 100644
--- a/src/layui/layui/layNetlistBrowserPage.cc
+++ b/src/layui/layui/layNetlistBrowserPage.cc
@@ -25,6 +25,7 @@
 #include "layNetlistBrowserPage.h"
 #include "layNetlistBrowserModel.h"
 #include "layNetlistBrowserTreeModel.h"
+#include "layNetlistLogModel.h"
 #include "layItemDelegates.h"
 #include "layCellView.h"
 #include "layLayoutViewBase.h"
@@ -138,48 +139,78 @@ NetlistBrowserPage::NetlistBrowserPage (QWidget * /*parent*/)
   m_show_all_action->setCheckable (true);
   m_show_all_action->setChecked (m_show_all);
 
-  QAction *color_action = new QAction (QObject::tr ("Colorize Nets"), directory_tree);
-  QMenu *menu = new QMenu (directory_tree);
-  lay::ColorButton::build_color_menu (menu, this, SLOT (browse_color_for_net ()), SLOT (select_color_for_net ()));
-  color_action->setMenu (menu);
+  {
+    QAction *collapse_all = new QAction (QObject::tr ("Collapse All"), log_view);
+    connect (collapse_all, SIGNAL (triggered ()), log_view, SLOT (collapseAll ()));
+    log_view->addAction (collapse_all);
 
-  QAction *sep;
-  directory_tree->addAction (m_show_all_action);
-  directory_tree->addAction (actionCollapseAll);
-  //  TODO: this gives a too big tree - confine to single branches?
-  //  directory_tree->addAction (actionExpandAll);
-  sep = new QAction (directory_tree);
-  sep->setSeparator (true);
-  directory_tree->addAction (sep);
-  directory_tree->addAction (actionUnselectAll);
-  sep = new QAction (directory_tree);
-  sep->setSeparator (true);
-  directory_tree->addAction (sep);
-  directory_tree->addAction (color_action);
-  sep = new QAction (directory_tree);
-  sep->setSeparator (true);
-  directory_tree->addAction (sep);
-  directory_tree->addAction (actionExportSelected);
-  directory_tree->addAction (actionExportAll);
-
-  directory_tree->header ()->setDefaultSectionSize (150);
-
-  lay::HTMLItemDelegate *delegate;
-
-  for (int i = 0; i < 4; ++i) {
-    delegate = new lay::HTMLItemDelegate (this);
-    delegate->set_text_margin (2);
-    delegate->set_anchors_clickable (true);
-    connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &)));
-    directory_tree->setItemDelegateForColumn (i, delegate);
+    QAction *expand_all = new QAction (QObject::tr ("Expand All"), log_view);
+    connect (expand_all, SIGNAL (triggered ()), log_view, SLOT (expandAll ()));
+    log_view->addAction (expand_all);
   }
 
-  for (int i = 0; i < 2; ++i) {
-    delegate = new lay::HTMLItemDelegate (this);
-    delegate->set_text_margin (2);
-    delegate->set_anchors_clickable (true);
-    connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &)));
-    hierarchy_tree->setItemDelegateForColumn (i, delegate);
+  QTreeView *dt[] = { nl_directory_tree, sch_directory_tree, xref_directory_tree };
+
+  for (int m = 0; m < int (sizeof (dt) / sizeof (dt[0])); ++m) {
+
+    QTreeView *directory_tree = dt[m];
+
+    QAction *color_action = new QAction (QObject::tr ("Colorize Nets"), directory_tree);
+    QMenu *menu = new QMenu (directory_tree);
+    lay::ColorButton::build_color_menu (menu, this, SLOT (browse_color_for_net ()), SLOT (select_color_for_net ()));
+    color_action->setMenu (menu);
+
+    QAction *sep;
+    directory_tree->addAction (m_show_all_action);
+    QAction *collapse_all = new QAction (QObject::tr ("Collapse All"), directory_tree);
+    connect (collapse_all, SIGNAL (triggered ()), directory_tree, SLOT (collapseAll ()));
+    directory_tree->addAction (collapse_all);
+    //  TODO: this gives a too big tree - confine to single branches?
+    //  QAction *expand_all = new QAction (QObject::tr ("Expand All"), directory_tree);
+    //  connect (expand_all, SIGNAL (triggered ()), directory_tree, SLOT (expandAll ()));
+    //  directory_tree->addAction (actionExpandAll);
+    sep = new QAction (directory_tree);
+    sep->setSeparator (true);
+    directory_tree->addAction (sep);
+    directory_tree->addAction (actionUnselectAll);
+    sep = new QAction (directory_tree);
+    sep->setSeparator (true);
+    directory_tree->addAction (sep);
+    directory_tree->addAction (color_action);
+    sep = new QAction (directory_tree);
+    sep->setSeparator (true);
+    directory_tree->addAction (sep);
+    directory_tree->addAction (actionExportSelected);
+    directory_tree->addAction (actionExportAll);
+
+    directory_tree->header ()->setDefaultSectionSize (150);
+
+    for (int i = 0; i < 4; ++i) {
+      lay::HTMLItemDelegate *delegate = new lay::HTMLItemDelegate (this);
+      delegate->set_text_margin (2);
+      delegate->set_anchors_clickable (true);
+      connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &)));
+      directory_tree->setItemDelegateForColumn (i, delegate);
+    }
+
+    directory_tree->installEventFilter (this);
+
+  }
+
+  QTreeView *ht[] = { nl_hierarchy_tree, sch_hierarchy_tree, xref_hierarchy_tree };
+
+  for (int m = 0; m < int (sizeof (ht) / sizeof (ht[0])); ++m) {
+
+    QTreeView *hierarchy_tree = ht[m];
+
+    for (int i = 0; i < 2; ++i) {
+      lay::HTMLItemDelegate *delegate = new lay::HTMLItemDelegate (this);
+      delegate->set_text_margin (2);
+      delegate->set_anchors_clickable (true);
+      connect (delegate, SIGNAL (anchor_clicked (const QString &)), this, SLOT (anchor_clicked (const QString &)));
+      hierarchy_tree->setItemDelegateForColumn (i, delegate);
+    }
+
   }
 
   QMenu *find_edit_menu = new QMenu (find_text);
@@ -200,16 +231,11 @@ NetlistBrowserPage::NetlistBrowserPage (QWidget * /*parent*/)
   connect (forward, SIGNAL (clicked ()), this, SLOT (navigate_forward ()));
   connect (backward, SIGNAL (clicked ()), this, SLOT (navigate_back ()));
 
-  connect (show_netlist, SIGNAL (clicked ()), this, SLOT (mode_changed ()));
-  connect (show_xref, SIGNAL (clicked ()), this, SLOT (mode_changed ()));
-
   connect (actionExportAll, SIGNAL (triggered ()), this, SLOT (export_all ()));
   connect (actionExportSelected, SIGNAL (triggered ()), this, SLOT (export_selected ()));
 
   forward->setEnabled (false);
   backward->setEnabled (false);
-
-  directory_tree->installEventFilter (this);
 }
 
 NetlistBrowserPage::~NetlistBrowserPage ()
@@ -220,7 +246,7 @@ NetlistBrowserPage::~NetlistBrowserPage ()
 bool
 NetlistBrowserPage::is_netlist_mode ()
 {
-  return show_netlist->isChecked ();
+  return mode_tab->currentIndex () == 0; // @@@
 }
 
 void
@@ -285,7 +311,8 @@ NetlistBrowserPage::set_max_shape_count (size_t max_shape_count)
 bool
 NetlistBrowserPage::eventFilter (QObject *watched, QEvent *event)
 {
-  if (watched != directory_tree) {
+  QTreeView *tree = dynamic_cast<QTreeView *> (watched);
+  if (tree != nl_directory_tree && tree != sch_directory_tree && tree != xref_directory_tree) {
     return false;
   }
 
@@ -295,7 +322,7 @@ NetlistBrowserPage::eventFilter (QObject *watched, QEvent *event)
   }
 
   if (ke->key () == Qt::Key_Escape) {
-    directory_tree->clearSelection ();
+    tree->clearSelection ();
     return true;
   } else {
     return false;
@@ -308,17 +335,69 @@ NetlistBrowserPage::layer_list_changed (int)
   dm_update_highlights ();
 }
 
+QTreeView *
+NetlistBrowserPage::current_hierarchy_tree ()
+{
+  switch (mode_tab->currentIndex ()) {
+  case 0:
+    return nl_hierarchy_tree;
+  case 1:
+    return sch_hierarchy_tree;
+  case 2:
+    return xref_hierarchy_tree;
+  default:
+    return 0;
+  }
+}
+
+QTreeView *
+NetlistBrowserPage::current_directory_tree ()
+{
+  switch (mode_tab->currentIndex ()) {
+  case 0:
+    return nl_directory_tree;
+  case 1:
+    return sch_directory_tree;
+  case 2:
+    return xref_directory_tree;
+  default:
+    return 0;
+  }
+}
+
 void
 NetlistBrowserPage::anchor_clicked (const QString &a)
 {
-  NetlistBrowserModel *netlist_model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
+  QTreeView *directory_tree = current_directory_tree ();
+  NetlistBrowserModel *netlist_model = 0;
+  if (directory_tree) {
+    netlist_model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
+  }
   if (netlist_model) {
     navigate_to (netlist_model->index_from_url (a), true);
   }
 }
 
 void
-NetlistBrowserPage::current_tree_index_changed (const QModelIndex &index)
+NetlistBrowserPage::nl_current_tree_index_changed (const QModelIndex &index)
+{
+  current_tree_index_changed (nl_hierarchy_tree, nl_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::sch_current_tree_index_changed (const QModelIndex &index)
+{
+  current_tree_index_changed (sch_hierarchy_tree, sch_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::xref_current_tree_index_changed (const QModelIndex &index)
+{
+  current_tree_index_changed (xref_hierarchy_tree, xref_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::current_tree_index_changed (QTreeView *hierarchy_tree, QTreeView *directory_tree, const QModelIndex &index)
 {
   if (index.isValid () && m_signals_enabled) {
 
@@ -340,7 +419,25 @@ NetlistBrowserPage::current_tree_index_changed (const QModelIndex &index)
 }
 
 void
-NetlistBrowserPage::current_index_changed (const QModelIndex &index)
+NetlistBrowserPage::nl_current_index_changed (const QModelIndex &index)
+{
+  current_index_changed (nl_hierarchy_tree, nl_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::sch_current_index_changed (const QModelIndex &index)
+{
+  current_index_changed (sch_hierarchy_tree, sch_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::xref_current_index_changed (const QModelIndex &index)
+{
+  current_index_changed (xref_hierarchy_tree, xref_directory_tree, index);
+}
+
+void
+NetlistBrowserPage::current_index_changed (QTreeView *hierarchy_tree, QTreeView *directory_tree, const QModelIndex &index)
 {
   if (index.isValid () && m_signals_enabled) {
 
@@ -366,11 +463,27 @@ void
 NetlistBrowserPage::select_net (const db::Net *net)
 {
   if (! net || ! net->circuit ()) {
-    directory_tree->clearSelection ();
+
+    nl_directory_tree->clearSelection ();
+    sch_directory_tree->clearSelection ();
+    xref_directory_tree->clearSelection ();
+
   } else {
-    NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
+
+    NetlistBrowserModel *model;
+
+    model = dynamic_cast<NetlistBrowserModel *> (nl_directory_tree->model ());
     tl_assert (model != 0);
-    directory_tree->setCurrentIndex (model->index_from_net (net));
+    nl_directory_tree->setCurrentIndex (model->index_from_net (net));
+
+    model = dynamic_cast<NetlistBrowserModel *> (sch_directory_tree->model ());
+    tl_assert (model != 0);
+    sch_directory_tree->setCurrentIndex (model->index_from_net (net));
+
+    model = dynamic_cast<NetlistBrowserModel *> (xref_directory_tree->model ());
+    tl_assert (model != 0);
+    xref_directory_tree->setCurrentIndex (model->index_from_net (net));
+
   }
 }
 
@@ -378,22 +491,54 @@ void
 NetlistBrowserPage::select_path (const lay::NetlistObjectsPath &path)
 {
   if (path.is_null ()) {
-    directory_tree->clearSelection ();
+
+    nl_directory_tree->clearSelection ();
+    sch_directory_tree->clearSelection ();
+    xref_directory_tree->clearSelection ();
+
   } else {
-    NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
-    tl_assert (model != 0);
-    directory_tree->setCurrentIndex (model->index_from_path (path));
+
+    NetlistBrowserModel *model;
+    db::LayoutToNetlist *l2ndb = mp_database.get ();
+    db::LayoutVsSchematic *lvsdb = dynamic_cast<db::LayoutVsSchematic *> (l2ndb);
+
+    model = dynamic_cast<NetlistBrowserModel *> (nl_directory_tree->model ());
+    if (model) {
+      nl_directory_tree->setCurrentIndex (model->index_from_path (path));
+    }
+
+    model = dynamic_cast<NetlistBrowserModel *> (sch_directory_tree->model ());
+    if (model && lvsdb && lvsdb->cross_ref ()) {
+      lay::NetlistObjectsPath sch_path = path;
+      //  Note: translation helps generating a schematic-netlist index to
+      //  naviate to the schematic netlist in case of probing for example (only
+      //  works if all path components can be translated)
+      if (lay::NetlistObjectsPath::translate (sch_path, *lvsdb->cross_ref ())) {
+        sch_directory_tree->setCurrentIndex (model->index_from_path (sch_path));
+      }
+    }
+
+    model = dynamic_cast<NetlistBrowserModel *> (xref_directory_tree->model ());
+    if (model) {
+      xref_directory_tree->setCurrentIndex (model->index_from_path (path));
+    }
+
   }
 }
 
 std::vector<const db::Net *>
 NetlistBrowserPage::selected_nets ()
 {
+  std::vector<const db::Net *> nets;
+
+  QTreeView *directory_tree = current_directory_tree ();
+  if (! directory_tree) {
+    return nets;
+  }
+
   NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
   tl_assert (model != 0);
 
-  std::vector<const db::Net *> nets;
-
   QModelIndexList selection = directory_tree->selectionModel ()->selectedIndexes ();
   for (QModelIndexList::const_iterator i = selection.begin (); i != selection.end (); ++i) {
     if (i->column () == 0) {
@@ -410,11 +555,16 @@ NetlistBrowserPage::selected_nets ()
 std::vector<const db::Circuit *>
 NetlistBrowserPage::selected_circuits ()
 {
+  std::vector<const db::Circuit *> circuits;
+
+  QTreeView *directory_tree = current_directory_tree ();
+  if (! directory_tree) {
+    return circuits;
+  }
+
   NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
   tl_assert (model != 0);
 
-  std::vector<const db::Circuit *> circuits;
-
   QModelIndexList selection = directory_tree->selectionModel ()->selectedIndexes ();
   for (QModelIndexList::const_iterator i = selection.begin (); i != selection.end (); ++i) {
     if (i->column () == 0) {
@@ -431,11 +581,16 @@ NetlistBrowserPage::selected_circuits ()
 std::vector<const db::SubCircuit *>
 NetlistBrowserPage::selected_subcircuits ()
 {
+  std::vector<const db::SubCircuit *> subcircuits;
+
+  QTreeView *directory_tree = current_directory_tree ();
+  if (! directory_tree) {
+    return subcircuits;
+  }
+
   NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
   tl_assert (model != 0);
 
-  std::vector<const db::SubCircuit *> subcircuits;
-
   QModelIndexList selection = directory_tree->selectionModel ()->selectedIndexes ();
   for (QModelIndexList::const_iterator i = selection.begin (); i != selection.end (); ++i) {
     if (i->column () == 0) {
@@ -452,11 +607,16 @@ NetlistBrowserPage::selected_subcircuits ()
 std::vector<const db::Device *>
 NetlistBrowserPage::selected_devices ()
 {
+  std::vector<const db::Device *> devices;
+
+  QTreeView *directory_tree = current_directory_tree ();
+  if (! directory_tree) {
+    return devices;
+  }
+
   NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
   tl_assert (model != 0);
 
-  std::vector<const db::Device *> devices;
-
   QModelIndexList selection = directory_tree->selectionModel ()->selectedIndexes ();
   for (QModelIndexList::const_iterator i = selection.begin (); i != selection.end (); ++i) {
     if (i->column () == 0) {
@@ -471,7 +631,53 @@ NetlistBrowserPage::selected_devices ()
 }
 
 void
-NetlistBrowserPage::selection_changed ()
+NetlistBrowserPage::nl_selection_changed ()
+{
+  selection_changed (nl_hierarchy_tree, nl_directory_tree);
+}
+
+void
+NetlistBrowserPage::sch_selection_changed ()
+{
+  QTreeView *directory_tree = sch_directory_tree;
+
+  NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
+  tl_assert (model != 0);
+
+  db::LayoutToNetlist *l2ndb = mp_database.get ();
+  db::LayoutVsSchematic *lvsdb = dynamic_cast<db::LayoutVsSchematic *> (l2ndb);
+  if (! lvsdb || ! lvsdb->cross_ref ()) {
+    return;
+  }
+
+  QModelIndexList selected = directory_tree->selectionModel ()->selectedIndexes ();
+
+  std::vector<lay::NetlistObjectsPath> selected_paths;
+  selected_paths.reserve (selected.size ());
+  for (QModelIndexList::const_iterator i = selected.begin (); i != selected.end (); ++i) {
+    if (i->column () == 0) {
+      selected_paths.push_back (model->path_from_index (*i));
+      //  translate the schematic paths to layout paths (if available)
+      if (! lay::NetlistObjectsPath::translate (selected_paths.back (), *lvsdb->cross_ref ())) {
+        selected_paths.pop_back ();
+      }
+    }
+  }
+
+  QModelIndex current = directory_tree->selectionModel ()->currentIndex ();
+  highlight (model->path_from_index (current), selected_paths);
+
+  selection_changed_event ();
+}
+
+void
+NetlistBrowserPage::xref_selection_changed ()
+{
+  selection_changed (xref_hierarchy_tree, xref_directory_tree);
+}
+
+void
+NetlistBrowserPage::selection_changed (QTreeView * /*hierarchy_tree*/, QTreeView *directory_tree)
 {
   NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
   tl_assert (model != 0);
@@ -531,11 +737,37 @@ NetlistBrowserPage::select_color_for_net ()
 void
 NetlistBrowserPage::navigate_to (const QModelIndex &index, bool fwd)
 {
-  if (! index.isValid ()) {
+  if (! index.isValid () || ! index.model ()) {
+    return;
+  }
+
+  QTreeView *directory_tree = 0;
+  QTreeView *hierarchy_tree = 0;
+
+  if (index.model () == nl_directory_tree->model ()) {
+
+    directory_tree = nl_directory_tree;
+    hierarchy_tree = nl_hierarchy_tree;
+    mode_tab->setCurrentIndex (0);
+
+  } else if (index.model () == sch_directory_tree->model ()) {
+
+    directory_tree = sch_directory_tree;
+    hierarchy_tree = sch_hierarchy_tree;
+    mode_tab->setCurrentIndex (1);
+
+  } else if (index.model () == xref_directory_tree->model ()) {
+
+    directory_tree = xref_directory_tree;
+    hierarchy_tree = xref_hierarchy_tree;
+    mode_tab->setCurrentIndex (2);
+
+  } else {
     return;
   }
 
   m_signals_enabled = false;
+
   try {
 
     directory_tree->setCurrentIndex (index);
@@ -557,7 +789,7 @@ NetlistBrowserPage::navigate_to (const QModelIndex &index, bool fwd)
 
   add_to_history (index, fwd);
 
-  selection_changed ();
+  selection_changed (hierarchy_tree, directory_tree);
 }
 
 void
@@ -640,12 +872,6 @@ NetlistBrowserPage::info_button_pressed ()
   mp_info_dialog->show ();
 }
 
-void
-NetlistBrowserPage::mode_changed ()
-{
-  setup_trees ();
-}
-
 static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const QRegExp &to_find, const QModelIndex &from)
 {
   QModelIndex index = from;
@@ -658,6 +884,7 @@ static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const
     return index;
   }
 
+  int max_depth = 4;
   QModelIndex current = index;
 
   std::vector<QModelIndex> parent_stack;
@@ -675,6 +902,13 @@ static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const
   std::reverse (parent_stack.begin (), parent_stack.end ());
   std::reverse (rows_stack.begin (), rows_stack.end ());
 
+  while (int (rows_stack.size ()) > max_depth) {
+    rows_stack.pop_back ();
+    parent_stack.pop_back ();
+  }
+
+  std::vector<std::pair<int, int> > initial_rows_stack = rows_stack;
+
   tl::AbsoluteProgress progress (tl::to_string (tr ("Searching ...")));
 
   do {
@@ -683,7 +917,7 @@ static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const
 
     bool has_next = false;
 
-    if (model->hasChildren (current) && rows_stack.size () < 2) {
+    if (model->hasChildren (current) && int (rows_stack.size ()) < max_depth - 1) {
 
       int row_count = model->rowCount (current);
       if (row_count > 0) {
@@ -727,7 +961,7 @@ static QModelIndex find_next (QTreeView *view, QAbstractItemModel *model, const
 
     }
 
-  } while (current.internalPointer () != from.internalPointer () || current.row () != from.row ());
+  } while (rows_stack != initial_rows_stack);
 
   return QModelIndex ();
 }
@@ -739,6 +973,11 @@ NetlistBrowserPage::find_button_pressed ()
               actionCaseSensitive->isChecked () ? Qt::CaseSensitive : Qt::CaseInsensitive,
               actionUseRegularExpressions->isChecked () ? QRegExp::RegExp : QRegExp::FixedString);
 
+  QTreeView *directory_tree = current_directory_tree ();
+  if (! directory_tree) {
+    return;
+  }
+
   QModelIndex next = find_next (directory_tree, directory_tree->model (), re, directory_tree->currentIndex ());
   if (next.isValid ()) {
     navigate_to (next);
@@ -761,9 +1000,9 @@ NetlistBrowserPage::show_all (bool f)
     m_show_all = f;
     m_show_all_action->setChecked (f);
 
-    NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (directory_tree->model ());
+    NetlistBrowserModel *model = dynamic_cast<NetlistBrowserModel *> (xref_directory_tree->model ());
     if (model) {
-      model->set_item_visibility (directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
+      model->set_item_visibility (xref_directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
     }
 
   }
@@ -799,14 +1038,18 @@ NetlistBrowserPage::set_db (db::LayoutToNetlist *l2ndb)
     rerun_button->setToolTip (QString ());
   }
 
-  show_netlist->setVisible (lvsdb != 0);
-  show_xref->setVisible (lvsdb != 0);
+  //  @@@ how to hide?
+  bool is_lvsdb = (lvsdb != 0);
+  mode_tab->setTabEnabled (0, true);
+  mode_tab->setTabEnabled (1, is_lvsdb);
+  mode_tab->setTabEnabled (2, is_lvsdb);
+  mode_tab->setTabEnabled (3, is_lvsdb);
 
-  bool se = m_signals_enabled;
-  m_signals_enabled = false;
-  show_netlist->setChecked (lvsdb == 0);
-  show_xref->setChecked (lvsdb != 0);
-  m_signals_enabled = se;
+  if (is_lvsdb) {
+    mode_tab->setCurrentIndex (2);
+  } else {
+    mode_tab->setCurrentIndex (0);
+  }
 
   clear_highlights ();
 
@@ -819,84 +1062,174 @@ NetlistBrowserPage::set_db (db::LayoutToNetlist *l2ndb)
   return true;
 }
 
+static void
+set_abstract_tree_model (QTreeView *view, QAbstractItemModel *new_model)
+{
+  int columns = view->model () ? view->model ()->columnCount (QModelIndex ()) : 0;
+  int new_columns = new_model->columnCount (QModelIndex ());
+
+  delete view->model ();
+  view->setModel (new_model);
+
+  view->header ()->show ();
+  view->header ()->setStretchLastSection (true);
+  view->header ()->setMinimumSectionSize (25);
+
+  if (columns < new_columns) {
+    //  makes sure new columns are properly size-adjusted
+    for (int i = std::max (0, columns - 1); i < new_columns; ++i) {
+      view->header ()->resizeSection (i, i == 1 ? view->header ()->minimumSectionSize () : view->header ()->defaultSectionSize ());
+    }
+  }
+}
+
+static void
+set_tree_model (QTreeView *view, NetlistBrowserModel *new_model)
+{
+  set_abstract_tree_model (view, new_model);
+
+  //  hide the status column if not needed
+  view->header ()->setSectionHidden (1, new_model->status_column () < 0);
+}
+
+static void
+set_tree_model (QTreeView *view, NetlistBrowserTreeModel *new_model)
+{
+  set_abstract_tree_model (view, new_model);
+
+  //  hide the status column if not needed
+  view->header ()->setSectionHidden (1, new_model->status_column () < 0);
+}
+
 void
 NetlistBrowserPage::setup_trees ()
 {
   if (! mp_database.get ()) {
-    delete directory_tree->model ();
-    directory_tree->setModel (0);
-    delete hierarchy_tree->model ();
-    hierarchy_tree->setModel (0);
+
+    delete nl_directory_tree->model ();
+    nl_directory_tree->setModel (0);
+    delete sch_directory_tree->model ();
+    sch_directory_tree->setModel (0);
+    delete xref_directory_tree->model ();
+    xref_directory_tree->setModel (0);
+    delete nl_hierarchy_tree->model ();
+    nl_hierarchy_tree->setModel (0);
+    delete sch_hierarchy_tree->model ();
+    sch_hierarchy_tree->setModel (0);
+    delete xref_hierarchy_tree->model ();
+    xref_hierarchy_tree->setModel (0);
+    delete log_view->model ();
+    log_view->setModel (0);
+
     return;
+
   }
 
   db::LayoutToNetlist *l2ndb = mp_database.get ();
-  db::LayoutVsSchematic *lvsdb = show_netlist->isChecked () ? 0 : dynamic_cast<db::LayoutVsSchematic *> (l2ndb);
+  db::LayoutVsSchematic *lvsdb = dynamic_cast<db::LayoutVsSchematic *> (l2ndb);
 
-  {
-    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
-    NetlistBrowserModel *new_model = 0;
-    if (lvsdb) {
-      new_model = new NetlistBrowserModel (directory_tree, lvsdb, &m_colorizer);
-    } else {
-      new_model = new NetlistBrowserModel (directory_tree, l2ndb, &m_colorizer);
-    }
+  if (lvsdb && lvsdb->cross_ref ()) {
 
-    int columns = directory_tree->model () ? directory_tree->model ()->columnCount (QModelIndex ()) : 0;
-    int new_columns = new_model->columnCount (QModelIndex ());
+    NetlistLogModel *new_model = new NetlistLogModel (log_view, lvsdb->cross_ref ());
+    delete log_view->model ();
+    log_view->setModel (new_model);
 
-    delete directory_tree->model ();
-    directory_tree->setModel (new_model);
-    connect (directory_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (current_index_changed (const QModelIndex &)));
-    connect (directory_tree->selectionModel (), SIGNAL (selectionChanged (const QItemSelection &, const QItemSelection &)), this, SLOT (selection_changed ()));
+  } else {
 
-    directory_tree->header ()->show ();
-    directory_tree->header ()->setStretchLastSection (true);
-    directory_tree->header ()->setMinimumSectionSize (25);
+    delete log_view->model ();
+    log_view->setModel (0);
 
-    if (columns < new_columns) {
-      //  makes sure new columns are properly size-adjusted
-      for (int i = std::max (0, columns - 1); i < new_columns; ++i) {
-        directory_tree->header ()->resizeSection (i, i == 1 ? directory_tree->header ()->minimumSectionSize () : directory_tree->header ()->defaultSectionSize ());
-      }
-    }
-
-    //  hide the status column if not needed
-    directory_tree->header ()->setSectionHidden (1, new_model->status_column () < 0);
-
-    //  establish visibility according to "show all"
-    new_model->set_item_visibility (directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
   }
 
   {
     //  NOTE: with the tree as the parent, the tree will take over ownership of the model
-    NetlistBrowserTreeModel *new_hierarchy_model = 0;
-    if (lvsdb) {
-      new_hierarchy_model = new NetlistBrowserTreeModel (hierarchy_tree, lvsdb);
-    } else {
-      new_hierarchy_model = new NetlistBrowserTreeModel (hierarchy_tree, l2ndb);
-    }
+    NetlistBrowserModel *new_model = new NetlistBrowserModel (nl_directory_tree, l2ndb, &m_colorizer);
 
-    int columns = hierarchy_tree->model () ? hierarchy_tree->model ()->columnCount (QModelIndex ()) : 0;
-    int new_columns = new_hierarchy_model->columnCount (QModelIndex ());
+    set_tree_model (nl_directory_tree, new_model);
 
-    delete hierarchy_tree->model ();
-    hierarchy_tree->setModel (new_hierarchy_model);
-    connect (hierarchy_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (current_tree_index_changed (const QModelIndex &)));
+    connect (nl_directory_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (nl_current_index_changed (const QModelIndex &)));
+    connect (nl_directory_tree->selectionModel (), SIGNAL (selectionChanged (const QItemSelection &, const QItemSelection &)), this, SLOT (nl_selection_changed ()));
 
-    hierarchy_tree->header ()->show ();
-    hierarchy_tree->header ()->setStretchLastSection (true);
-    hierarchy_tree->header ()->setMinimumSectionSize (25);
+    //  establish visibility according to "show all"
+    new_model->set_item_visibility (nl_directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
+  }
 
-    if (columns < new_columns) {
-      //  makes sure new columns are properly size-adjusted
-      for (int i = std::max (0, columns - 1); i < new_columns; ++i) {
-        hierarchy_tree->header ()->resizeSection (i, i == 1 ? hierarchy_tree->header ()->minimumSectionSize () : hierarchy_tree->header ()->defaultSectionSize ());
-      }
-    }
+  if (lvsdb) {
+
+    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
+    NetlistBrowserModel *new_model = new NetlistBrowserModel (sch_directory_tree, lvsdb->reference_netlist (), &m_colorizer);
+
+    set_tree_model (sch_directory_tree, new_model);
+
+    connect (sch_directory_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (sch_current_index_changed (const QModelIndex &)));
+    connect (sch_directory_tree->selectionModel (), SIGNAL (selectionChanged (const QItemSelection &, const QItemSelection &)), this, SLOT (sch_selection_changed ()));
+
+    //  establish visibility according to "show all"
+    new_model->set_item_visibility (sch_directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
+
+  } else {
+
+    delete sch_directory_tree->model ();
+    sch_directory_tree->setModel (0);
+
+  }
+
+  if (lvsdb) {
+
+    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
+    NetlistBrowserModel *new_model = new NetlistBrowserModel (xref_directory_tree, lvsdb, &m_colorizer);
+
+    set_tree_model (xref_directory_tree, new_model);
+
+    connect (xref_directory_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (xref_current_index_changed (const QModelIndex &)));
+    connect (xref_directory_tree->selectionModel (), SIGNAL (selectionChanged (const QItemSelection &, const QItemSelection &)), this, SLOT (xref_selection_changed ()));
+
+    //  establish visibility according to "show all"
+    new_model->set_item_visibility (xref_directory_tree, m_show_all, false /*show warnings only with 'show all'*/);
+
+  } else {
+
+    delete xref_directory_tree->model ();
+    xref_directory_tree->setModel (0);
+
+  }
+
+  {
+    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
+    NetlistBrowserTreeModel *new_hierarchy_model = new NetlistBrowserTreeModel (nl_hierarchy_tree, l2ndb);
+    set_tree_model (nl_hierarchy_tree, new_hierarchy_model);
+
+    connect (nl_hierarchy_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (nl_current_tree_index_changed (const QModelIndex &)));
+  }
+
+  if (lvsdb) {
+
+    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
+    NetlistBrowserTreeModel *new_hierarchy_model = new NetlistBrowserTreeModel (sch_hierarchy_tree, lvsdb->reference_netlist ());
+    set_tree_model (sch_hierarchy_tree, new_hierarchy_model);
+
+    connect (sch_hierarchy_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (sch_current_tree_index_changed (const QModelIndex &)));
+
+  } else {
+
+    delete sch_hierarchy_tree->model ();
+    sch_hierarchy_tree->setModel (0);
+
+  }
+
+  if (lvsdb) {
+
+    //  NOTE: with the tree as the parent, the tree will take over ownership of the model
+    NetlistBrowserTreeModel *new_hierarchy_model = new NetlistBrowserTreeModel (xref_hierarchy_tree, lvsdb);
+    set_tree_model (xref_hierarchy_tree, new_hierarchy_model);
+
+    connect (xref_hierarchy_tree->selectionModel (), SIGNAL (currentChanged (const QModelIndex &, const QModelIndex &)), this, SLOT (xref_current_tree_index_changed (const QModelIndex &)));
+
+  } else {
+
+    delete xref_hierarchy_tree->model ();
+    xref_hierarchy_tree->setModel (0);
 
-    //  hide the status column if not needed
-    hierarchy_tree->header ()->setSectionHidden (1, new_hierarchy_model->status_column () < 0);
   }
 
   find_text->setText (QString ());
diff --git a/src/layui/layui/layNetlistBrowserPage.h b/src/layui/layui/layNetlistBrowserPage.h
index d70410cb7..2f2fc4cef 100644
--- a/src/layui/layui/layNetlistBrowserPage.h
+++ b/src/layui/layui/layNetlistBrowserPage.h
@@ -202,12 +202,17 @@ private slots:
   void anchor_clicked (const QString &url);
   void navigate_back ();
   void navigate_forward ();
-  void current_index_changed (const QModelIndex &index);
-  void current_tree_index_changed (const QModelIndex &index);
-  void selection_changed ();
+  void nl_current_index_changed (const QModelIndex &index);
+  void sch_current_index_changed (const QModelIndex &index);
+  void xref_current_index_changed (const QModelIndex &index);
+  void nl_current_tree_index_changed (const QModelIndex &index);
+  void sch_current_tree_index_changed (const QModelIndex &index);
+  void xref_current_tree_index_changed (const QModelIndex &index);
+  void nl_selection_changed ();
+  void sch_selection_changed ();
+  void xref_selection_changed ();
   void browse_color_for_net ();
   void select_color_for_net ();
-  void mode_changed ();
 
 protected:
   bool eventFilter (QObject *watched, QEvent *event);
@@ -262,6 +267,11 @@ private:
   bool produce_highlights_for_circuit (const db::Circuit *circuit, size_t &n_markers, const std::vector<db::DCplxTrans> &tv);
   void configure_marker (lay::Marker *marker, bool with_fill);
   void rerun_macro ();
+  void selection_changed (QTreeView *hierarchy_tree, QTreeView *directory_tree);
+  void current_tree_index_changed (QTreeView *hierarchy_tree, QTreeView *directory_tree, const QModelIndex &index);
+  void current_index_changed (QTreeView *hierarchy_tree, QTreeView *directory_tree, const QModelIndex &index);
+  QTreeView *current_hierarchy_tree ();
+  QTreeView *current_directory_tree ();
 
   void export_nets (const std::vector<const db::Net *> *nets);
 };
diff --git a/src/layui/layui/layNetlistBrowserTreeModel.cc b/src/layui/layui/layNetlistBrowserTreeModel.cc
index cc13503c0..4cf123eb2 100644
--- a/src/layui/layui/layNetlistBrowserTreeModel.cc
+++ b/src/layui/layui/layNetlistBrowserTreeModel.cc
@@ -122,6 +122,15 @@ static std::string search_string_from_names (const std::pair<const Obj *, const
 }
 
 
+NetlistBrowserTreeModel::NetlistBrowserTreeModel (QWidget *parent, db::Netlist *netlist)
+  : QAbstractItemModel (parent), mp_l2ndb (0), mp_lvsdb (0)
+{
+  mp_indexer.reset (new SingleIndexedNetlistModel (netlist));
+
+  m_object_column = 0;
+  m_status_column = -1;
+}
+
 NetlistBrowserTreeModel::NetlistBrowserTreeModel (QWidget *parent, db::LayoutToNetlist *l2ndb)
   : QAbstractItemModel (parent), mp_l2ndb (l2ndb), mp_lvsdb (0)
 {
diff --git a/src/layui/layui/layNetlistBrowserTreeModel.h b/src/layui/layui/layNetlistBrowserTreeModel.h
index 021694e8a..d875c6619 100644
--- a/src/layui/layui/layNetlistBrowserTreeModel.h
+++ b/src/layui/layui/layNetlistBrowserTreeModel.h
@@ -57,6 +57,7 @@ class LAYUI_PUBLIC NetlistBrowserTreeModel
 Q_OBJECT
 
 public:
+  NetlistBrowserTreeModel (QWidget *parent, db::Netlist *netlist);
   NetlistBrowserTreeModel (QWidget *parent, db::LayoutToNetlist *l2ndb);
   NetlistBrowserTreeModel (QWidget *parent, db::LayoutVsSchematic *lvsdb);
   ~NetlistBrowserTreeModel ();
diff --git a/src/layui/layui/layNetlistLogModel.cc b/src/layui/layui/layNetlistLogModel.cc
new file mode 100644
index 000000000..db146893e
--- /dev/null
+++ b/src/layui/layui/layNetlistLogModel.cc
@@ -0,0 +1,235 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#if defined(HAVE_QT)
+
+#include "layNetlistLogModel.h"
+
+#include <QIcon>
+#include <QFont>
+#include <QColor>
+#include <QWidget>
+
+namespace lay
+{
+
+namespace {
+
+  template <class Obj>
+  struct sort_single_by_name
+  {
+    inline bool operator() (const Obj *a, const Obj *b) const
+    {
+      if ((a != 0) != (b != 0)) {
+        return (a != 0) < (b != 0);
+      }
+      if (! a) {
+        return false;
+      } else {
+        return a->name () < b->name ();
+      }
+    }
+  };
+
+  template <class Obj, class SortBy>
+  struct sort_pair
+  {
+    bool operator() (const std::pair<const Obj *, const Obj *> &a, const std::pair<const Obj *, const Obj *> &b) const
+    {
+      SortBy order;
+      if (order (a.first, b.first)) {
+        return true;
+      } else if (order (b.first, a.first)) {
+        return false;
+      }
+      return order (a.second, b.second);
+    }
+  };
+
+  struct CircuitsCompareByName
+  {
+    bool operator() (const std::pair<std::pair<const db::Circuit *, const db::Circuit *>, const db::NetlistCrossReference::PerCircuitData::log_entries_type *> &a,
+                     const std::pair<std::pair<const db::Circuit *, const db::Circuit *>, const db::NetlistCrossReference::PerCircuitData::log_entries_type *> &b) const
+    {
+      return sort_pair<db::Circuit, sort_single_by_name<db::Circuit> > () (a.first, b.first);
+    }
+  };
+
+}
+
+const std::string var_sep (" \u21D4 ");
+
+NetlistLogModel::NetlistLogModel (QWidget *parent, const db::NetlistCrossReference *cross_ref)
+  : QAbstractItemModel (parent)
+{
+  tl_assert (cross_ref->netlist_a () != 0);
+  tl_assert (cross_ref->netlist_b () != 0);
+
+  if (! cross_ref->other_log_entries ().empty ()) {
+    m_circuits.push_back (std::make_pair (std::make_pair ((const db::Circuit *)0, (const db::Circuit *)0), &cross_ref->other_log_entries ()));
+  }
+
+  for (auto i = cross_ref->begin_circuits (); i != cross_ref->end_circuits (); ++i) {
+    const db::NetlistCrossReference::PerCircuitData *pcd = cross_ref->per_circuit_data_for (*i);
+    if (pcd && i->first && i->second && ! pcd->log_entries.empty ()) {
+      m_circuits.push_back (std::make_pair (*i, &pcd->log_entries));
+    }
+  }
+
+  std::sort (m_circuits.begin (), m_circuits.end (), CircuitsCompareByName ());
+}
+
+bool
+NetlistLogModel::hasChildren (const QModelIndex &parent) const
+{
+  if (! parent.isValid ()) {
+    return ! m_circuits.empty ();
+  } else {
+    return ! parent.parent ().isValid ();
+  }
+}
+
+QModelIndex
+NetlistLogModel::index (int row, int column, const QModelIndex &parent) const
+{
+  if (! parent.isValid ()) {
+    return createIndex (row, column, quintptr (0));
+  } else {
+    return createIndex (row, column, quintptr (& m_circuits [parent.row ()]));
+  }
+}
+
+QModelIndex
+NetlistLogModel::parent (const QModelIndex &child) const
+{
+  if (child.internalPointer () == (void *) 0) {
+    return QModelIndex ();
+  } else {
+    const circuit_entry *ce = (const circuit_entry *) child.internalPointer ();
+    return createIndex (int (ce - & m_circuits.front ()), child.column (), quintptr (0));
+  }
+}
+
+int
+NetlistLogModel::rowCount (const QModelIndex &parent) const
+{
+  if (! parent.isValid ()) {
+    return int (m_circuits.size ());
+  } else if (parent.parent ().isValid ()) {
+    return 0;
+  } else if (parent.row () >= 0 && parent.row () < int (m_circuits.size ())) {
+    return int (m_circuits [parent.row ()].second->size ());
+  } else {
+    return 0;
+  }
+}
+
+int
+NetlistLogModel::columnCount (const QModelIndex & /*parent*/) const
+{
+  return 1;
+}
+
+QVariant
+NetlistLogModel::data (const QModelIndex &index, int role) const
+{
+  const db::NetlistCrossReference::LogEntryData *le = 0;
+  if (index.parent ().isValid ()) {
+    const circuit_entry *ce = (const circuit_entry *) index.internalPointer ();
+    if (ce) {
+      le = &(*ce->second) [index.row ()];
+    }
+  }
+
+  if (role == Qt::DecorationRole) {
+
+    if (! le) {
+      //  ignore
+    } else if (le->severity == db::NetlistCrossReference::Error) {
+      return QIcon (QString::fromUtf8 (":/error_16.png"));
+    } else if (le->severity == db::NetlistCrossReference::Warning) {
+      return QIcon (QString::fromUtf8 (":/warn_16.png"));
+    } else if (le->severity == db::NetlistCrossReference::Info) {
+      return QIcon (QString::fromUtf8 (":/info_16.png"));
+    }
+
+  } else if (role == Qt::DisplayRole) {
+
+    if (index.parent ().isValid ()) {
+      if (le) {
+        return QVariant (tl::to_qstring (le->msg));
+      }
+    } else if (index.row () >= 0 && index.row () < int (m_circuits.size ())) {
+      const std::pair<const db::Circuit *, const db::Circuit *> &cp = m_circuits [index.row ()].first;
+      if (! cp.first || ! cp.second) {
+        return QVariant (tr ("General"));
+      } else if (cp.first->name () != cp.second->name ()) {
+        return QVariant (tr ("Circuit ") + tl::to_qstring (cp.first->name () + var_sep + cp.second->name ()));
+      } else {
+        return QVariant (tr ("Circuit ") + tl::to_qstring (cp.first->name ()));
+      }
+    }
+
+  } else if (role == Qt::FontRole) {
+
+    if (index.parent ().isValid ()) {
+      if (le && le->severity == db::NetlistCrossReference::Error) {
+        QFont f;
+        f.setBold (true);
+        return QVariant (f);
+      }
+    } else {
+      QFont f;
+      f.setBold (true);
+      return QVariant (f);
+    }
+
+  } else if (role == Qt::ForegroundRole) {
+
+    if (index.parent ().isValid ()) {
+      if (!le) {
+        //  ignore
+      } else if (le->severity == db::NetlistCrossReference::Error) {
+        return QColor (255, 0, 0);
+      } else if (le->severity == db::NetlistCrossReference::Warning) {
+        return QColor (0, 0, 255);
+      }
+    }
+
+  }
+
+  return QVariant ();
+}
+
+QVariant
+NetlistLogModel::headerData (int section, Qt::Orientation /*orientation*/, int role) const
+{
+  if (role == Qt::DisplayRole && section == 0) {
+    return QVariant (tr ("Message"));
+  } else {
+    return QVariant ();
+  }
+}
+
+}
+
+#endif
diff --git a/src/layui/layui/layNetlistLogModel.h b/src/layui/layui/layNetlistLogModel.h
new file mode 100644
index 000000000..4dcdde4da
--- /dev/null
+++ b/src/layui/layui/layNetlistLogModel.h
@@ -0,0 +1,62 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2022 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#if defined(HAVE_QT)
+
+#ifndef HDR_layNetlistCrossReference
+#define HDR_layNetlistCrossReference
+
+#include "layuiCommon.h"
+#include "dbNetlistCrossReference.h"
+
+#include <QAbstractItemModel>
+
+namespace lay
+{
+
+/**
+ *  @brief An indexed netlist model for the netlist cross-reference log
+ */
+class LAYUI_PUBLIC NetlistLogModel
+  : public QAbstractItemModel
+{
+public:
+  NetlistLogModel (QWidget *parent, const db::NetlistCrossReference *cross_ref);
+
+  virtual bool hasChildren (const QModelIndex &parent) const;
+  virtual QModelIndex index (int row, int column, const QModelIndex &parent) const;
+  virtual QModelIndex parent (const QModelIndex &child) const;
+  virtual int rowCount (const QModelIndex &parent) const;
+  virtual int columnCount (const QModelIndex &parent) const;
+  virtual QVariant data (const QModelIndex &index, int role) const;
+  virtual QVariant headerData (int section, Qt::Orientation orientation, int role) const;
+
+private:
+  typedef std::pair<std::pair<const db::Circuit *, const db::Circuit *>, const db::NetlistCrossReference::PerCircuitData::log_entries_type *> circuit_entry;
+  std::vector<circuit_entry> m_circuits;
+};
+
+}
+
+#endif
+
+#endif  //  defined(HAVE_QT)
diff --git a/src/layui/layui/layui.pro b/src/layui/layui/layui.pro
index cd2eec833..3c4fc15ee 100644
--- a/src/layui/layui/layui.pro
+++ b/src/layui/layui/layui.pro
@@ -126,6 +126,7 @@ SOURCES = \
   layNetlistBrowserPage.cc \
   layNetlistBrowserTreeModel.cc \
   layNetlistCrossReferenceModel.cc \
+  layNetlistLogModel.cc \
   layQtTools.cc \
   laySaveLayoutOptionsDialog.cc \
   laySelectCellViewForm.cc \
@@ -184,6 +185,7 @@ HEADERS = \
   layNetlistBrowserPage.h \
   layNetlistBrowserTreeModel.h \
   layNetlistCrossReferenceModel.h \
+  layNetlistLogModel.h \
   layQtTools.h \
   laySaveLayoutOptionsDialog.h \
   laySelectCellViewForm.h \
diff --git a/src/layview/layview/gsiDeclLayLayoutView_qt.cc b/src/layview/layview/gsiDeclLayLayoutView_qt.cc
index 8f104d62f..a5a95d6c3 100644
--- a/src/layview/layview/gsiDeclLayLayoutView_qt.cc
+++ b/src/layview/layview/gsiDeclLayLayoutView_qt.cc
@@ -116,6 +116,11 @@ Class<lay::LayoutView> decl_LayoutView (decl_LayoutViewBase, "lay", "LayoutView"
     "\n"
     "This method has been introduced in version 0.27\n"
   ) +
+  gsi::method ("widget", &lay::LayoutView::widget,
+    "@brief Gets the QWidget object for the layout view\n"
+    "\n"
+    "This method has been introduced in version 0.28 where LayoutView is no longer derived from QWidget directly.\n"
+  ) +
 #endif
   gsi::method ("current", &lay::LayoutView::current,
     "@brief Returns the current view\n"
diff --git a/src/lvs/lvs/built-in-macros/_lvs_engine.rb b/src/lvs/lvs/built-in-macros/_lvs_engine.rb
index 687f4868a..ae3807625 100644
--- a/src/lvs/lvs/built-in-macros/_lvs_engine.rb
+++ b/src/lvs/lvs/built-in-macros/_lvs_engine.rb
@@ -90,10 +90,16 @@ module LVS
  
     # %LVS%
     # @name compare
-    # @brief Compares the extracted netlist vs. the schematic
+    # @brief Compares the extracted netlist vs. the schematic netlist
     # @synopsis compare
     # See \Netter#compare for a description of that function.
  
+    # %LVS%
+    # @name no_lvs_hints
+    # @brief Disables LVS hints
+    # @synopsis no_lvs_hints
+    # See \Netter#no_lvs_hints for a description of that feature.
+
     # %LVS%
     # @name join_symmetric_nets
     # @brief Joins symmetric nets of selected circuits on the extracted netlist
@@ -216,7 +222,7 @@ module LVS
 
     %w(schematic compare split_gates join_symmetric_nets tolerance ignore_parameter enable_parameter disable_parameter 
        blank_circuit align same_nets same_nets! same_circuits same_device_classes equivalent_pins 
-       min_caps max_res max_depth max_branch_complexity consider_net_names lvs_data).each do |f|
+       min_caps max_res max_depth max_branch_complexity consider_net_names lvs_data no_lvs_hints).each do |f|
       eval <<"CODE"
         def #{f}(*args)
           _netter.#{f}(*args)
diff --git a/src/lvs/lvs/built-in-macros/_lvs_netter.rb b/src/lvs/lvs/built-in-macros/_lvs_netter.rb
index 8cc6ece00..a35af6944 100644
--- a/src/lvs/lvs/built-in-macros/_lvs_netter.rb
+++ b/src/lvs/lvs/built-in-macros/_lvs_netter.rb
@@ -499,6 +499,7 @@ CODE
     def _comparer_mini
 
       comparer = RBA::NetlistComparer::new
+      comparer.with_log = false
 
       # execute the configuration commands
       @comparer_miniconfig.each do |cc|
@@ -518,6 +519,17 @@ CODE
 
     end
       
+    # %LVS%
+    # @name no_lvs_hints
+    # @brief Disables LVS hints
+    # @synopsis no_lvs_hints
+    # LVS hints may be expensive to compute. Use this function to disable
+    # generation of LVS hints
+
+    def no_lvs_hints
+      @comparer_config << lambda { |comparer| comparer.with_log = false }
+    end
+
     # %LVS%
     # @name same_nets
     # @brief Establishes an equivalence between the nets
diff --git a/src/lym/lym/lymMacroCollection.cc b/src/lym/lym/lymMacroCollection.cc
index 5f9a1e12c..3316ef036 100644
--- a/src/lym/lym/lymMacroCollection.cc
+++ b/src/lym/lym/lymMacroCollection.cc
@@ -281,18 +281,18 @@ MacroCollection::add_folder (const std::string &description, const std::string &
       if (! force_create) {
 
         if (tl::verbosity () >= 20) {
-          tl::log << "Folder does not exist - skipping: " << fp;
+          tl::log << tl::to_string (tr ("Folder does not exist - skipping: ")) << fp;
         }
         return 0;
 
       } else {
 
         if (tl::verbosity () >= 20) {
-          tl::log << "Folder does not exist yet - trying to create it: " << fp;
+          tl::log << tl::to_string (tr ("Folder does not exist yet - trying to create it: ")) << fp;
         }
         if (! tl::mkpath (fp)) {
-          if (tl::verbosity () >= 10) {
-            tl::error << "Unable to create folder path: " << fp;
+          if (tl::verbosity () >= 20) {
+            tl::error << tl::to_string (tr ("Unable to create folder path: ")) << fp;
           }
           return 0;
         }
@@ -301,8 +301,8 @@ MacroCollection::add_folder (const std::string &description, const std::string &
     }
 
     if (! tl::is_dir (fp)) {
-      if (tl::verbosity () >= 10) {
-        tl::error << "Folder is not a directory: " << fp;
+      if (tl::verbosity () >= 20) {
+        tl::error << tl::to_string (tr ("Folder is not a directory - skipping: ")) << fp;
       }
       return 0;
     }
@@ -317,7 +317,7 @@ MacroCollection::add_folder (const std::string &description, const std::string &
     if (! readonly && ! tl::is_writable (fp)) {
       readonly = true;
       if (tl::verbosity () >= 20) {
-        tl::log << "Folder is read-only: " << fp;
+        tl::log << tl::to_string (tr ("Folder is read-only: ")) << fp;
       }
     }
 
@@ -368,7 +368,7 @@ void MacroCollection::scan ()
   std::string p = path ();
 
   if (tl::verbosity () >= 20) {
-    tl::info << "Scanning macro path " << p << " (readonly=" << m_readonly << ")";
+    tl::info << tl::to_string (tr ("Scanning macro path ")) << p << " (readonly=" << m_readonly << ")";
   }
 
   if (! p.empty () && p[0] == ':') {
@@ -501,7 +501,7 @@ MacroCollection::create_entry (const std::string &path)
     }
 
   } catch (tl::Exception &ex) {
-    tl::error << "Reading " << path << ": " << ex.msg ();
+    tl::error << tl::to_string (tr ("Reading ")) << path << ": " << ex.msg ();
   }
 }
 
@@ -578,7 +578,7 @@ void MacroCollection::save ()
 bool MacroCollection::rename (const std::string &n)
 {
   if (tl::verbosity () >= 20) {
-    tl::info << "Renaming macro folder " << path () << " to " << n;
+    tl::info << tl::to_string (tr ("Renaming macro folder ")) << path () << " to " << n;
   }
   begin_changes ();
   if (! tl::rename_file (path (), n)) {
diff --git a/src/plugins/streamers/cif/db_plugin/dbCIF.h b/src/plugins/streamers/cif/db_plugin/dbCIF.h
index acf233e34..023dc61ec 100644
--- a/src/plugins/streamers/cif/db_plugin/dbCIF.h
+++ b/src/plugins/streamers/cif/db_plugin/dbCIF.h
@@ -53,7 +53,7 @@ public:
   /**
    *  @brief Issue a warning with positional information
    */
-  virtual void warn (const std::string &txt) = 0;
+  virtual void warn (const std::string &txt, int warn_level = 1) = 0;
 };
 
 }
diff --git a/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc b/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc
index 1d935a0fe..0ac05f9de 100644
--- a/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc
+++ b/src/plugins/streamers/cif/db_plugin/dbCIFReader.cc
@@ -59,6 +59,8 @@ CIFReader::~CIFReader ()
 const LayerMap &
 CIFReader::read (db::Layout &layout, const db::LoadLayoutOptions &options)
 {
+  init (options);
+
   const db::CIFReaderOptions &specific_options = options.get_options<db::CIFReaderOptions> ();
   m_wire_mode = specific_options.wire_mode;
   m_dbu = specific_options.dbu;
@@ -88,8 +90,12 @@ CIFReader::error (const std::string &msg)
 }
 
 void 
-CIFReader::warn (const std::string &msg) 
+CIFReader::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   // TODO: compress
   tl::warn << msg 
            << tl::to_string (tr (" (line=")) << m_stream.line_number ()
diff --git a/src/plugins/streamers/cif/db_plugin/dbCIFReader.h b/src/plugins/streamers/cif/db_plugin/dbCIFReader.h
index 1b5240854..ba68c91df 100644
--- a/src/plugins/streamers/cif/db_plugin/dbCIFReader.h
+++ b/src/plugins/streamers/cif/db_plugin/dbCIFReader.h
@@ -129,7 +129,7 @@ public:
    *
    *  Reimplements CIFDiagnostics
    */
-  virtual void warn (const std::string &txt);
+  virtual void warn (const std::string &txt, int warn_level = 1);
 
 private:
   tl::TextInputStream m_stream;
diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXF.h b/src/plugins/streamers/dxf/db_plugin/dbDXF.h
index 13ad9c55f..3fb51cfc5 100644
--- a/src/plugins/streamers/dxf/db_plugin/dbDXF.h
+++ b/src/plugins/streamers/dxf/db_plugin/dbDXF.h
@@ -53,7 +53,7 @@ public:
   /**
    *  @brief Issue a warning with positional information
    */
-  virtual void warn (const std::string &txt) = 0;
+  virtual void warn (const std::string &txt, int warn_level = 1) = 0;
 };
 
 }
diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc
index d63a8b03f..fdb586b4a 100644
--- a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc
+++ b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc
@@ -316,6 +316,8 @@ DXFReader::determine_polyline_mode ()
 const LayerMap &
 DXFReader::read (db::Layout &layout, const db::LoadLayoutOptions &options)
 {
+  init (options);
+
   const db::DXFReaderOptions &specific_options = options.get_options<db::DXFReaderOptions> ();
 
   m_dbu = specific_options.dbu;
@@ -372,8 +374,12 @@ DXFReader::error (const std::string &msg)
 }
 
 void 
-DXFReader::warn (const std::string &msg) 
+DXFReader::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   // TODO: compress
   if (m_ascii) {
     tl::warn << msg 
@@ -2794,7 +2800,7 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
       }
 
     } else {
-      warn ("Entity " + entity_code + " not supported - ignored.");
+      warn ("Entity " + entity_code + " not supported - ignored.", 2);
       while ((g = read_group_code()) != 0) {
         skip_value (g);
       }
@@ -2978,7 +2984,7 @@ DXFReader::skip_value (int g)
     read_int32 ();
   } else {
     if (m_ascii) {
-      warn ("Unexpected group code: " + tl::to_string (g));
+      warn ("Unexpected group code: " + tl::to_string (g), 2);
     } else {
       error ("Unexpected group code: " + tl::to_string (g));
     }
@@ -2998,7 +3004,7 @@ DXFReader::read_group_code ()
       tl::Extractor ex (m_line.c_str ()); 
       int x = 0;
       if (! ex.try_read (x) || ! ex.at_end ()) {
-        warn ("Expected an ASCII integer value - line ignored");
+        warn ("Expected an ASCII integer value - line ignored", 2);
       } else {
         return x;
       }
diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h
index 1bc2ffe24..c753cf81a 100644
--- a/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h
+++ b/src/plugins/streamers/dxf/db_plugin/dbDXFReader.h
@@ -134,7 +134,7 @@ public:
    *
    *  Reimplements DXFDiagnostics
    */
-  virtual void warn (const std::string &txt);
+  virtual void warn (const std::string &txt, int warn_level = 1);
 
 private:
   struct VariantKey
diff --git a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.cc b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.cc
index 82aa1ec7f..a63c48869 100644
--- a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.cc
+++ b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.cc
@@ -302,8 +302,12 @@ GDS2ReaderText::error (const std::string &msg)
 }
 
 void 
-GDS2ReaderText::warn (const std::string &msg) 
+GDS2ReaderText::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   // TODO: compress
   tl::warn << msg 
            << tl::to_string (tr (", line number=")) << sStream.line_number()
diff --git a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h
index 8463ba5fc..65fe36857 100644
--- a/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h
+++ b/src/plugins/streamers/gds2/db_plugin/contrib/dbGDS2TextReader.h
@@ -101,7 +101,7 @@ private:
   void vConvertToXY(const std::string &_sArg);
 
   void error (const std::string &txt);
-  void warn (const std::string &txt);
+  void warn (const std::string &txt, int warn_level = 1);
 };
 
 }
diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.cc b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.cc
index c64725513..68b2a14f5 100644
--- a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.cc
+++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.cc
@@ -272,8 +272,12 @@ GDS2Reader::error (const std::string &msg)
 }
 
 void 
-GDS2Reader::warn (const std::string &msg) 
+GDS2Reader::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   // TODO: compress
   tl::warn << msg 
            << tl::to_string (tr (" (position=")) << m_stream.pos ()
diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h
index 8f965f222..bb32934b8 100644
--- a/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h
+++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2Reader.h
@@ -92,7 +92,7 @@ private:
   tl::AbsoluteProgress m_progress;
 
   virtual void error (const std::string &txt);
-  virtual void warn (const std::string &txt);
+  virtual void warn (const std::string &txt, int wl = 1);
 
   virtual std::string path () const;
   virtual const char *get_string ();
diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h
index 7f07a382b..c8632e720 100644
--- a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h
+++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.h
@@ -101,10 +101,10 @@ private:
   void finish_element ();
 
   virtual void common_reader_error (const std::string &msg) { error (msg); }
-  virtual void common_reader_warn (const std::string &msg) { warn (msg); }
+  virtual void common_reader_warn (const std::string &msg, int warn_level = 1) { warn (msg, warn_level); }
 
   virtual void error (const std::string &txt) = 0;
-  virtual void warn (const std::string &txt) = 0;
+  virtual void warn (const std::string &txt, int warn_level = 1) = 0;
 
   virtual std::string path () const = 0;
   virtual const char *get_string () = 0;
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
index 3368a0558..7694722dc 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
@@ -52,8 +52,9 @@ struct DEFImporterGroup
   std::vector<tl::GlobPattern> comp_match;
 };
 
-DEFImporter::DEFImporter ()
-  : LEFDEFImporter ()
+DEFImporter::DEFImporter (int warn_level)
+  : LEFDEFImporter (warn_level),
+    m_lef_importer (warn_level)
 {
   //  .. nothing yet ..
 }
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h
index 432bde8a1..d29be8c07 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h
+++ b/src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.h
@@ -48,7 +48,7 @@ public:
   /**
    *  @brief Default constructor
    */
-  DEFImporter ();
+  DEFImporter (int warn_level = 1);
 
   /**
    *  @brief Read the given LEF file prior to the DEF file
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
index 1eafacd05..3dbdcf266 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
@@ -914,10 +914,10 @@ LEFDEFReaderState::common_reader_error (const std::string &msg)
 }
 
 void
-LEFDEFReaderState::common_reader_warn (const std::string &msg)
+LEFDEFReaderState::common_reader_warn (const std::string &msg, int warn_level)
 {
   if (mp_importer) {
-    mp_importer->warn (msg);
+    mp_importer->warn (msg, warn_level);
   }
 }
 
@@ -1902,11 +1902,12 @@ LEFDEFReaderState::macro_cell (const std::string &mn, Layout &layout, const std:
 // -----------------------------------------------------------------------------------
 //  LEFDEFImporter implementation
 
-LEFDEFImporter::LEFDEFImporter ()
+LEFDEFImporter::LEFDEFImporter (int warn_level)
   : mp_progress (0), mp_stream (0), mp_reader_state (0),
     m_produce_net_props (false), m_net_prop_name_id (0),
     m_produce_inst_props (false), m_inst_prop_name_id (0),
-    m_produce_pin_props (false), m_pin_prop_name_id (0)
+    m_produce_pin_props (false), m_pin_prop_name_id (0),
+    m_warn_level (warn_level)
 {
   //  .. nothing yet ..
 }
@@ -1993,8 +1994,12 @@ LEFDEFImporter::error (const std::string &msg)
 }
 
 void 
-LEFDEFImporter::warn (const std::string &msg)
+LEFDEFImporter::warn (const std::string &msg, int wl)
 {
+  if (m_warn_level < wl) {
+    return;
+  }
+
   tl::warn << msg 
            << tl::to_string (tr (" (line=")) << mp_stream->line_number ()
            << tl::to_string (tr (", cell=")) << m_cellname
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h
index ed0af0a49..b91e3dc50 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.h
@@ -1342,7 +1342,7 @@ public:
 
 protected:
   virtual void common_reader_error (const std::string &msg);
-  virtual void common_reader_warn (const std::string &msg);
+  virtual void common_reader_warn (const std::string &msg, int warn_level = 1);
 
 private:
   /**
@@ -1490,7 +1490,7 @@ public:
   /**
    *  @brief Default constructor
    */
-  LEFDEFImporter ();
+  LEFDEFImporter (int warn_level);
 
   /**
    *  @brief Destructor
@@ -1520,7 +1520,7 @@ protected:
   /**
    *  @brief Issue a warning at the current location
    */
-  void warn (const std::string &msg);
+  void warn (const std::string &msg, int wl = 1);
 
   /**
    *  @brief Returns true if the reader is at the end of the file
@@ -1705,6 +1705,7 @@ private:
   bool m_produce_pin_props;
   db::property_names_id_type m_pin_prop_name_id;
   db::LEFDEFReaderOptions m_options;
+  int m_warn_level;
 
   const std::string &next ();
 };
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
index bf4d35314..90e376a2f 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFPlugin.cc
@@ -110,6 +110,8 @@ LEFDEFReader::format () const
 const db::LayerMap &
 LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &options, bool import_lef)
 {
+  init (options);
+
   const db::LEFDEFReaderOptions *lefdef_options = dynamic_cast<const db::LEFDEFReaderOptions *> (options.get_options (format ()));
   db::LEFDEFReaderOptions effective_options;
   if (lefdef_options) {
@@ -135,7 +137,7 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti
 
     tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading LEF file")));
 
-    db::LEFImporter importer;
+    db::LEFImporter importer (warn_level ());
 
     for (std::vector<std::string>::const_iterator l = effective_options.begin_lef_files (); l != effective_options.end_lef_files (); ++l) {
 
@@ -156,7 +158,7 @@ LEFDEFReader::read_lefdef (db::Layout &layout, const db::LoadLayoutOptions &opti
 
     tl::SelfTimer timer (tl::verbosity () >= 21, tl::to_string (tr ("Reading DEF file")));
 
-    DEFImporter importer;
+    DEFImporter importer (warn_level ());
 
     for (std::vector<std::string>::const_iterator l = effective_options.begin_lef_files (); l != effective_options.end_lef_files (); ++l) {
 
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
index 5f458d7c8..316870c7d 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.cc
@@ -33,7 +33,8 @@ namespace db
 // -----------------------------------------------------------------------------------
 //  LEFImporter implementation
 
-LEFImporter::LEFImporter ()
+LEFImporter::LEFImporter (int warn_level)
+  : LEFDEFImporter (warn_level)
 {
   //  .. nothing yet ..
 }
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h
index b638d775c..6be28fc5f 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFImporter.h
@@ -50,7 +50,7 @@ public:
   /**
    *  @brief Default constructor
    */
-  LEFImporter ();
+  LEFImporter (int warn_level);
 
   /**
    *  @brief Destructor
diff --git a/src/plugins/streamers/magic/db_plugin/dbMAG.h b/src/plugins/streamers/magic/db_plugin/dbMAG.h
index 1ed40cedf..94602e9e2 100644
--- a/src/plugins/streamers/magic/db_plugin/dbMAG.h
+++ b/src/plugins/streamers/magic/db_plugin/dbMAG.h
@@ -53,7 +53,7 @@ public:
   /**
    *  @brief Issue a warning with positional information
    */
-  virtual void warn (const std::string &txt) = 0;
+  virtual void warn (const std::string &txt, int warn_level) = 0;
 };
 
 }
diff --git a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc
index ff5ccbe27..5e03c7b35 100644
--- a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc
+++ b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc
@@ -72,6 +72,8 @@ MAGReader::read (db::Layout &layout)
 const LayerMap &
 MAGReader::read (db::Layout &layout, const db::LoadLayoutOptions &options)
 {
+  init (options);
+
   prepare_layers (layout);
 
   mp_klayout_tech = layout.technology ();
@@ -135,8 +137,12 @@ MAGReader::error (const std::string &msg)
 }
 
 void 
-MAGReader::warn (const std::string &msg)
+MAGReader::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   // TODO: compress
   tl::warn << msg 
            << tl::to_string (tr (" (line=")) << mp_current_stream->line_number ()
diff --git a/src/plugins/streamers/magic/db_plugin/dbMAGReader.h b/src/plugins/streamers/magic/db_plugin/dbMAGReader.h
index 1d9901732..10eeee840 100644
--- a/src/plugins/streamers/magic/db_plugin/dbMAGReader.h
+++ b/src/plugins/streamers/magic/db_plugin/dbMAGReader.h
@@ -131,7 +131,7 @@ public:
    *
    *  Reimplements MAGDiagnostics
    */
-  virtual void warn (const std::string &txt);
+  virtual void warn (const std::string &txt, int wl = 1);
 
 private:
   tl::TextInputStream m_stream;
diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASIS.h b/src/plugins/streamers/oasis/db_plugin/dbOASIS.h
index ec21e4937..f53ab29c2 100644
--- a/src/plugins/streamers/oasis/db_plugin/dbOASIS.h
+++ b/src/plugins/streamers/oasis/db_plugin/dbOASIS.h
@@ -55,7 +55,7 @@ public:
   /**
    *  @brief Issue a warning with positional information
    */
-  virtual void warn (const std::string &txt) = 0;
+  virtual void warn (const std::string &txt, int warn_level = 1) = 0;
 };
 
 class RepetitionBase;
diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc
index 9e732deb0..3480e0530 100644
--- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc
+++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.cc
@@ -489,8 +489,12 @@ OASISReader::error (const std::string &msg)
 }
 
 void 
-OASISReader::warn (const std::string &msg) 
+OASISReader::warn (const std::string &msg, int wl)
 {
+  if (warn_level () < wl) {
+    return;
+  }
+
   if (warnings_as_errors ()) {
     error (msg);
   } else {
diff --git a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h
index 3ebab974e..db08f8fb0 100644
--- a/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h
+++ b/src/plugins/streamers/oasis/db_plugin/dbOASISReader.h
@@ -99,10 +99,10 @@ protected:
    *
    *  Reimplements OASISDiagnostics
    */
-  virtual void warn (const std::string &txt);
+  virtual void warn (const std::string &txt, int warn_level = 1);
 
   virtual void common_reader_error (const std::string &msg) { error (msg); }
-  virtual void common_reader_warn (const std::string &msg) { warn (msg); }
+  virtual void common_reader_warn (const std::string &msg, int warn_level = 1) { warn (msg, warn_level); }
   virtual void init (const LoadLayoutOptions &options);
   virtual void do_read (db::Layout &layout);
 
diff --git a/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.cc b/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.cc
index 3067a94ff..68e0e43bb 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.cc
+++ b/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.cc
@@ -29,8 +29,8 @@ namespace db
 // ---------------------------------------------------------------------------------
 //  GerberDrillFileReader implementation
 
-GerberDrillFileReader::GerberDrillFileReader ()
-  : GerberFileReader ()
+GerberDrillFileReader::GerberDrillFileReader (int warn_level)
+  : GerberFileReader (warn_level)
 {
   init ();
 }
diff --git a/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.h b/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.h
index 749997ba1..24af0d39d 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.h
+++ b/src/plugins/streamers/pcb/db_plugin/dbGerberDrillFileReader.h
@@ -57,7 +57,7 @@ class GerberDrillFileReader
   : public GerberFileReader
 {
 public:
-  GerberDrillFileReader ();
+  GerberDrillFileReader (int warn_level);
   ~GerberDrillFileReader ();
 
   double um (double u)
diff --git a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.cc b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.cc
index 7f1a64142..f0cf8cb42 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.cc
+++ b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.cc
@@ -108,7 +108,7 @@ static std::string format_to_string (int l, int t, bool tz)
 // ---------------------------------------------------------------------------------------
 //  Implementation of GerberFile
 
-GerberFileReader::GerberFileReader ()
+GerberFileReader::GerberFileReader (int warn_level)
   : m_circle_points (64), m_digits_before (-1), m_digits_after (-1), m_omit_leading_zeroes (true),
     m_merge (false), m_inverse (false),
     m_dbu (0.001), m_unit (1000.0),
@@ -117,7 +117,8 @@ GerberFileReader::GerberFileReader ()
     m_orot (0.0), m_os (1.0), m_omx (false), m_omy (false),
     m_ep (true /*report progress*/),
     mp_layout (0), mp_top_cell (0), mp_stream (0),
-    m_progress (tl::to_string (tr ("Reading Gerber file")), 10000)
+    m_progress (tl::to_string (tr ("Reading Gerber file")), 10000),
+    m_warn_level (warn_level)
 {
   m_progress.set_format (tl::to_string (tr ("%.0f MB")));
   m_progress.set_unit (1024 * 1024);
@@ -196,8 +197,12 @@ GerberFileReader::format_string () const
 }
 
 void 
-GerberFileReader::warn (const std::string &warning)
+GerberFileReader::warn (const std::string &warning, int wl)
 {
+  if (m_warn_level < wl) {
+    return;
+  }
+
   tl::warn << warning << tl::to_string (tr (" in line ")) << mp_stream->line_number () << tl::to_string (tr (" (file ")) << mp_stream->source () << ")";
 }
 
@@ -541,18 +546,18 @@ GerberFile::layers_string () const
 //  Implementation of GerberImporter
 
 //  TODO: generalize this:
-std::vector <tl::shared_ptr<db::GerberFileReader> > get_readers ()
+std::vector <tl::shared_ptr<db::GerberFileReader> > get_readers (int warn_level)
 {
   std::vector <tl::shared_ptr<db::GerberFileReader> > readers;
-  readers.push_back (new db::GerberDrillFileReader ());
-  readers.push_back (new db::RS274XReader ());
+  readers.push_back (new db::GerberDrillFileReader (warn_level));
+  readers.push_back (new db::RS274XReader (warn_level));
   return readers;
 }
 
-GerberImporter::GerberImporter ()
+GerberImporter::GerberImporter (int warn_level)
   : m_cell_name ("PCB"), m_dbu (0.001), m_merge (false), 
     m_invert_negative_layers (false), m_border (5000), 
-    m_circle_points (64)
+    m_circle_points (64), m_warn_level (warn_level)
 {
   // .. nothing yet ..
 }
@@ -593,7 +598,7 @@ GerberImporter::scan (tl::TextInputStream &stream)
 {
   try {
 
-    std::vector <tl::shared_ptr<db::GerberFileReader> > readers = get_readers ();
+    std::vector <tl::shared_ptr<db::GerberFileReader> > readers = get_readers (0);
 
     //  determine the reader to use:
     for (std::vector <tl::shared_ptr<db::GerberFileReader> >::iterator r = readers.begin (); r != readers.end (); ++r) {
@@ -1010,7 +1015,7 @@ GerberImporter::do_read (db::Layout &layout, db::cell_index_type cell_index)
       tl::InputStream input_file (fp);
       tl::TextInputStream stream (input_file);
 
-      std::vector <tl::shared_ptr<db::GerberFileReader> > readers = get_readers ();
+      std::vector <tl::shared_ptr<db::GerberFileReader> > readers = get_readers (m_warn_level);
 
       //  determine the reader to use:
       db::GerberFileReader *reader = 0;
@@ -1115,14 +1120,16 @@ public:
     //  .. nothing yet ..
   }
 
-  virtual const db::LayerMap &read (db::Layout &layout, const db::LoadLayoutOptions & /*options*/)
-  {
-    //  TODO: too simple, should provide at least a layer filtering.
-    return read (layout);
-  }
-
   virtual const db::LayerMap &read (db::Layout &layout)
   {
+    return read (layout, db::LoadLayoutOptions ());
+  }
+
+  virtual const db::LayerMap &read (db::Layout &layout, const db::LoadLayoutOptions &options)
+  {
+    init (options);
+
+    //  TODO: too simple, should provide at least a layer filtering.
     db::GerberImportData data;
 
     std::string fn (m_stream.source ());
@@ -1132,7 +1139,7 @@ public:
 
     data.load (m_stream);
 
-    db::GerberImporter importer;
+    db::GerberImporter importer (warn_level ());
     data.setup_importer (&importer);
 
     importer.read (layout);
diff --git a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h
index 0fcf5ebc4..a5eb64494 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h
+++ b/src/plugins/streamers/pcb/db_plugin/dbGerberImporter.h
@@ -184,7 +184,7 @@ public:
   /**
    *  @brief Constructor
    */
-  GerberFileReader ();
+  GerberFileReader (int warn_level);
 
   /**
    *  @brief Destructor
@@ -405,7 +405,7 @@ protected:
   /**
    *  @brief Issue a warning
    */
-  void warn (const std::string &warning);
+  void warn (const std::string &warning, int warn_level = 1);
 
   /**
    *  @brief Issue a non-fatal error
@@ -597,6 +597,7 @@ private:
   tl::TextInputStream *mp_stream;
   tl::AbsoluteProgress m_progress;
   std::list<GraphicsState> m_graphics_stack;
+  int m_warn_level;
 
   void process_clear_polygons ();
   void swap_graphics_state (GraphicsState &state);
@@ -775,7 +776,7 @@ public:
   /**
    *  @brief Default constructor
    */
-  GerberImporter ();
+  GerberImporter (int warn_level = 1);
 
   /**
    *  @brief Scans the given file and extracts the metadata from it
@@ -1043,6 +1044,7 @@ private:
   bool m_invert_negative_layers;
   double m_border;
   int m_circle_points;
+  int m_warn_level;
   std::string m_format_string;
   std::string m_layer_styles;
   std::string m_dir;
diff --git a/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.cc b/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.cc
index ee8e4eec8..627e14da6 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.cc
+++ b/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.cc
@@ -30,8 +30,8 @@ namespace db
 // ---------------------------------------------------------------------------------
 //  RS274XReader implementation
 
-RS274XReader::RS274XReader ()
-  : GerberFileReader ()
+RS274XReader::RS274XReader (int warn_level)
+  : GerberFileReader (warn_level)
 {
   init ();
 }
diff --git a/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.h b/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.h
index 77db31ee0..22c834f57 100644
--- a/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.h
+++ b/src/plugins/streamers/pcb/db_plugin/dbRS274XReader.h
@@ -48,7 +48,7 @@ class RS274XReader
   : public GerberFileReader
 {
 public:
-  RS274XReader ();
+  RS274XReader (int warn_level);
   ~RS274XReader ();
 
   double um (double u)
diff --git a/src/pya/pya/pya.cc b/src/pya/pya/pya.cc
index 9a39c7704..15456c0dc 100644
--- a/src/pya/pya/pya.cc
+++ b/src/pya/pya/pya.cc
@@ -38,6 +38,7 @@
 #include "tlTimer.h"
 #include "tlFileUtils.h"
 #include "tlString.h"
+#include "tlInternational.h"
 
 #if defined(HAVE_QT)
 #  include <QCoreApplication>
@@ -51,6 +52,21 @@
 namespace pya
 {
 
+// --------------------------------------------------------------------------
+//  PythonError implementation
+
+PythonError::PythonError (const char *msg, const char *cls, const std::vector <tl::BacktraceElement> &backtrace)
+  : tl::ScriptError (msg, cls, backtrace)
+{ }
+
+PythonError::PythonError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector <tl::BacktraceElement> &backtrace)
+  : tl::ScriptError (msg, sourcefile, line, cls, backtrace)
+{ }
+
+PythonError::PythonError (const PythonError &d)
+  : tl::ScriptError (d)
+{ }
+
 // --------------------------------------------------------------------------
 
 /**
diff --git a/src/pya/pya/pya.h b/src/pya/pya/pya.h
index 6ca3c4ca7..fe1337b40 100644
--- a/src/pya/pya/pya.h
+++ b/src/pya/pya/pya.h
@@ -77,17 +77,9 @@ class PYA_PUBLIC PythonError
   : public tl::ScriptError
 {
 public:
-  PythonError (const char *msg, const char *cls, const std::vector <tl::BacktraceElement> &backtrace)
-    : tl::ScriptError (msg, cls, backtrace)
-  { }
-
-  PythonError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector <tl::BacktraceElement> &backtrace)
-    : tl::ScriptError (msg, sourcefile, line, cls, backtrace)
-  { }
-
-  PythonError (const PythonError &d)
-    : tl::ScriptError (d)
-  { }
+  PythonError (const char *msg, const char *cls, const std::vector <tl::BacktraceElement> &backtrace);
+  PythonError (const char *msg, const char *sourcefile, int line, const char *cls, const std::vector <tl::BacktraceElement> &backtrace);
+  PythonError (const PythonError &d);
 };
 
 class PythonModule;
diff --git a/src/pya/pya/pyaConvert.cc b/src/pya/pya/pyaConvert.cc
index 09fccb5e7..fb24e5732 100644
--- a/src/pya/pya/pyaConvert.cc
+++ b/src/pya/pya/pyaConvert.cc
@@ -52,7 +52,7 @@ long python2c_func<long>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return (long) (PyFloat_AsDouble (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to an integer")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to an integer")));
   }
 }
 
@@ -75,7 +75,7 @@ char python2c_func<char>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return char (PyFloat_AsDouble (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a character")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to a character")));
   }
 }
 
@@ -92,7 +92,7 @@ unsigned long python2c_func<unsigned long>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return (unsigned long) (PyFloat_AsDouble (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to an integer")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to an integer")));
   }
 }
 
@@ -109,7 +109,7 @@ long long python2c_func<long long>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return (long long) (PyFloat_AsDouble (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to an integer")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to an integer")));
   }
 }
 
@@ -126,7 +126,7 @@ unsigned long long python2c_func<unsigned long long>::operator() (PyObject *rval
   } else if (PyFloat_Check (rval)) {
     return (unsigned long long) (PyFloat_AsDouble (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to an integer")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to an integer")));
   }
 }
 
@@ -145,7 +145,7 @@ __int128 python2c_func<__int128>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return PyFloat_AsDouble (rval);
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to an integer")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to an integer")));
   }
 }
 #endif
@@ -163,7 +163,7 @@ double python2c_func<double>::operator() (PyObject *rval)
   } else if (PyFloat_Check (rval)) {
     return PyFloat_AsDouble (rval);
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a floating-point value")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to a floating-point value")));
   }
 }
 
@@ -188,7 +188,7 @@ std::string python2c_func<std::string>::operator() (PyObject *rval)
   } else if (PyByteArray_Check (rval)) {
     return std::string (PyByteArray_AsString (rval), PyByteArray_Size (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a string")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to a string")));
   }
 }
 
@@ -224,7 +224,7 @@ std::vector<char> python2c_func<std::vector<char> >::operator() (PyObject *rval)
     Py_ssize_t sz = PyByteArray_Size (rval);
     return std::vector<char> (cp, cp + sz);
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a byte array")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to a byte array")));
   }
 }
 
@@ -250,7 +250,7 @@ QByteArray python2c_func<QByteArray>::operator() (PyObject *rval)
   } else if (PyByteArray_Check (rval)) {
     return QByteArray (PyByteArray_AsString (rval), PyByteArray_Size (rval));
   } else {
-    throw tl::Exception (tl::to_string (tr ("Argument cannot be converted to a byte array")));
+    throw tl::Exception (tl::to_string (tr ("Value cannot be converted to a byte array")));
   }
 }
 
diff --git a/src/pya/pya/pyaModule.cc b/src/pya/pya/pyaModule.cc
index 5eff6c85d..fc4a7ee29 100644
--- a/src/pya/pya/pyaModule.cc
+++ b/src/pya/pya/pyaModule.cc
@@ -1175,6 +1175,51 @@ special_method_impl (gsi::MethodBase::special_method_type smt, PyObject *self, P
   }
 }
 
+static void
+push_args (gsi::SerialArgs &arglist, const gsi::MethodBase *meth, PyObject *args, tl::Heap &heap)
+{
+  int i = 0;
+  int argc = args == NULL ? 0 : int (PyTuple_Size (args));
+
+  try {
+
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); i < argc && a != meth->end_arguments (); ++a, ++i) {
+      push_arg (*a, arglist, PyTuple_GetItem (args, i), heap);
+    }
+
+  } catch (tl::Exception &ex) {
+
+    //  In case of an error upon write, pop the arguments to clean them up.
+    //  Without this, there is a risk to keep dead objects on the stack.
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
+      pop_arg (*a, arglist, 0, heap);
+    }
+
+    std::string msg;
+    const gsi::ArgSpecBase *arg_spec = meth->begin_arguments () [i].spec ();
+
+    if (arg_spec && ! arg_spec->name ().empty ()) {
+      msg = tl::sprintf (tl::to_string (tr ("%s for argument #%d ('%s')")), ex.basic_msg (), i + 1, arg_spec->name ());
+    } else {
+      msg = tl::sprintf (tl::to_string (tr ("%s for argument #%d")), ex.basic_msg (), i + 1);
+    }
+
+    ex.set_basic_msg (msg);
+    throw ex;
+
+  } catch (...) {
+
+    //  In case of an error upon write, pop the arguments to clean them up.
+    //  Without this, there is a risk to keep dead objects on the stack.
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
+      pop_arg (*a, arglist, 0, heap);
+    }
+
+    throw;
+
+  }
+}
+
 static PyObject *
 method_adaptor (int mid, PyObject *self, PyObject *args)
 {
@@ -1203,8 +1248,6 @@ method_adaptor (int mid, PyObject *self, PyObject *args)
         throw tl::Exception (tl::to_string (tr ("Cannot call non-const method on a const reference")));
       }
 
-      int argc = args == NULL ? 0 : int (PyTuple_Size (args));
-
       void *obj = 0;
       if (p) {
         //  Hint: this potentially instantiates the object
@@ -1214,24 +1257,7 @@ method_adaptor (int mid, PyObject *self, PyObject *args)
       gsi::SerialArgs retlist (meth->retsize ());
       gsi::SerialArgs arglist (meth->argsize ());
 
-      try {
-
-        int i = 0;
-        for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); i < argc && a != meth->end_arguments (); ++a, ++i) {
-          push_arg (*a, arglist, PyTuple_GetItem (args, i), heap);
-        }
-
-      } catch (...) {
-
-        //  In case of an error upon write, pop the arguments to clean them up.
-        //  Without this, there is a risk to keep dead objects on the stack.
-        for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
-          pop_arg (*a, arglist, 0, heap);
-        }
-
-        throw;
-
-      }
+      push_args (arglist, meth, args, heap);
 
       meth->call (obj, arglist, retlist);
 
@@ -1764,25 +1790,7 @@ method_init_adaptor (int mid, PyObject *self, PyObject *args)
       gsi::SerialArgs retlist (meth->retsize ());
       gsi::SerialArgs arglist (meth->argsize ());
 
-      try {
-
-        int i = 0;
-        int argc = args == NULL ? 0 : int (PyTuple_Size (args));
-        for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); i < argc && a != meth->end_arguments (); ++a, ++i) {
-          push_arg (*a, arglist, PyTuple_GetItem (args, i), heap);
-        }
-
-      } catch (...) {
-
-        //  In case of an error upon write, pop the arguments to clean them up.
-        //  Without this, there is a risk to keep dead objects on the stack.
-        for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
-          pop_arg (*a, arglist, 0, heap);
-        }
-
-        throw;
-
-      }
+      push_args (arglist, meth, args, heap);
 
       meth->call (0, arglist, retlist);
 
diff --git a/src/rba/rba/rba.cc b/src/rba/rba/rba.cc
index 2a0c1b8f5..051ddac7a 100644
--- a/src/rba/rba/rba.cc
+++ b/src/rba/rba/rba.cc
@@ -675,49 +675,78 @@ struct RubyInterpreterPrivateData
 // -------------------------------------------------------------------
 //  Ruby API 
 
+static void
+handle_exception (VALUE exc, bool first_chance)
+{
+  if (! first_chance) {
+    //  Re-raise the exception without blocking in the debugger
+    block_exceptions (true);
+  }
+
+  rb_exc_raise (exc);
+}
+
+static void
+handle_exception (const std::string &where, std::exception &ex)
+{
+  VALUE error_msg = rb_str_new2 ((std::string(ex.what ()) + tl::to_string (tr (" in ")) + where).c_str ());
+  VALUE args [1];
+  args [0] = error_msg;
+  VALUE exc = rb_class_new_instance(1, args, rb_eRuntimeError);
+  handle_exception (exc, true);
+}
+
+static void
+handle_exception (const std::string &where, tl::ExitException &ex)
+{
+  VALUE error_msg = rb_str_new2 ((ex.msg () + tl::to_string (tr (" in ")) + where).c_str ());
+  VALUE args [2];
+  args [0] = INT2NUM (ex.status ());
+  args [1] = error_msg;
+  VALUE exc = rb_class_new_instance (2, args, rb_eSystemExit);
+  handle_exception (exc, ex.first_chance ());
+}
+
+static void
+handle_exception (const std::string & /*where*/, rba::RubyError &ex)
+{
+  handle_exception (ex.exc (), ex.first_chance ());
+}
+
+static void
+handle_exception (const std::string &where, tl::Exception &ex)
+{
+  VALUE error_msg = rb_str_new2 ((ex.msg () + tl::to_string (tr (" in ")) + where).c_str ()); \
+  VALUE args [1];
+  args [0] = error_msg;
+  VALUE exc = rb_class_new_instance(1, args, rb_eRuntimeError);
+  handle_exception (exc, ex.first_chance ());
+}
+
+static void
+handle_exception (const std::string &where)
+{
+  VALUE error_msg = rb_str_new2 ((tl::to_string (tr ("Unspecific exception in ")) + where).c_str ()); \
+  VALUE args [1];
+  args [0] = error_msg;
+  VALUE exc = rb_class_new_instance(1, args, rb_eRuntimeError);
+  handle_exception (exc, true);
+}
+
 #define RBA_TRY \
-  VALUE __error_msg = Qnil; \
-  int __estatus = 0; \
-  VALUE __exc = Qnil; \
-  VALUE __eclass = Qnil; \
-  { \
-    try { 
+  try {
 
 #define RBA_CATCH(where) \
-    } catch (std::exception &ex) { \
-      __eclass = rb_eRuntimeError; \
-      __error_msg = rb_str_new2 ((std::string(ex.what ()) + tl::to_string (tr (" in ")) + (where)).c_str ()); \
-    } catch (tl::ExitException &ex) { \
-      __estatus = ex.status (); \
-      __eclass = rb_eSystemExit; \
-      __error_msg = rb_str_new2 ((ex.msg () + tl::to_string (tr (" in ")) + (where)).c_str ()); \
-    } catch (rba::RubyError &ex) { \
-      __eclass = rb_eRuntimeError; \
-      __exc = ex.exc (); \
-    } catch (tl::Exception &ex) { \
-      __eclass = rb_eRuntimeError; \
-      __error_msg = rb_str_new2 ((ex.msg () + tl::to_string (tr (" in ")) + (where)).c_str ()); \
-    } catch (...) { \
-      __eclass = rb_eRuntimeError; \
-      __error_msg = rb_str_new2 ((tl::to_string (tr ("Unspecific exception in ")) + (where)).c_str ()); \
-    } \
-  } \
-  if (__exc != Qnil) { \
-    /* Re-raise the exception without blocking in the debugger */ \
-    /* TODO: should not access private data */ \
-    RubyInterpreter::instance ()->d->block_exceptions = true; \
-    rb_exc_raise (__exc); \
-  } else if (__eclass == rb_eSystemExit) { \
-    /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \
-    VALUE args [2]; \
-    args [0] = INT2NUM (__estatus); \
-    args [1] = __error_msg; \
-    rb_exc_raise (rb_class_new_instance(2, args, __eclass)); \
-  } else if (__eclass != Qnil) { \
-    /* HINT: we do the rb_raise outside any destructor code - sometimes this longjmp seems not to work properly */ \
-    VALUE args [1]; \
-    args [0] = __error_msg; \
-    rb_exc_raise (rb_class_new_instance(1, args, __eclass)); \
+  } catch (std::exception &ex) { \
+    handle_exception ((where), ex); \
+  } catch (tl::ExitException &ex) { \
+    handle_exception ((where), ex); \
+  } catch (rba::RubyError &ex) { \
+    handle_exception ((where), ex); \
+  } catch (tl::Exception &ex) { \
+    handle_exception ((where), ex); \
+  } catch (...) { \
+    handle_exception ((where)); \
   }
 
 static VALUE
@@ -914,6 +943,52 @@ static gsi::ArgType create_void_type ()
 
 static gsi::ArgType s_void_type = create_void_type ();
 
+static void
+push_args (gsi::SerialArgs &arglist, const gsi::MethodBase *meth, VALUE *argv, int argc, tl::Heap &heap)
+{
+  int i = 0;
+
+  try {
+
+    VALUE *av = argv;
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && av < argv + argc; ++a, ++av, ++i) {
+      push_arg (*a, arglist, *av, heap);
+    }
+
+  } catch (tl::Exception &ex) {
+
+    //  In case of an error upon write, pop the arguments to clean them up.
+    //  Without this, there is a risk to keep dead objects on the stack.
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
+      pop_arg (*a, 0, arglist, heap);
+    }
+
+    const gsi::ArgSpecBase *arg_spec = meth->begin_arguments () [i].spec ();
+
+    std::string msg;
+    if (arg_spec && ! arg_spec->name ().empty ()) {
+      msg = tl::sprintf (tl::to_string (tr ("%s for argument #%d ('%s')")), ex.basic_msg (), i + 1, arg_spec->name ());
+    } else {
+      msg = tl::sprintf (tl::to_string (tr ("%s for argument #%d")), ex.basic_msg (), i + 1);
+    }
+
+    tl::Exception new_ex (msg);
+    new_ex.set_first_chance (ex.first_chance ());
+    throw new_ex;
+
+  } catch (...) {
+
+    //  In case of an error upon write, pop the arguments to clean them up.
+    //  Without this, there is a risk to keep dead objects on the stack.
+    for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
+      pop_arg (*a, 0, arglist, heap);
+    }
+
+    throw;
+
+  }
+}
+
 VALUE
 method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
 {
@@ -991,28 +1066,8 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
 
       {
         gsi::SerialArgs arglist (meth->argsize ());
-
-        try {
-
-          VALUE *av = argv;
-          for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && av < argv + argc; ++a, ++av) {
-            push_arg (*a, arglist, *av, heap);
-          }
-
-        } catch (...) {
-
-          //  In case of an error upon write, pop the arguments to clean them up.
-          //  Without this, there is a risk to keep dead objects on the stack.
-          for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
-            pop_arg (*a, 0, arglist, heap);
-          }
-
-          throw;
-
-        }
-
+        push_args (arglist, meth, argv, argc, heap);
         meth->call (0, arglist, retlist);
-
       }
 
       void *obj = retlist.read<void *> (heap);
@@ -1065,28 +1120,8 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
 
       {
         gsi::SerialArgs arglist (meth->argsize ());
-
-        try {
-
-          VALUE *av = argv;
-          for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && av < argv + argc; ++a, ++av) {
-            push_arg (*a, arglist, *av, heap);
-          }
-
-        } catch (...) {
-
-          //  In case of an error upon write, pop the arguments to clean them up.
-          //  Without this, there is a risk to keep dead objects on the stack.
-          for (gsi::MethodBase::argument_iterator a = meth->begin_arguments (); a != meth->end_arguments () && arglist; ++a) {
-            pop_arg (*a, 0, arglist, heap);
-          }
-
-          throw;
-
-        }
-
+        push_args (arglist, meth, argv, argc, heap);
         meth->call (obj, arglist, retlist);
-
       }
 
       if (meth->ret_type ().is_iter ()) {
@@ -2220,6 +2255,18 @@ RubyInterpreter::remove_console (gsi::Console *console)
   }
 }
 
+void
+RubyInterpreter::block_exceptions (bool f)
+{
+  d->block_exceptions = f;
+}
+
+bool
+RubyInterpreter::exceptions_blocked ()
+{
+  return d->block_exceptions;
+}
+
 static size_t
 prepare_trace (RubyInterpreter *interp, const char *fn)
 {
diff --git a/src/rba/rba/rba.h b/src/rba/rba/rba.h
index 1b204e186..fa4e39d3b 100644
--- a/src/rba/rba/rba.h
+++ b/src/rba/rba/rba.h
@@ -178,6 +178,16 @@ public:
    */
   void end_exec ();
 
+  /**
+   *  @brief Gets a flag indicating whether exceptions are blocked from being seen in the debugger
+   */
+  bool exceptions_blocked ();
+
+  /**
+   *  @brief Sets a flag indicating whether exceptions are blocked from being seen in the debugger
+   */
+  void block_exceptions (bool f);
+
   /**
    *  @brief Fetch the version string
    *
diff --git a/src/rba/rba/rbaUtils.cc b/src/rba/rba/rbaUtils.cc
index ccc071d2a..439fe97bb 100644
--- a/src/rba/rba/rbaUtils.cc
+++ b/src/rba/rba/rbaUtils.cc
@@ -112,6 +112,18 @@ rba_get_backtrace_from_array (VALUE backtrace, std::vector<tl::BacktraceElement>
   }
 }
 
+void
+block_exceptions (bool f)
+{
+  RubyInterpreter::instance ()->block_exceptions (f);
+}
+
+bool
+exceptions_blocked ()
+{
+  return RubyInterpreter::instance ()->exceptions_blocked ();
+}
+
 void
 rba_check_error ()
 {
diff --git a/src/rba/rba/rbaUtils.h b/src/rba/rba/rbaUtils.h
index bcb514351..436841b50 100644
--- a/src/rba/rba/rbaUtils.h
+++ b/src/rba/rba/rbaUtils.h
@@ -224,6 +224,9 @@ VALUE rba_f_eval_checked (int argc, VALUE *argv, VALUE self);
 void rba_yield_checked (VALUE value);
 VALUE rba_eval_string_in_context (const char *expr, const char *file, int line, int context);
 
+bool exceptions_blocked ();
+void block_exceptions (bool f);
+
 /**
  *  @brief A struct encapsulating the call parameters for a function
  */
@@ -261,7 +264,12 @@ R rba_safe_func (R (*f) (A), A arg)
   int error = 0;
 
   RUBY_BEGIN_EXEC
+    //  NOTE: we do not want exceptions to be seen in the debugger here - later they are rethrown after
+    //  being annotated. This is when we want to see them.
+    bool eb = exceptions_blocked ();
+    block_exceptions (true);
     rb_protect (&rba_safe_func_caller<R, A>, (VALUE) &cp, &error);
+    block_exceptions (eb);
   RUBY_END_EXEC
 
   if (error) {
diff --git a/src/tl/tl/tlException.cc b/src/tl/tl/tlException.cc
index 4c66acd1e..614836a03 100644
--- a/src/tl/tl/tlException.cc
+++ b/src/tl/tl/tlException.cc
@@ -31,6 +31,7 @@ namespace tl
 void
 Exception::init (const std::string &fmt, const std::vector<tl::Variant> &a)
 { 
+  m_first_chance = true;
   m_msg = tl::sprintf (fmt, a);
 }
 
diff --git a/src/tl/tl/tlException.h b/src/tl/tl/tlException.h
index 4c5181aef..ecde47d9b 100644
--- a/src/tl/tl/tlException.h
+++ b/src/tl/tl/tlException.h
@@ -46,7 +46,7 @@ class TL_PUBLIC Exception
 {
 public:
   Exception (const std::string &msg)
-    : m_msg (msg)
+    : m_msg (msg), m_first_chance (true)
   { }
 
   Exception (const std::string &fmt, const std::vector<tl::Variant> &a)
@@ -126,10 +126,46 @@ public:
 
   virtual ~Exception () { }
 
+  /**
+   *  @brief Gets the full message text
+   *  Derived classes may dynamically build error messages.
+   *  "basic_msg" is the core message. Derived classes may
+   *  ignore the core message or modify the latter to build
+   *  the full message.
+   */
   virtual std::string msg () const { return m_msg; }
 
+  /**
+   *  @brief Gets the basic message
+   *  The basic message is the actual error text. Derived classes
+   *  may decide to deliver a more elaborate version of the message
+   *  through "msg".
+   */
+  std::string basic_msg () const { return m_msg; }
+
+  /**
+   *  @brief Exchanges the basic message
+   */
+  void set_basic_msg (const std::string &msg) { m_msg = msg; }
+
+  /**
+   *  @brief Sets a flag indicating whether this exception is a first-chance one
+   *
+   *  "first chance" means it has not been seen in the debugger.
+   *  Set this flag to false to indicate that it already got seen.
+   *  By default the flag is true, indicating it has not been handled
+   *  by the debugger.
+   */
+  void set_first_chance (bool f) { m_first_chance = f; }
+
+  /**
+   *  @brief Gets a flag indicating that is this a first-chance exception
+   */
+  bool first_chance () const { return m_first_chance; }
+
 private:
   std::string m_msg;
+  bool m_first_chance;
   void init (const std::string &fmt, const std::vector<tl::Variant> &a);
 };
 
diff --git a/src/tl/tl/tlFileUtils.cc b/src/tl/tl/tlFileUtils.cc
index 19cce3c2e..a084c6b51 100644
--- a/src/tl/tl/tlFileUtils.cc
+++ b/src/tl/tl/tlFileUtils.cc
@@ -27,6 +27,9 @@
 
 #include <cctype>
 
+// Use this define to print debug output
+// #define FILE_UTILS_VERBOSE
+
 #if defined(_MSC_VER)
 
 #  include <sys/types.h>
@@ -448,7 +451,9 @@ bool mkpath (const std::string &p)
     front += parts[i++];
     if (! file_exists (front)) {
       if (! mkdir (front)) {
+#if defined(FILE_UTILS_VERBOSE)
         tl::error << tr ("Unable to create directory: ") << front;
+#endif
         return false;
       }
     }
@@ -511,13 +516,17 @@ bool rm_dir_recursive (const std::string &p)
   for (std::vector<std::string>::const_iterator e = entries.begin (); e != entries.end (); ++e) {
     std::string tc = tl::combine_path (path, *e);
     if (! rm_file (tc)) {
+#if defined(FILE_UTILS_VERBOSE)
       tl::error << tr ("Unable to remove file: ") << tc;
+#endif
       return false;
     }
   }
 
   if (! rm_dir (path)) {
+#if defined(FILE_UTILS_VERBOSE)
     tl::error << tr ("Unable to remove directory: ") << path;
+#endif
     return false;
   }
 
@@ -535,7 +544,9 @@ cp_dir_recursive (const std::string &source, const std::string &target)
   for (std::vector<std::string>::const_iterator e = entries.begin (); e != entries.end (); ++e) {
     std::string tc = tl::combine_path (path_to, *e);
     if (! mkpath (tc)) {
+#if defined(FILE_UTILS_VERBOSE)
       tl::error << tr ("Unable to create target directory: ") << tc;
+#endif
       return false;
     }
     if (! cp_dir_recursive (tl::combine_path (path, *e), tc)) {
@@ -558,8 +569,10 @@ cp_dir_recursive (const std::string &source, const std::string &target)
       is.copy_to (os);
 
     } catch (tl::Exception &ex) {
+#if defined(FILE_UTILS_VERBOSE)
       tl::error << tr ("Unable to copy file ") << tl::combine_path (path_to, *e) << tr (" to ") << tl::combine_path (path, *e)
                 << tr ("(Error ") << ex.msg () << ")";
+#endif
       return false;
     }
 
diff --git a/src/tl/tl/tlScriptError.cc b/src/tl/tl/tlScriptError.cc
index 39a985833..9444db1d3 100644
--- a/src/tl/tl/tlScriptError.cc
+++ b/src/tl/tl/tlScriptError.cc
@@ -97,12 +97,6 @@ ScriptError::ScriptError (const ScriptError &d)
   //  .. nothing yet ..
 }
 
-std::string
-ScriptError::basic_msg () const
-{
-  return tl::Exception::msg ();
-}
-
 std::string
 ScriptError::msg () const
 {
diff --git a/src/tl/tl/tlScriptError.h b/src/tl/tl/tlScriptError.h
index 937ce9d23..3e00a4f60 100644
--- a/src/tl/tl/tlScriptError.h
+++ b/src/tl/tl/tlScriptError.h
@@ -128,8 +128,6 @@ public:
 
   virtual std::string msg () const;
 
-  std::string basic_msg () const;
-
 private:
   std::string m_sourcefile;
   int m_line;
@@ -150,8 +148,19 @@ class TL_PUBLIC ExitException
   : public tl::Exception
 {
 public:
-  ExitException () : tl::Exception ("exit"), m_status (1) { }
-  ExitException (int status) : tl::Exception ("exit"), m_status (status) { }
+  ExitException ()
+    : tl::Exception ("exit"), m_status (1)
+  {
+    //  do not catch in debugger
+    set_first_chance (false);
+  }
+
+  ExitException (int status)
+    : tl::Exception ("exit"), m_status (status)
+  {
+    //  do not catch in debugger
+    set_first_chance (false);
+  }
 
   int status() const { return m_status; }
 
diff --git a/testdata/algo/l2n_reader_5.l2n b/testdata/algo/l2n_reader_5.l2n
new file mode 100644
index 000000000..5513bfa01
--- /dev/null
+++ b/testdata/algo/l2n_reader_5.l2n
@@ -0,0 +1,452 @@
+#%l2n-klayout
+W(RINGO)
+U(0.001)
+L($3)
+L($9)
+L($4)
+L($5)
+L($6)
+L($10)
+L($7)
+L($8)
+L($11)
+L($1)
+L($2)
+C($3 $3 $9 $5)
+C($9 $3)
+C($4 $4 $6 $1 $2)
+C($5 $3 $5 $6)
+C($6 $4 $5 $6 $10 $7)
+C($10 $6)
+C($7 $6 $7 $8)
+C($8 $7 $8 $11)
+C($11 $8)
+C($1 $4 $1)
+C($2 $4 $2)
+D(D$PMOS PMOS
+ kk(1 "hello" jj(1 5 7))   # invalid
+ T(S
+  R($1 -650 -475 -125 475)
+ )
+ T(G
+  R($3 -125 -475 125 475)
+ )
+ kk   # invalid
+ T(D
+  R($1 125 -475 675 475)
+ )
+ kk ( 1 "hello" jj 2.5 * (1 5 "hello") )   # invalid
+)
+D(D$PMOS$1 PMOS
+ T(S
+  R($1 -675 -475 -125 475)
+ )
+ T(G
+  R($3 -125 -475 125 475)
+ )
+ T(D
+  R($1 125 -475 650 475)
+ )
+)
+D(D$NMOS NMOS
+ T(S
+  R($2 -650 -475 -125 475)
+ )
+ T(G
+  R($3 -125 -475 125 475)
+ )
+ T(D
+  R($2 125 -475 675 475)
+ )
+)
+D(D$NMOS$1 NMOS
+ T(S
+  R($2 -675 -475 -125 475)
+ )
+ T(G
+  R($3 -125 -475 125 475)
+ )
+ T(D
+  R($2 125 -475 650 475)
+ )
+)
+X(INV2
+ kk   # invalid
+ N(1 I(NIN)
+ kk   # invalid
+  R($3 -525 -250 -275 2250)
+  R($3 -1700 1620 -400 1980)
+  R($3 -525 -800 -275 800)
+  R($3 -525 2000 -275 3600)
+  R($9 -801 1799 -799 1801)
+  R($5 -1630 1690 -1410 1910)
+ kk   # invalid
+ )
+ N(2
+  R($3 275 -250 525 2250)
+  R($3 220 820 580 1180)
+  R($3 275 2000 525 3600)
+  R($3 275 -800 525 800)
+  R($4 -910 2490 -690 2710)
+  R($4 -910 2890 -690 3110)
+  R($4 -910 -310 -690 -90)
+  R($4 -910 90 -690 310)
+  R($5 290 890 510 1110)
+  R($6 -800 820 580 1180)
+  R($6 -980 -420 -620 2420)
+  R($6 -980 2420 -620 3180)
+  R($6 -980 -380 -620 380)
+  R($1 -1050 2325 -525 3275)
+  R($2 -1050 -475 -525 475)
+ )
+ N(3 I(NOUT)
+  R($4 690 2890 910 3110)
+  R($4 690 2490 910 2710)
+  R($4 690 90 910 310)
+  R($4 690 -310 910 -90)
+  Q($6 800 20 * 380 940 * * 1620 620 * * 2420 980 * * 1980 1300 * * 20)
+  R($6 620 2420 980 3180)
+  R($6 620 -380 980 380)
+  R($10 799 1799 801 1801)
+  R($1 525 2325 1050 3275)
+  R($2 525 -475 1050 475)
+ )
+ kk   # invalid
+ N(4
+  R($4 -110 -310 110 -90)
+  R($4 -110 90 110 310)
+  R($4 -110 90 110 310)
+  R($4 -110 -310 110 -90)
+  R($6 -180 -380 180 380)
+  R($6 -180 -380 180 380)
+  R($7 -125 -325 125 -75)
+  R($7 -125 75 125 325)
+  R($8 -1400 -450 1400 450)
+  R($2 -275 -475 275 475)
+ )
+ N(5
+  R($4 -110 2490 110 2710)
+  R($4 -110 2890 110 3110)
+  R($4 -110 2890 110 3110)
+  R($4 -110 2490 110 2710)
+  R($6 -180 2420 180 3180)
+  R($6 -180 2420 180 3180)
+  R($7 -125 2475 125 2725)
+  R($7 -125 2875 125 3125)
+  R($8 -1400 2350 1400 3250)
+  R($1 -275 2325 275 3275)
+ )
+ kk   # invalid
+ P(1 I(IN))
+ P(2)
+ P(3 I(OUT) kk)
+ P(4)
+ P(5)
+ D(1 D$PMOS
+  Y(-400 2800)
+  E(L 0.25)
+  E(W 0.95)
+  E(AS 0.49875)
+  E(AD 0.26125)
+  E(PS 2.95)
+  E(PD 1.5)
+  T(S 2)
+  T(G 1)
+  T(D 5)
+ kk   # invalid
+ )
+ D(2 D$PMOS$1
+  Y(400 2800)
+  E(L 0.25)
+  E(W 0.95)
+  E(AS 0.26125)
+  E(AD 0.49875)
+  E(PS 1.5)
+  E(PD 2.95)
+  T(S 5)
+  T(G 2)
+  T(D 3)
+ )
+ D(3 D$NMOS
+  Y(-400 0)
+  E(L 0.25)
+  E(W 0.95)
+  E(AS 0.49875)
+  E(AD 0.26125)
+  E(PS 2.95)
+  E(PD 1.5)
+  T(S 2)
+  T(G 1)
+  T(D 4)
+ )
+ D(4 D$NMOS$1
+  Y(400 0)
+  E(L 0.25)
+  E(W 0.95)
+  E(AS 0.26125)
+  E(AD 0.49875)
+  E(PS 1.5)
+  E(PD 2.95)
+  T(S 4)
+  T(G 2)
+  T(D 3)
+ )
+)
+X(RINGO
+ N(1 I(FB)
+ kk   # invalid
+  R($4 22850 2490 23070 2710)
+  R($4 22850 2890 23070 3110)
+  R($4 22850 -310 23070 -90)
+  R($4 22850 90 23070 310)
+  R($6 -1700 1620 -1340 1980)
+  R($7 -1645 1675 -1395 1925)
+  R($7 22835 1675 23085 1925)
+  R($8 -1720 1600 23160 2000)
+  R($11 -1 1799 1 1801)
+ )
+ N(2 I(VSS)
+  R($4 2530 -310 2750 -90)
+  R($4 2530 90 2750 310)
+  R($4 2530 90 2750 310)
+  R($4 2530 -310 2750 -90)
+  R($4 -110 -310 110 -90)
+  R($4 -110 90 110 310)
+  R($4 -110 90 110 310)
+  R($4 -110 -310 110 -90)
+  R($4 5170 -310 5390 -90)
+  R($4 5170 90 5390 310)
+  R($4 5170 90 5390 310)
+  R($4 5170 -310 5390 -90)
+  R($4 7810 -310 8030 -90)
+  R($4 7810 90 8030 310)
+  R($4 7810 90 8030 310)
+  R($4 7810 -310 8030 -90)
+  R($4 10450 -310 10670 -90)
+  R($4 10450 90 10670 310)
+  R($4 10450 90 10670 310)
+  R($4 10450 -310 10670 -90)
+  R($4 13090 -310 13310 -90)
+  R($4 13090 90 13310 310)
+  R($4 13090 90 13310 310)
+  R($4 13090 -310 13310 -90)
+  R($4 15730 -310 15950 -90)
+  R($4 15730 90 15950 310)
+  R($4 15730 90 15950 310)
+  R($4 15730 -310 15950 -90)
+  R($4 18370 -310 18590 -90)
+  R($4 18370 90 18590 310)
+  R($4 18370 90 18590 310)
+  R($4 18370 -310 18590 -90)
+  R($4 21010 -310 21230 -90)
+  R($4 21010 90 21230 310)
+  R($4 21010 90 21230 310)
+  R($4 21010 -310 21230 -90)
+  R($4 23650 -310 23870 -90)
+  R($4 23650 90 23870 310)
+  R($4 23650 90 23870 310)
+  R($4 23650 -310 23870 -90)
+  R($6 2460 -380 2820 380)
+  R($6 2460 -380 2820 380)
+  R($6 -180 -380 180 380)
+  R($6 -180 -380 180 380)
+  R($6 5100 -380 5460 380)
+  R($6 5100 -380 5460 380)
+  R($6 7740 -380 8100 380)
+  R($6 7740 -380 8100 380)
+  R($6 10380 -380 10740 380)
+  R($6 10380 -380 10740 380)
+  R($6 13020 -380 13380 380)
+  R($6 13020 -380 13380 380)
+  R($6 15660 -380 16020 380)
+  R($6 15660 -380 16020 380)
+  R($6 18300 -380 18660 380)
+  R($6 18300 -380 18660 380)
+  R($6 20940 -380 21300 380)
+ kk   # invalid
+  R($6 20940 -380 21300 380)
+  R($6 23580 -380 23940 380)
+  R($6 23580 -380 23940 380)
+  R($11 -1 -1 1 1)
+ )
+ N(3 I(VDD)
+  R($4 2530 2490 2750 2710)
+  R($4 2530 2890 2750 3110)
+  R($4 2530 2890 2750 3110)
+  R($4 2530 2490 2750 2710)
+  R($4 -110 2490 110 2710)
+  R($4 -110 2890 110 3110)
+  R($4 -110 2890 110 3110)
+  R($4 -110 2490 110 2710)
+  R($4 5170 2490 5390 2710)
+  R($4 5170 2890 5390 3110)
+  R($4 5170 2890 5390 3110)
+  R($4 5170 2490 5390 2710)
+  R($4 7810 2490 8030 2710)
+  R($4 7810 2890 8030 3110)
+  R($4 7810 2890 8030 3110)
+  R($4 7810 2490 8030 2710)
+  R($4 10450 2490 10670 2710)
+  R($4 10450 2890 10670 3110)
+  R($4 10450 2890 10670 3110)
+  R($4 10450 2490 10670 2710)
+  R($4 13090 2490 13310 2710)
+  R($4 13090 2890 13310 3110)
+  R($4 13090 2890 13310 3110)
+  R($4 13090 2490 13310 2710)
+  R($4 15730 2490 15950 2710)
+  R($4 15730 2890 15950 3110)
+  R($4 15730 2890 15950 3110)
+  R($4 15730 2490 15950 2710)
+  R($4 18370 2490 18590 2710)
+  R($4 18370 2890 18590 3110)
+  R($4 18370 2890 18590 3110)
+  R($4 18370 2490 18590 2710)
+  R($4 21010 2490 21230 2710)
+  R($4 21010 2890 21230 3110)
+  R($4 21010 2890 21230 3110)
+  R($4 21010 2490 21230 2710)
+  R($4 23650 2490 23870 2710)
+  R($4 23650 2890 23870 3110)
+  R($4 23650 2890 23870 3110)
+  R($4 23650 2490 23870 2710)
+  R($6 2460 2420 2820 3180)
+  R($6 2460 2420 2820 3180)
+  R($6 -180 2420 180 3180)
+  R($6 -180 2420 180 3180)
+  R($6 5100 2420 5460 3180)
+  R($6 5100 2420 5460 3180)
+  R($6 7740 2420 8100 3180)
+  R($6 7740 2420 8100 3180)
+  R($6 10380 2420 10740 3180)
+  R($6 10380 2420 10740 3180)
+  R($6 13020 2420 13380 3180)
+  R($6 13020 2420 13380 3180)
+  R($6 15660 2420 16020 3180)
+  R($6 15660 2420 16020 3180)
+  R($6 18300 2420 18660 3180)
+  R($6 18300 2420 18660 3180)
+  R($6 20940 2420 21300 3180)
+  R($6 20940 2420 21300 3180)
+  R($6 23580 2420 23940 3180)
+  R($6 23580 2420 23940 3180)
+  R($11 -1 2799 1 2801)
+ )
+ N(4
+  R($4 690 2890 910 3110)
+  R($4 690 2490 910 2710)
+  R($4 690 90 910 310)
+  R($4 690 -310 910 -90)
+ )
+ N(5
+  R($4 21810 2890 22030 3110)
+  R($4 21810 2490 22030 2710)
+  R($4 21810 90 22030 310)
+  R($4 21810 -310 22030 -90)
+ )
+ N(6
+  R($4 19170 2890 19390 3110)
+  R($4 19170 2490 19390 2710)
+  R($4 19170 90 19390 310)
+  R($4 19170 -310 19390 -90)
+ )
+ N(7
+  R($4 16530 2890 16750 3110)
+  R($4 16530 2490 16750 2710)
+  R($4 16530 90 16750 310)
+  R($4 16530 -310 16750 -90)
+ )
+ N(8
+  R($4 13890 2890 14110 3110)
+  R($4 13890 2490 14110 2710)
+  R($4 13890 90 14110 310)
+  R($4 13890 -310 14110 -90)
+ )
+ N(9
+  R($4 11250 2890 11470 3110)
+  R($4 11250 2490 11470 2710)
+  R($4 11250 90 11470 310)
+  R($4 11250 -310 11470 -90)
+ )
+ N(10
+  R($4 8610 2890 8830 3110)
+  R($4 8610 2490 8830 2710)
+  R($4 8610 90 8830 310)
+  R($4 8610 -310 8830 -90)
+ )
+ N(11
+  R($4 5970 2890 6190 3110)
+  R($4 5970 2490 6190 2710)
+  R($4 5970 90 6190 310)
+  R($4 5970 -310 6190 -90)
+ )
+ N(12
+  R($4 3330 2890 3550 3110)
+  R($4 3330 2490 3550 2710)
+  R($4 3330 90 3550 310)
+  R($4 3330 -310 3550 -90)
+ kk   # invalid
+ )
+ X(1 INV2 Y(23760 0)
+ kk   # invalid
+  P(0 5)
+  P(1 1)
+  P(3 2)
+  P(4 3)
+ kk   # invalid
+ )
+ X(2 INV2 Y(0 0)
+  P(0 1)
+  P(2 4)
+  P(3 2)
+  P(4 3)
+ )
+ X(3 INV2 Y(2640 0)
+  P(0 4)
+  P(2 12)
+  P(3 2)
+  P(4 3)
+ )
+ X(4 INV2 Y(5280 0)
+  P(0 12)
+  P(2 11)
+  P(3 2)
+  P(4 3)
+ )
+ X(5 INV2 Y(7920 0)
+  P(0 11)
+  P(2 10)
+  P(3 2)
+  P(4 3)
+ )
+ X(6 INV2 Y(10560 0)
+  P(0 10)
+  P(2 9)
+  P(3 2)
+  P(4 3)
+ )
+ X(7 INV2 Y(13200 0)
+  P(0 9)
+  P(2 8)
+  P(3 2)
+  P(4 3)
+ )
+ X(8 INV2 Y(15840 0)
+  P(0 8)
+  P(2 7)
+  P(3 2)
+  P(4 3)
+ )
+ X(9 INV2 Y(18480 0)
+  P(0 7)
+  P(2 6)
+  P(3 2)
+  P(4 3)
+ )
+ X(10 INV2 Y(21120 0)
+  P(0 6)
+  P(2 5)
+  P(3 2)
+  P(4 3)
+ )
+)
diff --git a/testdata/algo/l2n_reader_au_5.l2n b/testdata/algo/l2n_reader_au_5.l2n
new file mode 100644
index 000000000..8b514b029
--- /dev/null
+++ b/testdata/algo/l2n_reader_au_5.l2n
@@ -0,0 +1,487 @@
+#%l2n-klayout
+top(RINGO)
+unit(0.001)
+
+# Layer section
+# This section lists the mask layers (drawing or derived) and their connections.
+
+# Mask layers
+layer($3)
+layer($9)
+layer($4)
+layer($5)
+layer($6)
+layer($10)
+layer($7)
+layer($8)
+layer($11)
+layer($1)
+layer($2)
+
+# Mask layer connectivity
+connect($3 $3 $9 $5)
+connect($9 $3)
+connect($4 $4 $6 $1 $2)
+connect($5 $3 $5 $6)
+connect($6 $4 $5 $6 $10 $7)
+connect($10 $6)
+connect($7 $6 $7 $8)
+connect($8 $7 $8 $11)
+connect($11 $8)
+connect($1 $4 $1)
+connect($2 $4 $2)
+
+# Device class section
+class(PMOS ''
+ param(L 1 0)
+ param(W 1 0)
+ param(AS 1 0)
+ param(AD 1 0)
+ param(PS 1 0)
+ param(PD 1 0)
+ terminal(S)
+ terminal(G)
+ terminal(D)
+)
+class(NMOS ''
+ param(L 1 0)
+ param(W 1 0)
+ param(AS 1 0)
+ param(AD 1 0)
+ param(PS 1 0)
+ param(PD 1 0)
+ terminal(S)
+ terminal(G)
+ terminal(D)
+)
+
+# Device abstracts section
+# Device abstracts list the pin shapes of the devices.
+device(D$PMOS PMOS
+ terminal(S
+  rect($1 (-650 -475) (525 950))
+ )
+ terminal(G
+  rect($3 (-125 -475) (250 950))
+ )
+ terminal(D
+  rect($1 (125 -475) (550 950))
+ )
+)
+device(D$PMOS$1 PMOS
+ terminal(S
+  rect($1 (-675 -475) (550 950))
+ )
+ terminal(G
+  rect($3 (-125 -475) (250 950))
+ )
+ terminal(D
+  rect($1 (125 -475) (525 950))
+ )
+)
+device(D$NMOS NMOS
+ terminal(S
+  rect($2 (-650 -475) (525 950))
+ )
+ terminal(G
+  rect($3 (-125 -475) (250 950))
+ )
+ terminal(D
+  rect($2 (125 -475) (550 950))
+ )
+)
+device(D$NMOS$1 NMOS
+ terminal(S
+  rect($2 (-675 -475) (550 950))
+ )
+ terminal(G
+  rect($3 (-125 -475) (250 950))
+ )
+ terminal(D
+  rect($2 (125 -475) (525 950))
+ )
+)
+
+# Circuit section
+# Circuits are the hierarchical building blocks of the netlist.
+circuit(INV2
+
+ # Nets with their geometries
+ net(1 name(NIN)
+  rect($3 (-525 -250) (250 2500))
+  rect($3 (-1425 -630) (1300 360))
+  rect($3 (-125 -2780) (250 1600))
+  rect($3 (-250 1200) (250 1600))
+  rect($9 (-526 -1801) (2 2))
+  rect($5 (-831 -111) (220 220))
+ )
+ net(2
+  rect($3 (275 -250) (250 2500))
+  rect($3 (-305 -1430) (360 360))
+  rect($3 (-305 820) (250 1600))
+  rect($3 (-250 -4400) (250 1600))
+  rect($4 (-1435 1690) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -3420) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($5 (980 580) (220 220))
+  rect($6 (-1310 -290) (1380 360))
+  rect($6 (-1560 -1600) (360 2840))
+  rect($6 (-360 0) (360 760))
+  rect($6 (-360 -3560) (360 760))
+  rect($1 (-430 1945) (525 950))
+  rect($2 (-525 -3750) (525 950))
+ )
+ net(3 name(NOUT)
+  rect($4 (690 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+  polygon($6 (-110 110) (0 360) (140 0) (0 1240) (-320 0) (0 800) (360 0) (0 -440) (320 0) (0 -1960))
+  rect($6 (-680 2400) (360 760))
+  rect($6 (-360 -3560) (360 760))
+  rect($10 (-181 1419) (2 2))
+  rect($1 (-276 524) (525 950))
+  rect($2 (-525 -3750) (525 950))
+ )
+ net(4
+  rect($4 (-110 -310) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($6 (-290 -290) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($7 (-305 -705) (250 250))
+  rect($7 (-250 150) (250 250))
+  rect($8 (-1525 -775) (2800 900))
+  rect($2 (-1675 -925) (550 950))
+ )
+ net(5
+  rect($4 (-110 2490) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($6 (-290 -290) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($7 (-305 -705) (250 250))
+  rect($7 (-250 150) (250 250))
+  rect($8 (-1525 -775) (2800 900))
+  rect($1 (-1675 -925) (550 950))
+ )
+
+ # Outgoing pins and their connections to nets
+ pin(1 name(IN))
+ pin(2)
+ pin(3 name(OUT))
+ pin(4)
+ pin(5)
+
+ # Devices and their connections
+ device(1 D$PMOS
+  location(-400 2800)
+  param(L 0.25)
+  param(W 0.95)
+  param(AS 0.49875)
+  param(AD 0.26125)
+  param(PS 2.95)
+  param(PD 1.5)
+  terminal(S 2)
+  terminal(G 1)
+  terminal(D 5)
+ )
+ device(2 D$PMOS$1
+  location(400 2800)
+  param(L 0.25)
+  param(W 0.95)
+  param(AS 0.26125)
+  param(AD 0.49875)
+  param(PS 1.5)
+  param(PD 2.95)
+  terminal(S 5)
+  terminal(G 2)
+  terminal(D 3)
+ )
+ device(3 D$NMOS
+  location(-400 0)
+  param(L 0.25)
+  param(W 0.95)
+  param(AS 0.49875)
+  param(AD 0.26125)
+  param(PS 2.95)
+  param(PD 1.5)
+  terminal(S 2)
+  terminal(G 1)
+  terminal(D 4)
+ )
+ device(4 D$NMOS$1
+  location(400 0)
+  param(L 0.25)
+  param(W 0.95)
+  param(AS 0.26125)
+  param(AD 0.49875)
+  param(PS 1.5)
+  param(PD 2.95)
+  terminal(S 4)
+  terminal(G 2)
+  terminal(D 3)
+ )
+
+)
+circuit(RINGO
+
+ # Nets with their geometries
+ net(1 name(FB)
+  rect($4 (22850 2490) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -3420) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($6 (-24770 1310) (360 360))
+  rect($7 (-305 -305) (250 250))
+  rect($7 (24230 -250) (250 250))
+  rect($8 (-24805 -325) (24880 400))
+  rect($11 (-23161 -201) (2 2))
+ )
+ net(2 name(VSS)
+  rect($4 (2530 -310) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-2860 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (5060 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($6 (-21410 -290) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (-3000 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (4920 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($11 (-23941 -381) (2 2))
+ )
+ net(3 name(VDD)
+  rect($4 (2530 2490) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-2860 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (5060 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (2420 -220) (220 220))
+  rect($4 (-220 180) (220 220))
+  rect($4 (-220 -220) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($6 (-21410 -290) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (-3000 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (4920 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($6 (2280 -760) (360 760))
+  rect($6 (-360 -760) (360 760))
+  rect($11 (-23941 -381) (2 2))
+ )
+ net(4
+  rect($4 (690 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(5
+  rect($4 (21810 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(6
+  rect($4 (19170 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(7
+  rect($4 (16530 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(8
+  rect($4 (13890 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(9
+  rect($4 (11250 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(10
+  rect($4 (8610 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(11
+  rect($4 (5970 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+ net(12
+  rect($4 (3330 2890) (220 220))
+  rect($4 (-220 -620) (220 220))
+  rect($4 (-220 -2620) (220 220))
+  rect($4 (-220 -620) (220 220))
+ )
+
+ # Subcircuits and their connections
+ circuit(1 INV2 location(23760 0)
+  pin(0 5)
+  pin(1 1)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(2 INV2 location(0 0)
+  pin(0 1)
+  pin(2 4)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(3 INV2 location(2640 0)
+  pin(0 4)
+  pin(2 12)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(4 INV2 location(5280 0)
+  pin(0 12)
+  pin(2 11)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(5 INV2 location(7920 0)
+  pin(0 11)
+  pin(2 10)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(6 INV2 location(10560 0)
+  pin(0 10)
+  pin(2 9)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(7 INV2 location(13200 0)
+  pin(0 9)
+  pin(2 8)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(8 INV2 location(15840 0)
+  pin(0 8)
+  pin(2 7)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(9 INV2 location(18480 0)
+  pin(0 7)
+  pin(2 6)
+  pin(3 2)
+  pin(4 3)
+ )
+ circuit(10 INV2 location(21120 0)
+  pin(0 6)
+  pin(2 5)
+  pin(3 2)
+  pin(4 3)
+ )
+
+)
diff --git a/testdata/algo/lvs_test2_au.lvsdb.1 b/testdata/algo/lvs_test2_au.lvsdb.1
index eb088d4cf..e126c6a69 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.1
+++ b/testdata/algo/lvs_test2_au.lvsdb.1
@@ -645,6 +645,10 @@ xref(
   )
  )
  circuit(RINGO RINGO nomatch
+  log(
+   entry(error description('Net $I22 is not matching any net from reference netlist'))
+   entry(error description('Net FB is not matching any net from reference netlist'))
+  )
   xref(
    net(8 () mismatch)
    net(7 7 match)
diff --git a/testdata/algo/lvs_test2_au.lvsdb.2 b/testdata/algo/lvs_test2_au.lvsdb.2
index 0d7635d17..b6eb7da64 100644
--- a/testdata/algo/lvs_test2_au.lvsdb.2
+++ b/testdata/algo/lvs_test2_au.lvsdb.2
@@ -645,6 +645,10 @@ xref(
   )
  )
  circuit(RINGO RINGO nomatch
+  log(
+   entry(error description('Net $I22 is not matching any net from reference netlist'))
+   entry(error description('Net FB is not matching any net from reference netlist'))
+  )
   xref(
    net(8 () mismatch)
    net(7 7 match)
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.1 b/testdata/algo/lvs_test2b_au.lvsdb.1
index fd107f1b9..1bec1de6c 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.1
+++ b/testdata/algo/lvs_test2b_au.lvsdb.1
@@ -645,6 +645,10 @@ xref(
   )
  )
  circuit(RINGO RINGO nomatch
+  log(
+   entry(error description('Net $I22 is not matching any net from reference netlist'))
+   entry(error description('Net FB is not matching any net from reference netlist'))
+  )
   xref(
    net(8 () mismatch)
    net(7 7 match)
diff --git a/testdata/algo/lvs_test2b_au.lvsdb.2 b/testdata/algo/lvs_test2b_au.lvsdb.2
index 29b9a4b7c..23f1b8b03 100644
--- a/testdata/algo/lvs_test2b_au.lvsdb.2
+++ b/testdata/algo/lvs_test2b_au.lvsdb.2
@@ -645,6 +645,10 @@ xref(
   )
  )
  circuit(RINGO RINGO nomatch
+  log(
+   entry(error description('Net $I22 is not matching any net from reference netlist'))
+   entry(error description('Net FB is not matching any net from reference netlist'))
+  )
   xref(
    net(8 () mismatch)
    net(7 7 match)
diff --git a/testdata/algo/lvs_test3.lvsdb b/testdata/algo/lvs_test3.lvsdb
new file mode 100644
index 000000000..d94707f4b
--- /dev/null
+++ b/testdata/algo/lvs_test3.lvsdb
@@ -0,0 +1,687 @@
+#%lvsdb-klayout
+
+# Layout
+layout(
+ top(RINGO)
+ unit(0.001)
+
+ # Layer section
+ # This section lists the mask layers (drawing or derived) and their connections.
+
+ # Mask layers
+ layer(bulk)
+ layer(nwell '1/0')
+ layer(poly '3/0')
+ layer(poly_lbl '3/1')
+ layer(diff_cont '4/0')
+ layer(poly_cont '5/0')
+ layer(metal1 '6/0')
+ layer(metal1_lbl '6/1')
+ layer(via1 '7/0')
+ layer(metal2 '8/0')
+ layer(metal2_lbl '8/1')
+ layer(ntie)
+ layer(psd)
+ layer(ptie)
+ layer(nsd)
+
+ # Mask layer connectivity
+ connect(nwell nwell ntie)
+ connect(poly poly poly_lbl poly_cont)
+ connect(poly_lbl poly)
+ connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
+ connect(poly_cont poly poly_cont metal1)
+ connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
+ connect(metal1_lbl metal1)
+ connect(via1 metal1 via1 metal2)
+ connect(metal2 via1 metal2 metal2_lbl)
+ connect(metal2_lbl metal2)
+ connect(ntie nwell diff_cont ntie)
+ connect(psd diff_cont psd)
+ connect(ptie diff_cont ptie)
+ connect(nsd diff_cont nsd)
+
+ # Global nets and connectivity
+ global(bulk BULK)
+ global(ptie BULK)
+
+ # Device class section
+ class(PMOS MOS4)
+ class(NMOS MOS4)
+
+ # Device abstracts section
+ # Device abstracts list the pin shapes of the devices.
+ device(D$PMOS PMOS
+  terminal(S
+   rect(psd (-650 -875) (525 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(psd (125 -875) (550 1750))
+  )
+  terminal(B
+   rect(nwell (-125 -875) (250 1750))
+  )
+  kk # invalid
+ )
+ device(D$PMOS$1 PMOS
+  terminal(S
+   rect(psd (-675 -875) (550 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(psd (125 -875) (525 1750))
+  )
+  terminal(B
+   rect(nwell (-125 -875) (250 1750))
+  )
+ )
+ device(D$NMOS NMOS
+  terminal(S
+   rect(nsd (-650 -875) (525 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(nsd (125 -875) (550 1750))
+  )
+  terminal(B
+   rect(bulk (-125 -875) (250 1750))
+  )
+ )
+ device(D$NMOS$1 NMOS
+  terminal(S
+   rect(nsd (-675 -875) (550 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(nsd (125 -875) (525 1750))
+  )
+  terminal(B
+   rect(bulk (-125 -875) (250 1750))
+  )
+ )
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(INV2
+
+  # Circuit boundary
+  rect((-1700 -2440) (3100 7820))
+
+  # Nets with their geometries
+  kk # invalid
+  net(1
+   rect(nwell (-1400 1800) (2800 3580))
+   rect(diff_cont (-1510 -650) (220 220))
+   rect(ntie (-510 -450) (800 680))
+  )
+  net(2 name(IN)
+   rect(poly (-525 -250) (250 2500))
+   rect(poly (-1425 -630) (2100 360))
+   rect(poly (-125 -2230) (250 2500))
+   rect(poly (-1050 -3850) (250 2400))
+   rect(poly (550 1200) (250 2400))
+   rect(poly (-250 -6000) (250 2400))
+   rect(poly (-1050 1200) (250 2400))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
+  )
+  net(3 name(OUT)
+   rect(diff_cont (-910 90) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (1380 3380) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 -3820) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-1820 3380) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(metal1 (1310 -3710) (360 2220))
+   rect(metal1 (-1900 -800) (2220 360))
+   rect(metal1 (-2280 -2400) (360 2840))
+   rect(metal1 (-360 -3600) (360 1560))
+   rect(metal1 (1240 2040) (360 1560))
+   rect(metal1 (-360 -5160) (360 1560))
+   rect(metal1 (-1960 2040) (360 1560))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
+   rect(psd (-2100 -1750) (525 1750))
+   rect(nsd (1050 -5350) (525 1750))
+   rect(nsd (-2100 -1750) (525 1750))
+  )
+  net(4 name(VSS)
+   rect(diff_cont (-110 90) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 980) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(metal1 (-290 -290) (360 1560))
+   rect(metal1 (-360 -1560) (360 1560))
+   rect(via1 (-305 -705) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 -1450) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(metal2 (-1525 -775) (2800 1700))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
+  )
+  net(5 name(VDD)
+   rect(diff_cont (-110 2490) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 -1420) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(metal1 (-290 -1490) (360 1560))
+   rect(metal1 (-360 -1560) (360 1560))
+   rect(via1 (-305 -1505) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(metal2 (-1525 -1575) (2800 1700))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
+  )
+  net(6 name(BULK)
+   rect(diff_cont (-110 -2160) (220 220))
+   rect(ptie (-510 -450) (800 680))
+  )
+  kk # invalid
+
+  # Outgoing pins and their connections to nets
+  pin(1)
+  pin(2 name(IN))
+  pin(3 name(OUT))
+  pin(4 name(VSS))
+  kk(1 jj(17 2.5 "hello")) # invalid
+  pin(5 name(VDD))
+  pin(6 name(BULK))
+
+  # Devices and their connections
+  device(1 D$PMOS
+   device(D$PMOS$1 location(800 0))
+   connect(0 S S)
+   connect(1 S D)
+   connect(0 G G)
+   connect(1 G G)
+   connect(0 D D)
+   connect(1 D S)
+   connect(0 B B)
+   connect(1 B B)
+  kk # invalid
+   location(-400 3200)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 5)
+   terminal(B 1)
+  kk # invalid
+  )
+  device(3 D$NMOS
+   device(D$NMOS$1 location(800 0))
+   connect(0 S S)
+   connect(1 S D)
+   connect(0 G G)
+   connect(1 G G)
+   connect(0 D D)
+   connect(1 D S)
+   connect(0 B B)
+   connect(1 B B)
+   location(-400 -400)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 4)
+   terminal(B 6)
+  )
+  kk # invalid
+
+ )
+ circuit(INV2PAIR
+
+  # Circuit boundary
+  rect((0 -1640) (5740 7820))
+
+  # Nets with their geometries
+  kk # invalid
+  net(1 name(BULK))
+  net(2)
+  net(3)
+  net(4)
+  net(5)
+  net(6)
+  net(7)
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(BULK))
+  pin(2)
+  pin(3)
+  pin(4)
+  pin(5)
+  pin(6)
+  pin(7)
+
+  # Subcircuits and their connections
+  circuit(1 INV2 location(1700 800)
+   pin(0 7)
+   pin(1 5)
+   pin(2 4)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+  circuit(2 INV2 location(4340 800)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+ circuit(RINGO
+
+  # Circuit boundary
+  rect((-1720 -2440) (26880 7820))
+
+  # Nets with their geometries
+  kk # invalid
+  net(1 name(FB)
+   rect(metal1 (-1700 1620) (360 360))
+   rect(via1 (-305 -305) (250 250))
+   rect(via1 (23190 -250) (250 250))
+   rect(metal2 (-23765 -325) (23840 400))
+   rect(metal2_lbl (-22120 -200) (0 0))
+  )
+  net(2 name(OSC)
+   rect(via1 (24435 1675) (250 250))
+   rect(metal2 (-325 -325) (400 400))
+   rect(metal2_lbl (-200 -200) (0 0))
+  )
+  net(3 name(VDD)
+   rect(metal1 (-180 3900) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal2_lbl (-23940 -2220) (0 0))
+  )
+  net(4 name(VSS)
+   rect(metal1 (-180 -2220) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal2_lbl (-23940 1100) (0 0))
+  )
+  net(5)
+  net(6)
+  net(7)
+  net(8)
+  net(9)
+  net(10)
+  net(11)
+  net(12)
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(FB))
+  pin(2 name(OSC))
+  pin(3 name(VDD))
+  pin(4 name(VSS))
+
+  # Subcircuits and their connections
+  circuit(1 INV2PAIR location(19420 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 10)
+   pin(5 2)
+   pin(6 3)
+  )
+  circuit(2 INV2PAIR location(-1700 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 8)
+   pin(4 1)
+   pin(5 9)
+   pin(6 3)
+  )
+  circuit(3 INV2PAIR location(3580 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
+   pin(6 3)
+  )
+  circuit(4 INV2PAIR location(8860 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 6)
+   pin(4 12)
+   pin(5 11)
+   pin(6 3)
+  )
+  circuit(5 INV2PAIR location(14140 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
+   pin(6 3)
+  )
+
+ )
+)
+
+# Reference netlist
+reference(
+
+ # Device class section
+ class(PMOS MOS4)
+ class(NMOS MOS4)
+  kk # invalid
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(INV2
+
+  # Nets
+  kk # invalid
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+
+  # Devices and their connections
+  device(1 PMOS
+   name($1)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 5)
+   terminal(B 1)
+  )
+  device(2 NMOS
+   name($3)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 4)
+   terminal(B 6)
+  )
+
+ )
+ circuit(INV2PAIR
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+  net(7 name('7'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+  pin(7 name('7'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2 name($2)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+ circuit(RINGO
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('6'))
+  net(6 name('5'))
+  net(7 name('101'))
+  net(8 name('8'))
+  net(9 name('102'))
+  net(10 name('7'))
+  net(11 name('103'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2PAIR name($1)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 5)
+   pin(5 2)
+   pin(6 3)
+  )
+  circuit(2 INV2PAIR name($2)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 1)
+   pin(5 6)
+   pin(6 3)
+  )
+  circuit(3 INV2PAIR name($3)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 7)
+   pin(4 6)
+   pin(5 8)
+   pin(6 3)
+  )
+  circuit(4 INV2PAIR name($4)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 9)
+   pin(4 8)
+   pin(5 10)
+   pin(6 3)
+  )
+  circuit(5 INV2PAIR name($5)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 11)
+   pin(4 10)
+   pin(5 5)
+   pin(6 3)
+  )
+
+ )
+ circuit(INV2PAIRX
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+  net(7 name('7'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+  pin(7 name('7'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2 name($2)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+)
+
+# Cross reference
+xref(
+ circuit(() INV2PAIRX mismatch
+  kk( jj("hello" W) jj("world!" E) ) # invalid
+  xref(
+  )
+ )
+ circuit(INV2 INV2 match
+  xref(
+  kk # invalid
+   net(1 1 match)
+   net(6 6 match)
+   net(2 2 match)
+   net(3 3 match)
+   net(5 5 match)
+   net(4 4 match)
+   pin(0 0 match)
+   pin(5 5 match)
+   pin(1 1 match)
+   pin(2 2 match)
+   pin(4 4 match)
+   pin(3 3 match)
+   device(3 2 match)
+   device(1 1 match)
+  kk # invalid
+  )
+ )
+ circuit(INV2PAIR INV2PAIR nomatch
+  xref(
+   net(2 2 mismatch)
+   net(3 3 mismatch)
+   net(4 4 mismatch)
+   net(5 5 mismatch)
+   net(6 6 match)
+   net(7 7 mismatch)
+   net(1 1 mismatch)
+   pin(1 1 match)
+   pin(2 2 match)
+   pin(3 3 match)
+   pin(4 4 match)
+   pin(5 5 match)
+   pin(6 6 match)
+   pin(0 0 match)
+   circuit(1 () mismatch)
+   circuit(2 1 match)
+  )
+ )
+ circuit(RINGO RINGO nomatch
+  xref(
+   net(8 () mismatch kk kk kk )
+   net(7 7 match)
+   net(6 9 match)
+   net(5 11 match)
+   net(9 6 match)
+   net(10 5 match)
+   net(11 10 match)
+   net(12 8 match)
+   net(1 1 mismatch)
+   net(2 2 match)
+   net(3 3 match)
+   net(4 4 match)
+   pin(0 0 match)
+   pin(1 1 match kk)
+   pin(2 2 match)
+   pin(3 3 match)
+   circuit(() 2 mismatch kk)
+   circuit(2 () mismatch)
+   circuit(1 1 match)
+   circuit(3 3 match)
+   circuit(4 4 match)
+   circuit(5 5 match)
+  )
+ )
+)
diff --git a/testdata/algo/lvs_test3_au.lvsdb b/testdata/algo/lvs_test3_au.lvsdb
new file mode 100644
index 000000000..fd107f1b9
--- /dev/null
+++ b/testdata/algo/lvs_test3_au.lvsdb
@@ -0,0 +1,673 @@
+#%lvsdb-klayout
+
+# Layout
+layout(
+ top(RINGO)
+ unit(0.001)
+
+ # Layer section
+ # This section lists the mask layers (drawing or derived) and their connections.
+
+ # Mask layers
+ layer(bulk)
+ layer(nwell '1/0')
+ layer(poly '3/0')
+ layer(poly_lbl '3/1')
+ layer(diff_cont '4/0')
+ layer(poly_cont '5/0')
+ layer(metal1 '6/0')
+ layer(metal1_lbl '6/1')
+ layer(via1 '7/0')
+ layer(metal2 '8/0')
+ layer(metal2_lbl '8/1')
+ layer(ntie)
+ layer(psd)
+ layer(ptie)
+ layer(nsd)
+
+ # Mask layer connectivity
+ connect(nwell nwell ntie)
+ connect(poly poly poly_lbl poly_cont)
+ connect(poly_lbl poly)
+ connect(diff_cont diff_cont metal1 ntie psd ptie nsd)
+ connect(poly_cont poly poly_cont metal1)
+ connect(metal1 diff_cont poly_cont metal1 metal1_lbl via1)
+ connect(metal1_lbl metal1)
+ connect(via1 metal1 via1 metal2)
+ connect(metal2 via1 metal2 metal2_lbl)
+ connect(metal2_lbl metal2)
+ connect(ntie nwell diff_cont ntie)
+ connect(psd diff_cont psd)
+ connect(ptie diff_cont ptie)
+ connect(nsd diff_cont nsd)
+
+ # Global nets and connectivity
+ global(bulk BULK)
+ global(ptie BULK)
+
+ # Device class section
+ class(PMOS MOS4)
+ class(NMOS MOS4)
+
+ # Device abstracts section
+ # Device abstracts list the pin shapes of the devices.
+ device(D$PMOS PMOS
+  terminal(S
+   rect(psd (-650 -875) (525 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(psd (125 -875) (550 1750))
+  )
+  terminal(B
+   rect(nwell (-125 -875) (250 1750))
+  )
+ )
+ device(D$PMOS$1 PMOS
+  terminal(S
+   rect(psd (-675 -875) (550 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(psd (125 -875) (525 1750))
+  )
+  terminal(B
+   rect(nwell (-125 -875) (250 1750))
+  )
+ )
+ device(D$NMOS NMOS
+  terminal(S
+   rect(nsd (-650 -875) (525 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(nsd (125 -875) (550 1750))
+  )
+  terminal(B
+   rect(bulk (-125 -875) (250 1750))
+  )
+ )
+ device(D$NMOS$1 NMOS
+  terminal(S
+   rect(nsd (-675 -875) (550 1750))
+  )
+  terminal(G
+   rect(poly (-125 -875) (250 1750))
+  )
+  terminal(D
+   rect(nsd (125 -875) (525 1750))
+  )
+  terminal(B
+   rect(bulk (-125 -875) (250 1750))
+  )
+ )
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(INV2
+
+  # Circuit boundary
+  rect((-1700 -2440) (3100 7820))
+
+  # Nets with their geometries
+  net(1
+   rect(nwell (-1400 1800) (2800 3580))
+   rect(diff_cont (-1510 -650) (220 220))
+   rect(ntie (-510 -450) (800 680))
+  )
+  net(2 name(IN)
+   rect(poly (-525 -250) (250 2500))
+   rect(poly (-1425 -630) (2100 360))
+   rect(poly (-125 -2230) (250 2500))
+   rect(poly (-1050 -3850) (250 2400))
+   rect(poly (550 1200) (250 2400))
+   rect(poly (-250 -6000) (250 2400))
+   rect(poly (-1050 1200) (250 2400))
+   rect(poly_lbl (-525 -2600) (0 0))
+   rect(poly_cont (-830 -110) (220 220))
+  )
+  net(3 name(OUT)
+   rect(diff_cont (-910 90) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (1380 3380) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 -3820) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-1820 3380) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(metal1 (1310 -3710) (360 2220))
+   rect(metal1 (-1900 -800) (2220 360))
+   rect(metal1 (-2280 -2400) (360 2840))
+   rect(metal1 (-360 -3600) (360 1560))
+   rect(metal1 (1240 2040) (360 1560))
+   rect(metal1 (-360 -5160) (360 1560))
+   rect(metal1 (-1960 2040) (360 1560))
+   rect(metal1_lbl (1420 -2180) (0 0))
+   rect(psd (-275 525) (525 1750))
+   rect(psd (-2100 -1750) (525 1750))
+   rect(nsd (1050 -5350) (525 1750))
+   rect(nsd (-2100 -1750) (525 1750))
+  )
+  net(4 name(VSS)
+   rect(diff_cont (-110 90) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 980) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(diff_cont (-220 -620) (220 220))
+   rect(metal1 (-290 -290) (360 1560))
+   rect(metal1 (-360 -1560) (360 1560))
+   rect(via1 (-305 -705) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 -1450) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(metal2 (-1525 -775) (2800 1700))
+   rect(metal2_lbl (-160 -540) (0 0))
+   rect(nsd (-1515 -1185) (550 1750))
+  )
+  net(5 name(VDD)
+   rect(diff_cont (-110 2490) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 -1420) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(diff_cont (-220 180) (220 220))
+   rect(metal1 (-290 -1490) (360 1560))
+   rect(metal1 (-360 -1560) (360 1560))
+   rect(via1 (-305 -1505) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(via1 (-250 150) (250 250))
+   rect(metal2 (-1525 -1575) (2800 1700))
+   rect(metal2_lbl (-150 -1250) (0 0))
+   rect(psd (-1525 -475) (550 1750))
+  )
+  net(6 name(BULK)
+   rect(diff_cont (-110 -2160) (220 220))
+   rect(ptie (-510 -450) (800 680))
+  )
+
+  # Outgoing pins and their connections to nets
+  pin(1)
+  pin(2 name(IN))
+  pin(3 name(OUT))
+  pin(4 name(VSS))
+  pin(5 name(VDD))
+  pin(6 name(BULK))
+
+  # Devices and their connections
+  device(1 D$PMOS
+   device(D$PMOS$1 location(800 0))
+   connect(0 S S)
+   connect(1 S D)
+   connect(0 G G)
+   connect(1 G G)
+   connect(0 D D)
+   connect(1 D S)
+   connect(0 B B)
+   connect(1 B B)
+   location(-400 3200)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 5)
+   terminal(B 1)
+  )
+  device(2 D$NMOS
+   device(D$NMOS$1 location(800 0))
+   connect(0 S S)
+   connect(1 S D)
+   connect(0 G G)
+   connect(1 G G)
+   connect(0 D D)
+   connect(1 D S)
+   connect(0 B B)
+   connect(1 B B)
+   location(-400 -400)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 4)
+   terminal(B 6)
+  )
+
+ )
+ circuit(INV2PAIR
+
+  # Circuit boundary
+  rect((0 -1640) (5740 7820))
+
+  # Nets with their geometries
+  net(1 name(BULK))
+  net(2)
+  net(3)
+  net(4)
+  net(5)
+  net(6)
+  net(7)
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(BULK))
+  pin(2)
+  pin(3)
+  pin(4)
+  pin(5)
+  pin(6)
+  pin(7)
+
+  # Subcircuits and their connections
+  circuit(1 INV2 location(1700 800)
+   pin(0 7)
+   pin(1 5)
+   pin(2 4)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+  circuit(2 INV2 location(4340 800)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+ circuit(RINGO
+
+  # Circuit boundary
+  rect((-1720 -2440) (26880 7820))
+
+  # Nets with their geometries
+  net(1 name(FB)
+   rect(metal1 (-1700 1620) (360 360))
+   rect(via1 (-305 -305) (250 250))
+   rect(via1 (23190 -250) (250 250))
+   rect(metal2 (-23765 -325) (23840 400))
+   rect(metal2_lbl (-22120 -200) (0 0))
+  )
+  net(2 name(OSC)
+   rect(via1 (24435 1675) (250 250))
+   rect(metal2 (-325 -325) (400 400))
+   rect(metal2_lbl (-200 -200) (0 0))
+  )
+  net(3 name(VDD)
+   rect(metal1 (-180 3900) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal2_lbl (-23940 -2220) (0 0))
+  )
+  net(4 name(VSS)
+   rect(metal1 (-180 -2220) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal1 (2280 -1120) (360 1120))
+   rect(metal2_lbl (-23940 1100) (0 0))
+  )
+  net(5)
+  net(6)
+  net(7)
+  net(8)
+  net(9)
+  net(10)
+  net(11)
+  net(12)
+
+  # Outgoing pins and their connections to nets
+  pin(1 name(FB))
+  pin(2 name(OSC))
+  pin(3 name(VDD))
+  pin(4 name(VSS))
+
+  # Subcircuits and their connections
+  circuit(1 INV2PAIR location(19420 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 10)
+   pin(5 2)
+   pin(6 3)
+  )
+  circuit(2 INV2PAIR location(-1700 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 8)
+   pin(4 1)
+   pin(5 9)
+   pin(6 3)
+  )
+  circuit(3 INV2PAIR location(3580 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 7)
+   pin(4 9)
+   pin(5 12)
+   pin(6 3)
+  )
+  circuit(4 INV2PAIR location(8860 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 6)
+   pin(4 12)
+   pin(5 11)
+   pin(6 3)
+  )
+  circuit(5 INV2PAIR location(14140 -800)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 5)
+   pin(4 11)
+   pin(5 10)
+   pin(6 3)
+  )
+
+ )
+)
+
+# Reference netlist
+reference(
+
+ # Device class section
+ class(PMOS MOS4)
+ class(NMOS MOS4)
+
+ # Circuit section
+ # Circuits are the hierarchical building blocks of the netlist.
+ circuit(INV2
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+
+  # Devices and their connections
+  device(1 PMOS
+   name($1)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 5)
+   terminal(B 1)
+  )
+  device(2 NMOS
+   name($3)
+   param(L 0.25)
+   param(W 3.5)
+   param(AS 1.4)
+   param(AD 1.4)
+   param(PS 6.85)
+   param(PD 6.85)
+   terminal(S 3)
+   terminal(G 2)
+   terminal(D 4)
+   terminal(B 6)
+  )
+
+ )
+ circuit(INV2PAIR
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+  net(7 name('7'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+  pin(7 name('7'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2 name($2)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+ circuit(RINGO
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('6'))
+  net(6 name('5'))
+  net(7 name('101'))
+  net(8 name('8'))
+  net(9 name('102'))
+  net(10 name('7'))
+  net(11 name('103'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2PAIR name($1)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 5)
+   pin(5 2)
+   pin(6 3)
+  )
+  circuit(2 INV2PAIR name($2)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 1)
+   pin(4 1)
+   pin(5 6)
+   pin(6 3)
+  )
+  circuit(3 INV2PAIR name($3)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 7)
+   pin(4 6)
+   pin(5 8)
+   pin(6 3)
+  )
+  circuit(4 INV2PAIR name($4)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 9)
+   pin(4 8)
+   pin(5 10)
+   pin(6 3)
+  )
+  circuit(5 INV2PAIR name($5)
+   pin(0 4)
+   pin(1 3)
+   pin(2 4)
+   pin(3 11)
+   pin(4 10)
+   pin(5 5)
+   pin(6 3)
+  )
+
+ )
+ circuit(INV2PAIRX
+
+  # Nets
+  net(1 name('1'))
+  net(2 name('2'))
+  net(3 name('3'))
+  net(4 name('4'))
+  net(5 name('5'))
+  net(6 name('6'))
+  net(7 name('7'))
+
+  # Outgoing pins and their connections to nets
+  pin(1 name('1'))
+  pin(2 name('2'))
+  pin(3 name('3'))
+  pin(4 name('4'))
+  pin(5 name('5'))
+  pin(6 name('6'))
+  pin(7 name('7'))
+
+  # Subcircuits and their connections
+  circuit(1 INV2 name($2)
+   pin(0 7)
+   pin(1 4)
+   pin(2 6)
+   pin(3 3)
+   pin(4 2)
+   pin(5 1)
+  )
+
+ )
+)
+
+# Cross reference
+xref(
+ circuit(() INV2PAIRX mismatch
+  xref(
+  )
+ )
+ circuit(INV2 INV2 match
+  xref(
+   net(1 1 match)
+   net(6 6 match)
+   net(2 2 match)
+   net(3 3 match)
+   net(5 5 match)
+   net(4 4 match)
+   pin(0 0 match)
+   pin(5 5 match)
+   pin(1 1 match)
+   pin(2 2 match)
+   pin(4 4 match)
+   pin(3 3 match)
+   device(2 2 match)
+   device(1 1 match)
+  )
+ )
+ circuit(INV2PAIR INV2PAIR nomatch
+  xref(
+   net(2 2 mismatch)
+   net(3 3 mismatch)
+   net(4 4 mismatch)
+   net(5 5 mismatch)
+   net(6 6 match)
+   net(7 7 mismatch)
+   net(1 1 mismatch)
+   pin(1 1 match)
+   pin(2 2 match)
+   pin(3 3 match)
+   pin(4 4 match)
+   pin(5 5 match)
+   pin(6 6 match)
+   pin(0 0 match)
+   circuit(1 () mismatch)
+   circuit(2 1 match)
+  )
+ )
+ circuit(RINGO RINGO nomatch
+  xref(
+   net(8 () mismatch)
+   net(7 7 match)
+   net(6 9 match)
+   net(5 11 match)
+   net(9 6 match)
+   net(10 5 match)
+   net(11 10 match)
+   net(12 8 match)
+   net(1 1 mismatch)
+   net(2 2 match)
+   net(3 3 match)
+   net(4 4 match)
+   pin(0 0 match)
+   pin(1 1 match)
+   pin(2 2 match)
+   pin(3 3 match)
+   circuit(() 2 mismatch)
+   circuit(2 () mismatch)
+   circuit(1 1 match)
+   circuit(3 3 match)
+   circuit(4 4 match)
+   circuit(5 5 match)
+  )
+ )
+)
diff --git a/testdata/bd/strm2clip_au1.gds b/testdata/bd/strm2clip_au1.gds
index 45056634a..4557b513c 100644
Binary files a/testdata/bd/strm2clip_au1.gds and b/testdata/bd/strm2clip_au1.gds differ
diff --git a/testdata/bd/strm2clip_au2.gds b/testdata/bd/strm2clip_au2.gds
index f8709ccc4..aedf1eecf 100644
Binary files a/testdata/bd/strm2clip_au2.gds and b/testdata/bd/strm2clip_au2.gds differ
diff --git a/testdata/bool/size5_au11.oas b/testdata/bool/size5_au11.oas
index 6b65a9bb8..702ff32e8 100644
Binary files a/testdata/bool/size5_au11.oas and b/testdata/bool/size5_au11.oas differ
diff --git a/testdata/bool/size5_au12.oas b/testdata/bool/size5_au12.oas
index cfc483c4f..cf71c7fa0 100644
Binary files a/testdata/bool/size5_au12.oas and b/testdata/bool/size5_au12.oas differ
diff --git a/testdata/bool/size5_au2.oas b/testdata/bool/size5_au2.oas
index 62175e083..737f1ea30 100644
Binary files a/testdata/bool/size5_au2.oas and b/testdata/bool/size5_au2.oas differ
diff --git a/testdata/bool/size5_au3.oas b/testdata/bool/size5_au3.oas
index 7b340cede..b806dba0d 100644
Binary files a/testdata/bool/size5_au3.oas and b/testdata/bool/size5_au3.oas differ
diff --git a/testdata/bool/size5_au4.oas b/testdata/bool/size5_au4.oas
index af35b75ba..90a845dcf 100644
Binary files a/testdata/bool/size5_au4.oas and b/testdata/bool/size5_au4.oas differ
diff --git a/testdata/bool/size5_au5.oas b/testdata/bool/size5_au5.oas
index 54db687ef..af384b660 100644
Binary files a/testdata/bool/size5_au5.oas and b/testdata/bool/size5_au5.oas differ
diff --git a/testdata/bool/size5_au6.oas b/testdata/bool/size5_au6.oas
index 2cd866493..af384b660 100644
Binary files a/testdata/bool/size5_au6.oas and b/testdata/bool/size5_au6.oas differ
diff --git a/testdata/drc/drcSimpleTests_5.drc b/testdata/drc/drcSimpleTests_5.drc
index 28b655ea6..0ec16cc9a 100644
--- a/testdata/drc/drcSimpleTests_5.drc
+++ b/testdata/drc/drcSimpleTests_5.drc
@@ -19,6 +19,9 @@ connect(poly, poly_cont)
 connect(poly_cont, metal1)
 
 antenna_check(gate, metal1, 1.0).output(201)
+values = labels
+antenna_check(gate, metal1, 1.0, values).output(201, 1)
+values.output(201, 10)
 antenna_check(gate, metal1, 2.0).output(202)
 antenna_check(gate, metal1, 3.0).output(203)
 antenna_check(gate, metal1, 4.0).output(204)
@@ -32,6 +35,9 @@ connect(metal1, via1)
 connect(via1, metal2)
 
 antenna_check(gate, metal2, 1.0).output(101)
+values = labels
+antenna_check(gate, metal2, 1.0, values).output(101, 1)
+values.output(101, 10)
 antenna_check(gate, metal2, 5.0).output(105)
 antenna_check(gate, metal2, 10.0).output(110)
 antenna_check(gate, metal2, 50.0).output(150)
diff --git a/testdata/drc/drcSimpleTests_50.gds b/testdata/drc/drcSimpleTests_50.gds
deleted file mode 100644
index 667f1e7be..000000000
Binary files a/testdata/drc/drcSimpleTests_50.gds and /dev/null differ
diff --git a/testdata/drc/drcSimpleTests_50.oas b/testdata/drc/drcSimpleTests_50.oas
new file mode 100644
index 000000000..8b939865d
Binary files /dev/null and b/testdata/drc/drcSimpleTests_50.oas differ
diff --git a/testdata/drc/drcSimpleTests_54.gds b/testdata/drc/drcSimpleTests_54.gds
index 5cd83d002..234bba54c 100644
Binary files a/testdata/drc/drcSimpleTests_54.gds and b/testdata/drc/drcSimpleTests_54.gds differ
diff --git a/testdata/drc/drcSimpleTests_5i.drc b/testdata/drc/drcSimpleTests_5i.drc
index 973cdfa7e..2bc555a0b 100644
--- a/testdata/drc/drcSimpleTests_5i.drc
+++ b/testdata/drc/drcSimpleTests_5i.drc
@@ -19,6 +19,9 @@ connect(poly, poly_cont)
 connect(poly_cont, metal1)
 
 antenna_check(gate, metal1, 1.0).output(201)
+values = labels
+antenna_check(gate, metal1, 1.0, values).output(201, 1)
+values.output(201, 10)
 antenna_check(gate, metal1, 2.0).output(202)
 antenna_check(gate, metal1, 3.0).output(203)
 antenna_check(gate, metal1, 4.0).output(204)
@@ -27,6 +30,9 @@ connect(metal1, via1)
 connect(via1, metal2)
 
 antenna_check(gate, metal2, 1.0).output(101)
+values = labels
+antenna_check(gate, metal2, 1.0, values).output(101, 1)
+values.output(101, 10)
 antenna_check(gate, metal2, 5.0).output(105)
 antenna_check(gate, metal2, 10.0).output(110)
 antenna_check(gate, metal2, 50.0).output(150)
diff --git a/testdata/drc/drcSimpleTests_6.drc b/testdata/drc/drcSimpleTests_6.drc
index 998f43ce1..9953ee782 100644
--- a/testdata/drc/drcSimpleTests_6.drc
+++ b/testdata/drc/drcSimpleTests_6.drc
@@ -23,6 +23,9 @@ connect(metal1, via1)
 connect(via1, metal2)
 
 antenna_check(gate, metal2, 1.0).output(101)
+values = labels
+antenna_check(gate, metal2, 1.0, values).output(101, 1)
+values.output(101, 10)
 antenna_check(gate, metal2, 5.0).output(105)
 antenna_check(gate, metal2, 10.0).output(110)
 antenna_check(gate, metal2, 50.0).output(150)
diff --git a/testdata/drc/drcSimpleTests_7.drc b/testdata/drc/drcSimpleTests_7.drc
index 28797e54b..dc2ffc5e0 100644
--- a/testdata/drc/drcSimpleTests_7.drc
+++ b/testdata/drc/drcSimpleTests_7.drc
@@ -26,6 +26,9 @@ connect(metal1, via1)
 connect(via1, metal2)
 
 antenna_check(gate, metal2, 1.0, diode).output(101)
+values = labels
+antenna_check(gate, metal2, 1.0, diode, values).output(101, 1)
+values.output(101, 10)
 antenna_check(gate, metal2, 1.5, diode).output(102)
 antenna_check(gate, metal2, 2.0, diode).output(103)
 antenna_check(gate, metal2, 5.0, diode).output(105)
@@ -33,12 +36,18 @@ antenna_check(gate, metal2, 10.0, diode).output(110)
 antenna_check(gate, metal2, 50.0, diode).output(150)
 
 antenna_check(gate, metal2, 1.0, [ diode, 0.5 ]).output(201)
+values = labels
+antenna_check(gate, metal2, 1.0, [ diode, 0.5 ], values).output(201, 1)
+values.output(201, 10)
 antenna_check(gate, metal2, 1.0, [ diode, 5.0 ]).output(202)
 antenna_check(gate, metal2, 5.0, [ diode, 5.0 ]).output(205)
 antenna_check(gate, metal2, 10.0, [ diode, 5.0 ]).output(210)
 antenna_check(gate, metal2, 50.0, [ diode, 5.0 ]).output(250)
 
 antenna_check(area_only(gate), area_and_perimeter(metal2, 0.2.um), 1.0, diode).output(301)
+values = labels
+antenna_check(area_only(gate), area_and_perimeter(metal2, 0.2.um), 1.0, diode, values).output(301, 1)
+values.output(301, 10)
 antenna_check(area_only(gate), area_and_perimeter(metal2, 0.2.um), 1.5, diode).output(302)
 antenna_check(area_only(gate), area_and_perimeter(metal2, 0.2.um), 2.0, diode).output(303)
 antenna_check(area_only(gate), area_and_perimeter(metal2, 0.2), 5.0, diode).output(305)
@@ -46,6 +55,9 @@ antenna_check(area_only(gate), area_and_perimeter(metal2, 0.0002.mm), 10.0, diod
 antenna_check(area_only(gate), area_and_perimeter(metal2, 200.nm), 50.0, diode).output(350)
 
 antenna_check(area_and_perimeter(gate, 0.07.um), area_only(metal2), 1.0, diode).output(401)
+values = labels
+antenna_check(area_and_perimeter(gate, 0.07.um), area_only(metal2), 1.0, diode, values).output(401, 1)
+values.output(401, 10)
 antenna_check(area_and_perimeter(gate, 0.07.um), area_only(metal2), 1.5, diode).output(402)
 antenna_check(area_and_perimeter(gate, 0.07.um), area_only(metal2), 2.0, diode).output(403)
 antenna_check(area_and_perimeter(gate, 70.nm), area_only(metal2), 5.0, diode).output(405)
@@ -53,6 +65,9 @@ antenna_check(area_and_perimeter(gate, 0.07), area_only(metal2), 10.0, diode).ou
 antenna_check(area_and_perimeter(gate, 0.07), area_only(metal2), 50.0, diode).output(450)
 
 antenna_check(perimeter_only(gate, 0.07.um), area_only(metal2), 1.0, diode).output(501)
+values = labels
+antenna_check(perimeter_only(gate, 0.07.um), area_only(metal2), 1.0, diode, values).output(501, 1)
+values.output(501, 10)
 antenna_check(perimeter_only(gate, 0.07.um), area_only(metal2), 1.5, diode).output(502)
 antenna_check(perimeter_only(gate, 0.07.um), area_only(metal2), 2.0, diode).output(503)
 antenna_check(perimeter_only(gate, 70.nm), area_only(metal2), 5.0, diode).output(505)
diff --git a/testdata/drc/drcSimpleTests_au5.gds b/testdata/drc/drcSimpleTests_au5.gds
index 064e177b1..cf85326dd 100644
Binary files a/testdata/drc/drcSimpleTests_au5.gds and b/testdata/drc/drcSimpleTests_au5.gds differ
diff --git a/testdata/drc/drcSimpleTests_au50.gds b/testdata/drc/drcSimpleTests_au50.gds
deleted file mode 100644
index b4666c147..000000000
Binary files a/testdata/drc/drcSimpleTests_au50.gds and /dev/null differ
diff --git a/testdata/drc/drcSimpleTests_au50.oas b/testdata/drc/drcSimpleTests_au50.oas
new file mode 100644
index 000000000..52cb25766
Binary files /dev/null and b/testdata/drc/drcSimpleTests_au50.oas differ
diff --git a/testdata/drc/drcSimpleTests_au6.gds b/testdata/drc/drcSimpleTests_au6.gds
index 75a2525f9..a1bc32508 100644
Binary files a/testdata/drc/drcSimpleTests_au6.gds and b/testdata/drc/drcSimpleTests_au6.gds differ
diff --git a/testdata/drc/drcSimpleTests_au7.gds b/testdata/drc/drcSimpleTests_au7.gds
index cb53332ae..582724aac 100644
Binary files a/testdata/drc/drcSimpleTests_au7.gds and b/testdata/drc/drcSimpleTests_au7.gds differ
diff --git a/testdata/lvs/SP6TArray_2X4.lvs b/testdata/lvs/SP6TArray_2X4.lvs
index 5a676a091..c24169edd 100644
--- a/testdata/lvs/SP6TArray_2X4.lvs
+++ b/testdata/lvs/SP6TArray_2X4.lvs
@@ -198,6 +198,7 @@ extract_devices(mos4("sky130_fd_pr__pfet_g5v0d10v5__model"), {
 netlist
 
 align
+no_lvs_hints
 ok = compare
 if ok then
     print("LVS OK\n")
diff --git a/testdata/lvs/bbdevices3.lvsdb b/testdata/lvs/bbdevices3.lvsdb
index fb30c8ab9..819e2dbe9 100644
--- a/testdata/lvs/bbdevices3.lvsdb
+++ b/testdata/lvs/bbdevices3.lvsdb
@@ -447,6 +447,9 @@ xref(
   )
  )
  circuit(testall TESTALL nomatch
+  log(
+   entry(error description('Net $5 is not matching any net from reference netlist'))
+  )
   xref(
    net(() 7 mismatch)
    net(2 2 match)
diff --git a/testdata/lvs/bbdevices3b.lvsdb b/testdata/lvs/bbdevices3b.lvsdb
index 9aecb5013..95ff6ee8b 100644
--- a/testdata/lvs/bbdevices3b.lvsdb
+++ b/testdata/lvs/bbdevices3b.lvsdb
@@ -293,6 +293,9 @@ xref(
   )
  )
  circuit(BWBTEST BWBTEST nomatch
+  log(
+   entry(error description('No equivalent pin A from reference netlist found in netlist.\nThis is an indication that a physical connection is not made to the subcircuit.'))
+  )
   xref(
    pin(() 0 mismatch)
    pin(0 1 match)
diff --git a/testdata/lvs/bbdevices4b.lvsdb b/testdata/lvs/bbdevices4b.lvsdb
index 7ee00acb8..b91a05e0c 100644
--- a/testdata/lvs/bbdevices4b.lvsdb
+++ b/testdata/lvs/bbdevices4b.lvsdb
@@ -288,6 +288,9 @@ xref(
   )
  )
  circuit(BWBTEST BWBTEST nomatch
+  log(
+   entry(error description('No equivalent pin A from reference netlist found in netlist.\nThis is an indication that a physical connection is not made to the subcircuit.'))
+  )
   xref(
    pin(() 0 mismatch)
    pin(() 1 match)
diff --git a/testdata/lvs/bbdevices5.lvsdb b/testdata/lvs/bbdevices5.lvsdb
index 8acdab170..56183ddcd 100644
--- a/testdata/lvs/bbdevices5.lvsdb
+++ b/testdata/lvs/bbdevices5.lvsdb
@@ -450,6 +450,11 @@ xref(
   )
  )
  circuit(testall TESTALL nomatch
+  log(
+   entry(error description('Net $10 is not matching any net from reference netlist'))
+   entry(error description('Net $5 is not matching any net from reference netlist'))
+   entry(info description('Connecting nets $10 and $5 is making a better match to net D1 from reference netlist (fuzziness 0 nodes)'))
+  )
   xref(
    net(5 () mismatch)
    net(2 2 match)
diff --git a/testdata/lvs/bbdevices5b.lvsdb b/testdata/lvs/bbdevices5b.lvsdb
index cb9e6fb77..dd49d20c6 100644
--- a/testdata/lvs/bbdevices5b.lvsdb
+++ b/testdata/lvs/bbdevices5b.lvsdb
@@ -326,6 +326,11 @@ xref(
   )
  )
  circuit(testall TESTALL nomatch
+  log(
+   entry(error description('Net $10 is not matching any net from reference netlist'))
+   entry(error description('Net $5 is not matching any net from reference netlist'))
+   entry(info description('Connecting nets $10 and $5 is making a better match to net D1 from reference netlist (fuzziness 0 nodes)'))
+  )
   xref(
    net(5 () mismatch)
    net(2 2 match)
diff --git a/testdata/lvs/bbdevices6.lvsdb b/testdata/lvs/bbdevices6.lvsdb
index 28492175b..d15a89969 100644
--- a/testdata/lvs/bbdevices6.lvsdb
+++ b/testdata/lvs/bbdevices6.lvsdb
@@ -446,6 +446,9 @@ xref(
   )
  )
  circuit(testall TESTALL nomatch
+  log(
+   entry(error description('Net $2 is not matching any net from reference netlist'))
+  )
   xref(
    net(() 6 mismatch)
    net(3 2 match)
diff --git a/testdata/lvs/bbdevices6b.lvsdb b/testdata/lvs/bbdevices6b.lvsdb
index cf9afeb29..b75d0a8e5 100644
--- a/testdata/lvs/bbdevices6b.lvsdb
+++ b/testdata/lvs/bbdevices6b.lvsdb
@@ -322,6 +322,9 @@ xref(
   )
  )
  circuit(testall TESTALL nomatch
+  log(
+   entry(error description('Net $2 is not matching any net from reference netlist'))
+  )
   xref(
    net(() 6 mismatch)
    net(3 2 match)
diff --git a/testdata/lvs/blackbox2.lvsdb b/testdata/lvs/blackbox2.lvsdb
index 733ee3295..b5e842b5a 100644
--- a/testdata/lvs/blackbox2.lvsdb
+++ b/testdata/lvs/blackbox2.lvsdb
@@ -181,6 +181,10 @@ xref(
   )
  )
  circuit(TOP TOP nomatch
+  log(
+   entry(error description('Nets 3 are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets 4 are paired explicitly, but are not identical topologically'))
+  )
   xref(
    net(4 1 match)
    net(3 2 match)
diff --git a/testdata/lvs/blackbox3.lvsdb b/testdata/lvs/blackbox3.lvsdb
index 953dea630..f95a64186 100644
--- a/testdata/lvs/blackbox3.lvsdb
+++ b/testdata/lvs/blackbox3.lvsdb
@@ -184,6 +184,9 @@ xref(
   )
  )
  circuit(TOP TOP nomatch
+  log(
+   entry(error description('Nets $1 vs. (not connected) are paired explicitly, but are not identical topologically'))
+  )
   xref(
    net(() 7 mismatch)
    net(1 () mismatch)
diff --git a/testdata/lvs/blackbox4.lvsdb b/testdata/lvs/blackbox4.lvsdb
index f36d797c6..a54819f42 100644
--- a/testdata/lvs/blackbox4.lvsdb
+++ b/testdata/lvs/blackbox4.lvsdb
@@ -180,6 +180,11 @@ xref(
   )
  )
  circuit(TOP TOP nomatch
+  log(
+   entry(error description('Nets (not connected) vs. 5 are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets 5,7 vs. (not connected) are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets (not connected) vs. 7 are paired explicitly, but are not identical topologically'))
+  )
   xref(
    net(() 5 mismatch)
    net(() 7 mismatch)
diff --git a/testdata/lvs/blackbox5.lvsdb b/testdata/lvs/blackbox5.lvsdb
index 0969f0954..391475a66 100644
--- a/testdata/lvs/blackbox5.lvsdb
+++ b/testdata/lvs/blackbox5.lvsdb
@@ -183,6 +183,12 @@ xref(
   )
  )
  circuit(TOP TOP nomatch
+  log(
+   entry(error description('Nets $1 vs. (not connected) are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets (not connected) vs. 5 are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets 5,7 vs. (not connected) are paired explicitly, but are not identical topologically'))
+   entry(error description('Nets (not connected) vs. 7 are paired explicitly, but are not identical topologically'))
+  )
   xref(
    net(() 5 mismatch)
    net(() 7 mismatch)
diff --git a/testdata/lvs/custom_compare.lvsdb b/testdata/lvs/custom_compare.lvsdb
index 69358e767..6862bb95d 100644
--- a/testdata/lvs/custom_compare.lvsdb
+++ b/testdata/lvs/custom_compare.lvsdb
@@ -100,6 +100,10 @@ reference(
 # Cross reference
 xref(
  circuit(TOP TOP match
+  log(
+   entry(warning description('Matching nets $13 vs. R1 from an ambiguous group of nets'))
+   entry(warning description('Matching nets $14 vs. R2 from an ambiguous group of nets'))
+  )
   xref(
    net(1 1 warning)
    net(2 2 warning)
diff --git a/testdata/lvs/double_height2.lvsdb b/testdata/lvs/double_height2.lvsdb
index 3fa095fe8..e794e299c 100644
--- a/testdata/lvs/double_height2.lvsdb
+++ b/testdata/lvs/double_height2.lvsdb
@@ -290,6 +290,12 @@ Z(
   )
  )
  X(INV2 INV2 1
+  L(
+   M(W B('Matching nets Q1 from an ambiguous group of nets'))
+   M(W B('Matching nets Q2 from an ambiguous group of nets'))
+   M(I B('Matching nets A1 following an ambiguous match'))
+   M(I B('Matching nets A2 following an ambiguous match'))
+  )
   Z(
    N(1 3 1)
    N(2 5 1)
diff --git a/testdata/lvs/double_height2_texts.lvsdb b/testdata/lvs/double_height2_texts.lvsdb
index 4aab34e12..2c986d071 100644
--- a/testdata/lvs/double_height2_texts.lvsdb
+++ b/testdata/lvs/double_height2_texts.lvsdb
@@ -290,6 +290,12 @@ Z(
   )
  )
  X(INV2 INV2 1
+  L(
+   M(W B('Matching nets Q1 from an ambiguous group of nets'))
+   M(W B('Matching nets Q2 from an ambiguous group of nets'))
+   M(I B('Matching nets A1 following an ambiguous match'))
+   M(I B('Matching nets A2 following an ambiguous match'))
+  )
   Z(
    N(1 3 1)
    N(2 5 1)
diff --git a/testdata/lvs/enable_wl3.lvsdb b/testdata/lvs/enable_wl3.lvsdb
index 947fc54ac..e9ab95858 100644
--- a/testdata/lvs/enable_wl3.lvsdb
+++ b/testdata/lvs/enable_wl3.lvsdb
@@ -107,6 +107,10 @@ reference(
 # Cross reference
 xref(
  circuit(Rre RRE nomatch
+  log(
+   entry(error description('Net gnd! is not matching any net from reference netlist'))
+   entry(error description('Net vdd! is not matching any net from reference netlist'))
+  )
   xref(
    net(() 2 mismatch)
    net(() 1 mismatch)
diff --git a/testdata/lvs/floating.lvsdb b/testdata/lvs/floating.lvsdb
index ee3408fed..da867a055 100644
--- a/testdata/lvs/floating.lvsdb
+++ b/testdata/lvs/floating.lvsdb
@@ -377,6 +377,12 @@ reference(
 # Cross reference
 xref(
  circuit(DINV DINV match
+  log(
+   entry(warning description('Matching nets B<1> from an ambiguous group of nets'))
+   entry(warning description('Matching nets B<2> from an ambiguous group of nets'))
+   entry(info description('Matching nets A<1> following an ambiguous match'))
+   entry(info description('Matching nets A<2> following an ambiguous match'))
+  )
   xref(
    net(1 1 match)
    net(2 2 match)
diff --git a/testdata/lvs/invchain_cheat.lvsdb b/testdata/lvs/invchain_cheat.lvsdb
index f4ba78725..bf85c951c 100644
--- a/testdata/lvs/invchain_cheat.lvsdb
+++ b/testdata/lvs/invchain_cheat.lvsdb
@@ -417,6 +417,12 @@ Z(
   )
  )
  X(INV2 INV2 1
+  L(
+   M(W B('Matching nets $I8 vs. 4 from an ambiguous group of nets'))
+   M(W B('Matching nets $I7 vs. 6 from an ambiguous group of nets'))
+   M(I B('Matching nets $I6 vs. 3 following an ambiguous match'))
+   M(I B('Matching nets $I5 vs. 5 following an ambiguous match'))
+  )
   Z(
    N(5 1 1)
    N(6 2 1)
@@ -435,6 +441,14 @@ Z(
   )
  )
  X(INV3 INV3 1
+  L(
+   M(W B('Matching nets 4 from an ambiguous group of nets'))
+   M(W B('Matching nets 6 from an ambiguous group of nets'))
+   M(W B('Matching nets 8 from an ambiguous group of nets'))
+   M(I B('Matching nets 3 following an ambiguous match'))
+   M(I B('Matching nets 5 following an ambiguous match'))
+   M(I B('Matching nets 7 following an ambiguous match'))
+  )
   Z(
    N(7 1 1)
    N(8 2 1)
diff --git a/testdata/lvs/res_combine1.lvs b/testdata/lvs/res_combine1.lvs
index 4bff3442d..3dba3b639 100644
--- a/testdata/lvs/res_combine1.lvs
+++ b/testdata/lvs/res_combine1.lvs
@@ -94,4 +94,5 @@ schematic.simplify
 # Netlist vs. netlist
 align
 netlist.simplify
+no_lvs_hints
 compare
diff --git a/testdata/lvs/res_combine2.lvs b/testdata/lvs/res_combine2.lvs
index d81811540..395f84765 100644
--- a/testdata/lvs/res_combine2.lvs
+++ b/testdata/lvs/res_combine2.lvs
@@ -93,4 +93,5 @@ schematic.simplify
 # Netlist vs. netlist
 align
 netlist.simplify
+no_lvs_hints
 compare
diff --git a/testdata/lvs/res_combine3.lvs b/testdata/lvs/res_combine3.lvs
index c957acf47..e0ebec331 100644
--- a/testdata/lvs/res_combine3.lvs
+++ b/testdata/lvs/res_combine3.lvs
@@ -88,4 +88,5 @@ schematic.simplify
 # Netlist vs. netlist
 align
 netlist.simplify
+no_lvs_hints
 compare
diff --git a/testdata/python/basic.py b/testdata/python/basic.py
index 0acb8c009..4c524342f 100644
--- a/testdata/python/basic.py
+++ b/testdata/python/basic.py
@@ -1011,7 +1011,7 @@ class BasicTest(unittest.TestCase):
       self.assertEqual( False, True )  # this must never hit
     except Exception as e:
       err = str(e)
-    self.assertEqual( err, "Unexpected object type (expected argument of class A, got X) in B.b4" );
+    self.assertEqual( err, "Unexpected object type (expected argument of class A, got X) for argument #1 in B.b4" );
   
     # Test, if this throws an error (object of class X passed to A argument):
     err = ""
@@ -1022,7 +1022,7 @@ class BasicTest(unittest.TestCase):
       self.assertEqual( False, True )  # this must never hit
     except Exception as e:
       err = str(e)
-    self.assertEqual( err, "Unexpected object type (expected argument of class A, got B) in B.b4" );
+    self.assertEqual( err, "Unexpected object type (expected argument of class A, got B) for argument #1 in B.b4" );
   
   def test_17(self):
 
diff --git a/testdata/ruby/basic_testcore.rb b/testdata/ruby/basic_testcore.rb
index de8e911b3..87f2f1e4b 100644
--- a/testdata/ruby/basic_testcore.rb
+++ b/testdata/ruby/basic_testcore.rb
@@ -925,7 +925,7 @@ class Basic_TestClass < TestBase
       assert_equal( b.b4( Y.new ), "b4_result: -6" )
       assert_equal( false, true )  # this must never hit
     rescue
-      assert_equal( $!.to_s(), "Unexpected object type (expected argument of class A, got Basic_TestClass::Y) in B::b4" );
+      assert_equal( $!.to_s(), "Unexpected object type (expected argument of class A, got Basic_TestClass::Y) for argument #1 in B::b4" );
     end
   
     # Test, if this throws an error (object of class X passed to A argument):
@@ -935,7 +935,7 @@ class Basic_TestClass < TestBase
       assert_equal( b.b4( bb ), "b4_result: -6" )
       assert_equal( false, true )  # this must never hit
     rescue
-      assert_equal( $!.to_s(), "Unexpected object type (expected argument of class A, got RBA::B) in B::b4" );
+      assert_equal( $!.to_s(), "Unexpected object type (expected argument of class A, got RBA::B) for argument #1 in B::b4" );
     end
   
   end
diff --git a/testdata/ruby/dbCellInstArrayTest.rb b/testdata/ruby/dbCellInstArrayTest.rb
index b61aece95..9d936c787 100644
--- a/testdata/ruby/dbCellInstArrayTest.rb
+++ b/testdata/ruby/dbCellInstArrayTest.rb
@@ -631,6 +631,35 @@ class DBCellInst_TestClass < TestBase
 
   end
 
+  # Cell * variants
+  def test_5_CellPointer
+
+    ly = RBA::Layout::new
+    cell = ly.create_cell("TOP")
+
+    a = RBA::CellInstArray::new(cell, RBA::Trans::new(RBA::Trans::R90))
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::Vector::new(42, -17))
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::ICplxTrans::new(1.5))
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::ICplxTrans::new(1.0, 45, false, RBA::Vector::new))
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::Trans::new(RBA::Trans::R90), RBA::Vector::new(10, 20), RBA::Vector::new(30, 40), 3, 5)
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::Vector::new(42, -17), RBA::Vector::new(10, 20), RBA::Vector::new(30, 40), 3, 5)
+    assert_equal(a.cell_index, cell.cell_index)
+
+    a = RBA::CellInstArray::new(cell, RBA::ICplxTrans::new(1.5), RBA::Vector::new(10, 20), RBA::Vector::new(30, 40), 3, 5)
+    assert_equal(a.cell_index, cell.cell_index)
+
+  end
+
 end
 
 load("test_epilogue.rb")
diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb
index 47dba1771..1fe9057d3 100644
--- a/testdata/ruby/dbReaders.rb
+++ b/testdata/ruby/dbReaders.rb
@@ -29,6 +29,11 @@ class DBReaders_TestClass < TestBase
   def test_common_options
 
     opt = RBA::LoadLayoutOptions::new
+
+    assert_equal(opt.warn_level, 1)
+    opt.warn_level = 2
+    assert_equal(opt.warn_level, 2)
+
     lm = RBA::LayerMap::new
     lm.map(RBA::LayerInfo::new(1, 0), 2, RBA::LayerInfo::new(42, 17))
     opt.set_layer_map(lm, true)