diff --git a/Makefile b/Makefile
index 1225fed..1897130 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@
 
 all: $(PROGRAMS)
 
-nlsr: nlsr.c nlsr_ndn.c nlsr_npl.c  nlsr_adl.c nlsr_lsdb.c nlsr_route.c utility.c
-	$(CC) $(CFLAGS) nlsr.c nlsr_ndn.c nlsr_npl.c nlsr_adl.c nlsr_lsdb.c nlsr_route.c utility.c -o nlsr $(LIBS)
+nlsr: nlsr.c nlsr_ndn.c nlsr_npl.c  nlsr_adl.c nlsr_lsdb.c nlsr_route.c nlsr_npt.c nlsr_fib.c utility.c
+	$(CC) $(CFLAGS) nlsr.c nlsr_ndn.c nlsr_npl.c nlsr_adl.c nlsr_lsdb.c nlsr_route.c nlsr_npt.c nlsr_fib.c utility.c -o nlsr $(LIBS)
 
 clean:
 	rm -f *.o
diff --git a/nlsr_route.c b/nlsr_route.c
index 61bf3dc..c3dc3ac 100644
--- a/nlsr_route.c
+++ b/nlsr_route.c
@@ -350,7 +350,8 @@
 
 	struct hashtb_enumerator ee;
     	struct hashtb_enumerator *e = &ee; 	
-    	int res,ret;
+    	int res;
+	int ret=-1;
 
    	hashtb_start(nlsr->map, e);
     	res = hashtb_seek(e, router, strlen(router), 0);
@@ -539,11 +540,6 @@
 		face=strtok_r(NULL,sep,&rem);
 		metric=strtok_r(NULL,sep,&rem);
 
-		//printf("		Link %d	 	\n",i+1);
-		//printf("		Neighbor		 : %s	\n",rtr_id);
-		//printf("		Neighbor Length		 : %s	\n",length);
-		//printf("		Connecting Face		 : %s	\n",face);
-		//printf("		Metric			 : %s	\n",metric);
 
 		add_next_hop_router(rtr_id);
 
@@ -553,11 +549,6 @@
 			length=strtok_r(NULL,sep,&rem);
 			face=strtok_r(NULL,sep,&rem);
 			metric=strtok_r(NULL,sep,&rem);
-			//printf("		Link %d	 	\n",i+1);
-			//printf("		Neighbor		 : %s	\n",rtr_id);
-			//printf("		Neighbor Length		 : %s	\n",length);
-			//printf("		Connecting Face		 : %s	\n",face);
-			//printf("		Metric			 : %s	\n",metric);
 
 			add_next_hop_router(rtr_id);
 	
@@ -601,6 +592,6 @@
 void 
 do_old_routing_table_updates()
 {
-	
+		
 }