diff --git a/gui/diagram_canvas.cpp b/gui/diagram_canvas.cpp
index ca484d9..78ed03e 100644
--- a/gui/diagram_canvas.cpp
+++ b/gui/diagram_canvas.cpp
@@ -93,10 +93,10 @@ void DiagramCanvas::mousePressEvent(QMouseEvent *e)
                                       vertex = vertexList[vertex_index];
 
                                       paint( currentEdge, TRUE );
-                                      currentEdge->vertex[end]->~Vertex();
-                                      currentEdge->vertex[end] = vertex;
+                                      currentEdge->vertex[end_]->~Vertex();
+                                      currentEdge->vertex[end_] = vertex;
 
-                                      EndData *ed = new EndData( currentEdge, end );
+                                      EndData *ed = new EndData( currentEdge, end_ );
 
                                       vertex->incidentEndData.insert(
                                              vertex->incidentEndData.end(), ed );
@@ -116,7 +116,7 @@ void DiagramCanvas::mousePressEvent(QMouseEvent *e)
                               {
                                       Vertex *vertex, *new_vertex;
 
-                                      vertex = currentEdge->vertex[end];
+                                      vertex = currentEdge->vertex[end_];
                                       vertexList.insert( vertexList.end(), vertex );
 
                                       edgeList.insert( edgeList.end(), currentEdge );
@@ -200,8 +200,8 @@ void DiagramCanvas::mousePressEvent(QMouseEvent *e)
 
                              paint( currentEdge, TRUE );
 
-                             vertex = currentEdge->vertex[begin];
-                             currentEdge->vertex[end]->~Vertex();
+                             vertex = currentEdge->vertex[begin_];
+                             currentEdge->vertex[end_]->~Vertex();
 
                              currentEdge->~Edge();
 
@@ -432,8 +432,8 @@ void DiagramCanvas::paint_all( QRect& r )
 
         QPoint v, v1, v2, p1, p2 ;
 
-        p1 = e->vertex[begin]->position;
-        p2 = e->vertex[end]->position;
+        p1 = e->vertex[begin_]->position;
+        p2 = e->vertex[end_]->position;
         p.drawLine( p1, p2 );
 /*
       if (e->edge_type==singular)
@@ -485,8 +485,8 @@ void DiagramCanvas::paint_all( QRect& r )
             p.setClipRegion( mask );
             QPoint v, v1, v2, p1, p2 ;
 
-            p1 = e->vertex[begin]->position;
-            p2 = e->vertex[end]->position;
+            p1 = e->vertex[begin_]->position;
+            p2 = e->vertex[end_]->position;
             p.drawLine( p1, p2 );
 /*
             if (e->edge_type==singular)
@@ -513,8 +513,8 @@ void DiagramCanvas::paint_all( QRect& r )
         {
             QPoint v, v1, v2, p1, p2 ;
 
-            p1 = e->vertex[begin]->position;
-            p2 = e->vertex[end]->position;
+            p1 = e->vertex[begin_]->position;
+            p2 = e->vertex[end_]->position;
             p.drawLine( p1, p2 );
 /*
             if (e->edge_type==singular)
@@ -568,8 +568,8 @@ void DiagramCanvas::paint( Edge *edge, bool paint_over )
 
     QPoint v, v1, v2, p1, p2 ;
 
-    p1 = edge->vertex[begin]->position;
-    p2 = edge->vertex[end]->position;
+    p1 = edge->vertex[begin_]->position;
+    p2 = edge->vertex[end_]->position;
     p.drawLine( p1, p2 );
 /*
     if (edge->edge_type==singular && edge_color != NEW_EDGE)
@@ -600,7 +600,7 @@ void DiagramCanvas::redrawMovedEdge( QMouseEvent *e )
 
     paint( currentEdge, TRUE);
 
-    currentEdge->vertex[end]->position = newEndPoint;
+    currentEdge->vertex[end_]->position = newEndPoint;
 
     paint( currentEdge, FALSE );
 }
@@ -640,8 +640,8 @@ void DiagramCanvas::delete_dragged_crossings()
     {
         Crossing *c = *i;
 
-        if ( c->over->vertex[begin] == draggedVertex || c->over->vertex[end] == draggedVertex
-                || c->under->vertex[begin] == draggedVertex || c->under->vertex[end] == draggedVertex )
+        if ( c->over->vertex[begin_] == draggedVertex || c->over->vertex[end_] == draggedVertex
+                || c->under->vertex[begin_] == draggedVertex || c->under->vertex[end_] == draggedVertex )
         {
             crossingList.erase( i );
             update();
diff --git a/gui/diagram_canvas.h b/gui/diagram_canvas.h
index 065a6e4..a0daac4 100644
--- a/gui/diagram_canvas.h
+++ b/gui/diagram_canvas.h
@@ -24,7 +24,7 @@ struct Crossing;
 
 
 enum JoinState  { no_join, join };
-enum EndType  {begin = 0, end = 1};
+enum EndType  {begin_ = 0, end_ = 1};
 enum EdgeType {singular = 0, drilled = 1};
 
 #define	THICK 3
diff --git a/gui/edge.cpp b/gui/edge.cpp
index 73e0156..5cba9cc 100644
--- a/gui/edge.cpp
+++ b/gui/edge.cpp
@@ -27,15 +27,15 @@ Vertex::~Vertex()
 
 Edge::Edge( Vertex *vertex1, Vertex *vertex2 )
 {
-    vertex[begin] = vertex1;
-    vertex[end] = vertex2;
+    vertex[begin_] = vertex1;
+    vertex[end_] = vertex2;
 
     cuff_id = -1;
     thickness = THIN;
     selected = FALSE;
 
-    EndData *ed1 = new EndData( this, begin );
-    EndData *ed2 = new EndData( this, end );
+    EndData *ed1 = new EndData( this, begin_ );
+    EndData *ed2 = new EndData( this, end_ );
 
     vertex1->incidentEndData.insert( vertex1->incidentEndData.end(), ed1 );
 
@@ -50,9 +50,9 @@ Edge::~Edge()
 
 void Edge::compute_equation_coefficients()
 {
-    a = vertex[end]->position.y() - vertex[begin]->position.y();
-    b = vertex[begin]->position.x() - vertex[end]->position.x();
-    c = -a*vertex[begin]->position.x() -  b*vertex[begin]->position.y();
+    a = vertex[end_]->position.y() - vertex[begin_]->position.y();
+    b = vertex[begin_]->position.x() - vertex[end_]->position.x();
+    c = -a*vertex[begin_]->position.x() -  b*vertex[begin_]->position.y();
 }
 
 
@@ -65,8 +65,8 @@ double Edge::distance_from_edge( QPoint point )
 
     if ( a == 0 && b == 0 )
     {
-        double u = (double) vertex[begin]->position.x();
-        double v = (double) vertex[begin]->position.y();
+        double u = (double) vertex[begin_]->position.x();
+        double v = (double) vertex[begin_]->position.y();
 
         return sqrt( (x0-u)*(x0-u) + (y0-v)*(y0-v) );
     }
@@ -87,10 +87,10 @@ double Edge::projection_to_edge( QPoint point )
     double x = ( b*b*x0 - a*b*y0 - a*c ) / ( a*a + b*b );
     double y = ( -a*b*x0 + a*a*y0 - b*c ) / ( a*a + b*b );
 
-    if ( abs((double) (vertex[begin]->position.x() - vertex[end]->position.x()) ) >= 5 )
-        return ( x - vertex[begin]->position.x() ) / ( vertex[end]->position.x() - vertex[begin]->position.x() );
+    if ( abs((double) (vertex[begin_]->position.x() - vertex[end_]->position.x()) ) >= 5 )
+        return ( x - vertex[begin_]->position.x() ) / ( vertex[end_]->position.x() - vertex[begin_]->position.x() );
     else
-        return ( y - vertex[begin]->position.y() ) / ( vertex[end]->position.y() - vertex[begin]->position.y() );
+        return ( y - vertex[begin_]->position.y() ) / ( vertex[end_]->position.y() - vertex[begin_]->position.y() );
 }
 
 
diff --git a/gui/general_position.cpp b/gui/general_position.cpp
index dff4a54..38339a8 100644
--- a/gui/general_position.cpp
+++ b/gui/general_position.cpp
@@ -48,7 +48,7 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
 
     if ( edgeList.size() == 0 ) return TRUE;
 
-    if (proximity(edge->vertex[begin]->position, edge->vertex[end]->position))
+    if (proximity(edge->vertex[begin_]->position, edge->vertex[end_]->position))
           return FALSE;
 
     joinState = no_join;
@@ -57,7 +57,7 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
      *  First check whether edge->end is near to some vertex
      */
 
-    for ( i=0; i<vertexList.size(); ++i ) if ( proximity( edge->vertex[end]->position, vertexList[i]->position ) )
+    for ( i=0; i<vertexList.size(); ++i ) if ( proximity( edge->vertex[end_]->position, vertexList[i]->position ) )
     { 
          joinState = join;
          *vertex_index = i;
@@ -72,9 +72,9 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
     if (joinState == join)
     for(i=0;i<vertexList[*vertex_index]->incidentEndData.size();i++)
     {
-          int type = (vertexList[*vertex_index]->incidentEndData[i]->type == begin) ? end : begin;
+          int type = (vertexList[*vertex_index]->incidentEndData[i]->type == begin_) ? end_ : begin_;
           
-          if (vertexList[*vertex_index]->incidentEndData[i]->edge->vertex[type] == edge->vertex[begin] )
+          if (vertexList[*vertex_index]->incidentEndData[i]->edge->vertex[type] == edge->vertex[begin_] )
                  return FALSE;
     }
 
@@ -84,14 +84,14 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
 
 
     for ( i=0; i<edgeList.size(); ++i )
-    if ( proximity( edge->vertex[end]->position, edgeList[i] ) )
+    if ( proximity( edge->vertex[end_]->position, edgeList[i] ) )
     {
         if (joinState == no_join &&
-             (edge->vertex[begin] != edgeList[i]->vertex[begin]
-             || edge->vertex[begin] != edgeList[i]->vertex[end] ))
+             (edge->vertex[begin_] != edgeList[i]->vertex[begin_]
+             || edge->vertex[begin_] != edgeList[i]->vertex[end_] ))
                 return FALSE;
-        else if ( edgeList[i]->vertex[end] != vertexList[*vertex_index]
-                   && edgeList[i]->vertex[begin] != vertexList[*vertex_index])
+        else if ( edgeList[i]->vertex[end_] != vertexList[*vertex_index]
+                   && edgeList[i]->vertex[begin_] != vertexList[*vertex_index])
                 return FALSE;
     }
 
@@ -101,7 +101,7 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
      */
     for ( i=0; i<vertexList.size(); ++i )
     if ( i != *vertex_index
-           && edge->vertex[begin] != vertexList[i]
+           && edge->vertex[begin_] != vertexList[i]
            && proximity( vertexList[i]->position, edge ))
         return FALSE;
     /*
@@ -117,7 +117,7 @@ bool DiagramCanvas::completed_edge_general_position( Edge *edge, int *vertex_ind
     vector<double> cp;
     double t1, t2;
     QPoint crossing_point;
-    double len = abs(point_to_complex( edge->vertex[end]->position - edge->vertex[begin]->position));
+    double len = abs(point_to_complex( edge->vertex[end_]->position - edge->vertex[begin_]->position));
 
     for ( i=0; i<edgeList.size(); ++i ) if ( edge_intersect( edge, edgeList[i], &t1, &t2, &crossing_point ) )
     {
@@ -162,8 +162,8 @@ bool DiagramCanvas::dragged_vertex_general_position()
 
     for(i=0;i<edgeList.size();i++)
     if (proximity(draggedVertex->position,edgeList[i])
-        && edgeList[i]->vertex[begin] != draggedVertex
-        && edgeList[i]->vertex[end] != draggedVertex )
+        && edgeList[i]->vertex[begin_] != draggedVertex
+        && edgeList[i]->vertex[end_] != draggedVertex )
         return FALSE;
 
     for(ed_it = draggedVertex->incidentEndData.begin();
@@ -172,8 +172,8 @@ bool DiagramCanvas::dragged_vertex_general_position()
     {
         for(i=0;i<vertexList.size();i++)
         if (proximity(vertexList[i]->position,(*ed_it)->edge)
-            && (*ed_it)->edge->vertex[begin] != draggedVertex
-            && (*ed_it)->edge->vertex[end] != draggedVertex )
+            && (*ed_it)->edge->vertex[begin_] != draggedVertex
+            && (*ed_it)->edge->vertex[end_] != draggedVertex )
             return FALSE;
 
         for(i=0;i<crossingList.size();i++)
@@ -190,8 +190,8 @@ bool DiagramCanvas::dragged_vertex_general_position()
           ed_it != draggedVertex->incidentEndData.end();
           ed_it++ )
     {
-        len = abs( point_to_complex( (*ed_it)->edge->vertex[end]->position
-                    - (*ed_it)->edge->vertex[begin]->position));
+        len = abs( point_to_complex( (*ed_it)->edge->vertex[end_]->position
+                    - (*ed_it)->edge->vertex[begin_]->position));
 
         for ( i=0; i<edgeList.size(); ++i ) if ( edgeList[i] != (*ed_it)->edge &&
             edge_intersect( (*ed_it)->edge, edgeList[i], &t1, &t2, &crossing_point ) )
@@ -248,8 +248,8 @@ bool DiagramCanvas::dragged_vertex_general_position()
 
 bool DiagramCanvas::proximity( QPoint point, Edge *edge )
 {
-    double p = abs( point_to_complex( point - edge->vertex[begin]->position ) );
-    double q = abs( point_to_complex( point - edge->vertex[end]->position ) );
+    double p = abs( point_to_complex( point - edge->vertex[begin_]->position ) );
+    double q = abs( point_to_complex( point - edge->vertex[end_]->position ) );
 
     double r = edge->distance_from_edge( point );
     double t = edge->projection_to_edge( point );
@@ -277,10 +277,10 @@ bool DiagramCanvas::edge_intersect( Edge *edge1, Edge *edge2, double *t1, double
 {
     complex<double> z1, z2, z3, z4;
 
-    z1 = point_to_complex( edge1->vertex[begin]->position );
-    z2 = point_to_complex( edge1->vertex[end]->position );
-    z3 = point_to_complex( edge2->vertex[begin]->position );
-    z4 = point_to_complex( edge2->vertex[end]->position );
+    z1 = point_to_complex( edge1->vertex[begin_]->position );
+    z2 = point_to_complex( edge1->vertex[end_]->position );
+    z3 = point_to_complex( edge2->vertex[begin_]->position );
+    z4 = point_to_complex( edge2->vertex[end_]->position );
 
     if ( z1 == z2 || z3 == z4 ) return FALSE;
 
diff --git a/gui/interface.cpp b/gui/interface.cpp
index 4017332..098618b 100644
--- a/gui/interface.cpp
+++ b/gui/interface.cpp
@@ -98,7 +98,7 @@ void DiagramCanvas::clearDiagram()
     if (edge_creation_in_progress)
     {
          paint( currentEdge, TRUE );
-         currentEdge->vertex[end]->~Vertex();
+         currentEdge->vertex[end_]->~Vertex();
          currentEdge->~Edge();
          edge_creation_in_progress = FALSE;
     }
@@ -150,8 +150,8 @@ void DiagramCanvas::saveDiagram( QTextStream &stream )
     {
           edgeList[i]->edge_id = i;
 	  stream << i << "\t";
-	  stream << edgeList[i]->vertex[begin]->vertex_id << "\t";
-	  stream << edgeList[i]->vertex[end]->vertex_id << "\t";
+	  stream << edgeList[i]->vertex[begin_]->vertex_id << "\t";
+	  stream << edgeList[i]->vertex[end_]->vertex_id << "\t";
 	  stream << ((edgeList[i]->edge_type == drilled) ? 1 : 0) << "\n";
     }
 
@@ -245,8 +245,8 @@ void DiagramCanvas::deleteSelectedEdges()
     while ( edge_it < edgeList.end() )
     if ((*edge_it)->selected)
     {
-        vertex1 = (*edge_it)->vertex[begin];
-        vertex2 = (*edge_it)->vertex[end];
+        vertex1 = (*edge_it)->vertex[begin_];
+        vertex2 = (*edge_it)->vertex[end_];
 
         paint( *edge_it, TRUE );
 
@@ -350,8 +350,8 @@ void DiagramCanvas::deleteArc( int a )
     while ( edge_it < edgeList.end() )
     if ((*edge_it)->arc_id == a && (*edge_it)->edge_type == singular )
     {
-        vertex1 = (*edge_it)->vertex[begin];
-        vertex2 = (*edge_it)->vertex[end];
+        vertex1 = (*edge_it)->vertex[begin_];
+        vertex2 = (*edge_it)->vertex[end_];
 
         paint( *edge_it, TRUE );
 
@@ -504,8 +504,8 @@ void DiagramCanvas::reassign_arcs( int a )
                                 		for(k=0;k<edgeList[j]->vertex[m]->incidentEndData.size(); k++ )
                                 		if (edgeList[j]->vertex[m]->incidentEndData[k]->edge == edgeList[j] )
                                 			edgeList[j]->vertex[m]->incidentEndData[k]->type =
-                                				(edgeList[j]->vertex[m]->incidentEndData[k]->type==begin) ?
-										end : begin;
+                                				(edgeList[j]->vertex[m]->incidentEndData[k]->type==begin_) ?
+										end_ : begin_;
 
 					vector<Crossing *>::iterator c_it;
 					c_it = crossingList.begin();
@@ -591,8 +591,8 @@ void DiagramCanvas::reassign_links( bool arc_was_drilled )
 			if (	edgeList[j]->edge_type == singular &&
 				edgeList[j]->arc_id == i )
 			{
-				if (	edgeList[j]->vertex[begin]->incidentEndData.size() != 2 ||
-					edgeList[j]->vertex[end]->incidentEndData.size() != 2 )
+				if (	edgeList[j]->vertex[begin_]->incidentEndData.size() != 2 ||
+					edgeList[j]->vertex[end_]->incidentEndData.size() != 2 )
 					arc_is_loop = FALSE;
 			}
 
@@ -601,11 +601,11 @@ void DiagramCanvas::reassign_links( bool arc_was_drilled )
 			if (	edgeList[j]->edge_type == singular &&
 				edgeList[j]->arc_id == i )
 			{
-				if (	edgeList[j]->vertex[begin]->incidentEndData.size() == 2 &&
-					edgeList[j]->vertex[begin]->link_id > -1 )
+				if (	edgeList[j]->vertex[begin_]->incidentEndData.size() == 2 &&
+					edgeList[j]->vertex[begin_]->link_id > -1 )
 				{
-					dead_id = edgeList[j]->vertex[begin]->link_id;
-					edgeList[j]->vertex[begin]->link_id = -1;
+					dead_id = edgeList[j]->vertex[begin_]->link_id;
+					edgeList[j]->vertex[begin_]->link_id = -1;
 
 					for(k = 0; k < vertexList.size();k++)
 					if (	vertexList[k]->link_id > dead_id )
@@ -617,11 +617,11 @@ void DiagramCanvas::reassign_links( bool arc_was_drilled )
 						edgeList[k]->link_id--;
 				}
 
-				if (	edgeList[j]->vertex[end]->incidentEndData.size() == 2 &&
-					edgeList[j]->vertex[end]->link_id > -1 )
+				if (	edgeList[j]->vertex[end_]->incidentEndData.size() == 2 &&
+					edgeList[j]->vertex[end_]->link_id > -1 )
 				{
-                                        dead_id = edgeList[j]->vertex[end]->link_id;
-                                        edgeList[j]->vertex[end]->link_id = -1;
+                                        dead_id = edgeList[j]->vertex[end_]->link_id;
+                                        edgeList[j]->vertex[end_]->link_id = -1;
 
                                         for(k = 0; k < vertexList.size();k++)
                                         if (    vertexList[k]->link_id > dead_id )
@@ -688,10 +688,10 @@ void DiagramCanvas::getCrossingSigns()
     {
         Crossing *c = crossingList[i];
 
-        z1 = point_to_complex( c->over->vertex[begin]->position );
-        z2 = point_to_complex( c->over->vertex[end]->position );
-        z3 = point_to_complex( c->under->vertex[begin]->position );
-        z4 = point_to_complex( c->under->vertex[end]->position );
+        z1 = point_to_complex( c->over->vertex[begin_]->position );
+        z2 = point_to_complex( c->over->vertex[end_]->position );
+        z3 = point_to_complex( c->under->vertex[begin_]->position );
+        z4 = point_to_complex( c->under->vertex[end_]->position );
 
         w = ( z3 - z1 ) / ( z2 - z1 );
 
@@ -710,12 +710,12 @@ void DiagramCanvas::ed_angles()
          ed_it != vertexList[i]->incidentEndData.end();
          ed_it++ )
     { 
-        if ((*ed_it)->type == begin)
-             z = point_to_complex( (*ed_it)->edge->vertex[end]->position
-                          - (*ed_it)->edge->vertex[begin]->position );
+        if ((*ed_it)->type == begin_)
+             z = point_to_complex( (*ed_it)->edge->vertex[end_]->position
+                          - (*ed_it)->edge->vertex[begin_]->position );
         else
-             z = point_to_complex( (*ed_it)->edge->vertex[begin]->position
-                          - (*ed_it)->edge->vertex[end]->position );
+             z = point_to_complex( (*ed_it)->edge->vertex[begin_]->position
+                          - (*ed_it)->edge->vertex[end_]->position );
 
         (*ed_it)->angle = -arg(z);/* minus???? */
     }
