diff --git a/src/org/poly2tri/Poly2Tri.scala b/src/org/poly2tri/Poly2Tri.scala
index 51a3593..ca4d006 100644
--- a/src/org/poly2tri/Poly2Tri.scala
+++ b/src/org/poly2tri/Poly2Tri.scala
@@ -87,7 +87,7 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
   val i18 = "data/i.18"
   val tank = "data/tank.dat"
   
-  var currentModel = strange
+  var currentModel = tank
   var doCDT = true
   
   var mouseButton = 0
@@ -173,15 +173,29 @@ class Poly2TriDemo extends BasicGame("Poly2Tri") {
 	    })
    
    if(drawCDT) {
+     
        val draw = if(drawcdtMesh) slCDT.triangleMesh else slCDT.triangles
-       //val draw = slCDT.testTri
+       
 	   draw.foreach( t => {
+	     
+	     for(i <- 0 to 2) {
+	       val s = t.points(i)
+           val e = if(i == 2) t.points(0) else t.points(i + 1)
+           val j = if(i == 0) 2 else if(i == 1) 0 else 1
+           if(t.edges(j))
+             g.setColor(yellow)
+           else
+             g.setColor(red)
+	       g.drawLine(s.x,s.y,e.x,e.y)
+	     }
+         /*
 	     val triangle = new Polygon
 		 triangle.addPoint(t.points(0).x, t.points(0).y)
 		 triangle.addPoint(t.points(1).x, t.points(1).y)
 		 triangle.addPoint(t.points(2).x, t.points(2).y)
 		 g.setColor(red)
 		 g.draw(triangle) 
+         */
 	   })
        
 	   slCDT.debugTriangles.foreach( t => {
diff --git a/src/org/poly2tri/cdt/CDT.scala b/src/org/poly2tri/cdt/CDT.scala
index 0f44a41..c30e60e 100644
--- a/src/org/poly2tri/cdt/CDT.scala
+++ b/src/org/poly2tri/cdt/CDT.scala
@@ -137,7 +137,7 @@ class CDT(val points: List[Point], val segments: List[Segment], iTriangle: Trian
       point.edges.foreach(e => edgeEvent(e, node))
       } catch {
         case e: Exception =>
-          //throw new Exception("Suspect point = " + i)
+          throw new Exception("Suspect point = " + i)
       }
       
     }
diff --git a/src/org/poly2tri/shapes/Segment.scala b/src/org/poly2tri/shapes/Segment.scala
index de563d8..62fbe4e 100644
--- a/src/org/poly2tri/shapes/Segment.scala
+++ b/src/org/poly2tri/shapes/Segment.scala
@@ -58,7 +58,17 @@ class Segment(var p: Point, var q: Point) {
       val tmp = p
       p = q
       q = tmp
-     }
+	} else if(p.y == q.y) {
+	  // If y values are equal, make sure point with smaller x value
+	  // is the the left
+	  if(p.x > q.x) {
+	    val tmp = p
+        p = q
+        q = tmp
+	  } else if(p.x == q.x) {
+        throw new Exception("Duplicate point")
+      }
+	}
 	q.edges += this
   }