diff --git a/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java b/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java
index 0994b242..3fe7feaa 100644
--- a/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java
+++ b/diylc/diylc-core/src/org/diylc/netlist/NetlistBuilder.java
@@ -382,7 +382,7 @@ public class NetlistBuilder {
       for (ProjectGraphNode pointNode : entry.getValue()) {
       
         List<ProjectGraphNode> areaNodesBelowPoint = candidateAreaNodes.stream()
-          .filter(x -> x.getArea().getZIndex() < pointNode.getZIndex())
+          .filter(x -> x.getArea().getZIndex() <= pointNode.getZIndex())
           .sorted(Comparator.comparing(x -> x.getArea().getZIndex(), Comparator.reverseOrder()))
           .collect(Collectors.toList());
         
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index b36ee17c..c667c737 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
index 0e77b5d5..5cf87a44 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
@@ -308,14 +308,21 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
     }
     
     for (Point2D p : controlPoints) {
-      if (outlineMode) {
+      if (outlineMode) {
+        g2d.setColor(Constants.TRANSPARENT_COLOR);
+        drawingObserver.startTrackingContinuityArea(true);
+        g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
+        drawingObserver.stopTrackingContinuityArea();
+        
         g2d.setColor(theme.getOutlineColor());
-        g2d.drawRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
+        g2d.drawRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);        
       } else {
         g2d.setColor(CIRCLE_COLOR);
         g2d.fillOval((int)(p.getX() - circleDiameter / 2), (int)(p.getY() - circleDiameter / 2), circleDiameter, circleDiameter);
-        g2d.setColor(METAL_COLOR);
-        g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
+        g2d.setColor(METAL_COLOR);
+        drawingObserver.startTrackingContinuityArea(true);
+        g2d.fillRect((int)(p.getX() - lugWidth / 2), (int)(p.getY() - lugHeight / 2), lugWidth, lugHeight);
+        drawingObserver.stopTrackingContinuityArea();
       }
     }
   }
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
index 35f2836c..208ca8bd 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerPanel.java
@@ -279,10 +279,10 @@ public class PotentiometerPanel extends AbstractPotentiometer {
           g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
         }
         if (!outlineMode) {
-          if (i == 3)
+          if (i >= 3 && i <= 6)
             drawingObserver.startTrackingContinuityArea(true);
           g2d.fill(shape);
-          if (i == 3)
+          if (i >= 3 && i <= 6)
             drawingObserver.stopTrackingContinuityArea();
         }
         g2d.setComposite(oldComposite);
diff --git a/diylc/diylc-swing/dict.txt b/diylc/diylc-swing/dict.txt
index 7c7e3f0d..5f715562 100644
--- a/diylc/diylc-swing/dict.txt
+++ b/diylc/diylc-swing/dict.txt
@@ -49,7 +49,6 @@ AWG
 Alternate
 And
 Angle Offset
-Apply Model
 B-C-E     BJT
 Background
 Box
@@ -94,7 +93,6 @@ G-D-S     MOSFET
 G-O-I     REGULATOR
 G-S-D     JFET
 G-S-D     MOSFET
-GF1
 Generate DIYLC Netlist (excl. Switches)
 Generate DIYLC Netlist (incl. Switches)
 Gray
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index b36ee17c..c667c737 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 643977a4..68b8515b 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
index 2d3feac7..50b04529 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/ActionFactory.java
@@ -1988,7 +1988,7 @@ public class ActionFactory {
 
         @Override
         public void complete(List<Netlist> res) {
-          LOG.info("Finished fenerating netlist");
+          LOG.info("Finished generating netlist");
           if (res == null) {
             swingUI.showMessage("The generated netlist is empty, nothing to show.", "DIYLC Netlist",
                 ISwingUI.INFORMATION_MESSAGE);