Index: src/work/alpar/list_graph.h
===================================================================
--- src/work/alpar/list_graph.h	(revision 491)
+++ src/work/alpar/list_graph.h	(revision 503)
@@ -317,5 +317,5 @@
     public:
       Node() {}
-      Node (Invalid i) { n=-1; }
+      Node (Invalid) { n=-1; }
       bool operator==(const Node i) const {return n==i.n;}
       bool operator!=(const Node i) const {return n!=i.n;}
@@ -504,5 +504,5 @@
  	DynMapBase<Edge>(*m.G), container(m.container)
       {
- 	G->dyn_node_maps.push_back(this);
+ 	G->dyn_edge_maps.push_back(this);
       }
 
@@ -514,5 +514,5 @@
 	DynMapBase<Edge>(*m.G)
       {
-	G->dyn_node_maps.push_back(this);
+	G->dyn_edge_maps.push_back(this);
 	typename std::vector<TT>::const_iterator i;
 	for(typename std::vector<TT>::const_iterator i=m.container.begin();
@@ -1295,9 +1295,9 @@
       }
       else {
-	typename NodeGraphType::Node n;
-	for(n=G.next(edges[it.n].head);
-	    G.valid(n) && nodes[n].first_in == -1;
-	    G.next(n)) ;
-	it.n = (G.valid(n))?-1:nodes[n].first_in;
+	NodeIt n;
+	for(n=next(edges[it.n].head);
+	    valid(n) && nodes[n].first_in == -1;
+	    next(n)) ;
+	it.n = (valid(n))?-1:nodes[n].first_in;
       }
       return it;
@@ -1386,4 +1386,5 @@
 //     }
 
+  public:
     class Node : public NodeGraphType::Node {
       friend class EdgeSet;
@@ -1445,8 +1446,9 @@
     public:
       EdgeIt(const EdgeSet& G) : Edge() {
-      	typename NodeGraphType::Node m;
+	//      	typename NodeGraphType::Node m;
+        NodeIt m;
 	for(G.first(m);
-	    G.valid(m) && nodes[m].first_in == -1;  G.next[m]);
-	n = G.valid(m)?-1:nodes[m].first_in;
+	    G.valid(m) && G.nodes[m].first_in == -1;  G.next(m));
+	n = G.valid(m)?-1:G.nodes[m].first_in;
       }
       EdgeIt (Invalid i) : Edge(i) { }
@@ -1515,5 +1517,5 @@
  	DynMapBase<Edge>(*m.G), container(m.container)
       {
- 	G->dyn_node_maps.push_back(this);
+ 	G->dyn_edge_maps.push_back(this);
       }
 
@@ -1525,5 +1527,5 @@
 	DynMapBase<Edge>(*m.G)
       {
-	G->dyn_node_maps.push_back(this);
+	G->dyn_edge_maps.push_back(this);
 	typename std::vector<TT>::const_iterator i;
 	for(typename std::vector<TT>::const_iterator i=m.container.begin();