@@ -792,12 +792,12 @@ Triangulation *DiagramCanvas::outputTriangulation()
 
                 meeting->component[j] = vertexList[i]->link_id;
 
-                if (ed->type == begin)
+                if (ed->type == begin_)
                 {
                       if (e->crossings.empty())
                       {
-                              meeting->strand[j] = get_strand(e, e->vertex[end]);
-                              meeting->neighbor[j] = e->vertex[end]->vertex_id;
+                              meeting->strand[j] = get_strand(e, e->vertex[end_]);
+                              meeting->neighbor[j] = e->vertex[end_]->vertex_id;
                       }
                       else
                       {
@@ -814,8 +814,8 @@ Triangulation *DiagramCanvas::outputTriangulation()
                 {
                      if (e->crossings.empty())
                       {
-                              meeting->strand[j] = get_strand(e, e->vertex[begin]);
-                              meeting->neighbor[j] = e->vertex[begin]->vertex_id;
+                              meeting->strand[j] = get_strand(e, e->vertex[begin_]);
+                              meeting->neighbor[j] = e->vertex[begin_]->vertex_id;
                       }
                       else
                       {
@@ -857,8 +857,8 @@ Triangulation *DiagramCanvas::outputTriangulation()
 
           if ( (other = get_prev_crossing( e, c)) == NULL)
           {
-                meeting->strand[0] = get_strand( e, e->vertex[begin] );
-                meeting->neighbor[0] = e->vertex[begin]->vertex_id;
+                meeting->strand[0] = get_strand( e, e->vertex[begin_] );
+                meeting->neighbor[0] = e->vertex[begin_]->vertex_id;
           }
           else
           {
@@ -868,8 +868,8 @@ Triangulation *DiagramCanvas::outputTriangulation()
 
           if ( (other = get_next_crossing( e, c)) == NULL)
           {
-                meeting->strand[2] = get_strand( e, e->vertex[end] );
-                meeting->neighbor[2] = e->vertex[end]->vertex_id;
+                meeting->strand[2] = get_strand( e, e->vertex[end_] );
+                meeting->neighbor[2] = e->vertex[end_]->vertex_id;
           }
           else
           {
@@ -884,8 +884,8 @@ Triangulation *DiagramCanvas::outputTriangulation()
 
           if ( (other = get_prev_crossing( e, c)) == NULL)
           {
-                meeting->strand[1] = get_strand( e, e->vertex[begin] );
-                meeting->neighbor[1] = e->vertex[begin]->vertex_id;
+                meeting->strand[1] = get_strand( e, e->vertex[begin_] );
+                meeting->neighbor[1] = e->vertex[begin_]->vertex_id;
           }
           else
           {
@@ -895,8 +895,8 @@ Triangulation *DiagramCanvas::outputTriangulation()
 
           if ( (other = get_next_crossing( e, c)) == NULL)
           {
-                meeting->strand[3] = get_strand( e, e->vertex[end] );
-                meeting->neighbor[3] = e->vertex[end]->vertex_id;
+                meeting->strand[3] = get_strand( e, e->vertex[end_] );
+                meeting->neighbor[3] = e->vertex[end_]->vertex_id;
           }
           else
           {
@@ -1111,7 +1111,7 @@ void DiagramCanvas::assign_arcs()
                                                 for(int k=0;k<e1->vertex[j]->incidentEndData.size(); k++ )
                                                 if (e1->vertex[j]->incidentEndData[k]->edge == e1 )
                                                         e1->vertex[j]->incidentEndData[k]->type =
-                                                                (e1->vertex[j]->incidentEndData[k]->type==begin) ? end : begin;
+                                                                (e1->vertex[j]->incidentEndData[k]->type==begin_) ? end_ : begin_;
 
 						vector<Crossing *>::iterator c_it;
 						c_it = crossingList.begin();
@@ -1302,7 +1302,7 @@ void DiagramCanvas::assign_cuffs()
 
 			while ( TRUE )
 			{
-				type = (type == begin) ? end : begin;
+				type = (type == begin_) ? end_ : begin_;
 
 				Vertex *v = e->vertex[type];
 
diff --git a/gui/misc_functions.cpp b/gui/misc_functions.cpp
index 35cf800..a2a3838 100644
--- a/gui/misc_functions.cpp
+++ b/gui/misc_functions.cpp
@@ -64,7 +64,7 @@ complex<double> point_to_complex( QPoint p )
 
 QPoint time_to_point( Edge *edge, double t )
 {
-    return (1 - t)*edge->vertex[begin]->position + t*edge->vertex[end]->position;
+    return (1 - t)*edge->vertex[begin_]->position + t*edge->vertex[end_]->position;
 }
 
 bool ed_more( EndData *ed1, EndData *ed2 )
diff --git a/snappea/code/Makefile b/snappea/code/Makefile
index 58013ae..2cc2f8a 100644
--- a/snappea/code/Makefile
+++ b/snappea/code/Makefile
@@ -18,3 +18,6 @@ depend:
 	gcc -MM -I../headers *.c > Makefile.dependencies
 
 include Makefile.dependencies
+
+clean:
+	rm liborb.a ${OBJS}
diff --git a/snappea/code/liborb.a b/snappea/code/liborb.a
deleted file mode 100644
index 92b3a0d..0000000
Binary files a/snappea/code/liborb.a and /dev/null differ
diff --git a/snappea/headers/config.h b/snappea/headers/config.h
index 74030f2..9c6bbf9 100644
--- a/snappea/headers/config.h
+++ b/snappea/headers/config.h
@@ -152,7 +152,7 @@
 #define RELEASED 1
 
 /* Define if you have inline */
-#define HAVE_INLINE 1
+// #define HAVE_INLINE 1
 
 /* Define if you need to hide the static definitions of inline functions */
 /* #undef HIDE_INLINE_STATIC */