Index: nodes/CNodeCeTIM3/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM3/wleiden.conf	(revision 4208)
+++ nodes/CNodeCeTIM3/wleiden.conf	(revision 4212)
@@ -84,5 +84,5 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  #Interlinks NW
+$config{'wi0'}=sprintf <<EW;  #Interlinks NW
 TYPE=wireless
 IP=172.16.0.73/30
@@ -94,4 +94,6 @@
 
 DHCP=no
+
+
 
 OSPF_BROADCAST=no
@@ -111,7 +113,21 @@
 HEIGTH=45
 
-EW0
-
-$config{'wi0:0'}=sprintf <<EW;  # link naar Cope
+EW
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar Rabo
+TYPE=wireless
+IP=172.16.0.97/30
+DESC=Link naar Rabo
+SDESC=2rabo
+SPEED=11534336
+POINT_TO_POINT=172.16.0.98
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.98
+
+DHCP=no
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;  # link naar Cope
 TYPE=wireless
 IP=172.16.0.25/30
@@ -126,7 +142,7 @@
 DHCP=no
 
-EW
-
-$config{'wi0:1'}=sprintf <<EW;  # link naar OblC
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # link naar OblC
 TYPE=wireless
 IP=172.16.0.161/30
@@ -140,7 +156,7 @@
 
 DHCP=no
-EW
-
-$config{'wi0:2'}=sprintf <<EW;
+EW02
+
+$config{'wi0:3'}=sprintf <<EW03;
 TYPE=wireless
 IP=172.16.0.181/30
@@ -151,7 +167,7 @@
 
 DHCP=no
-EW
-
-$config{'wi0:3'}=sprintf <<EW;  # link naar Burcht
+EW03
+
+$config{'wi0:4'}=sprintf <<EW04;  # link naar Burcht
 TYPE=wireless
 IP=172.16.0.105/30
@@ -165,5 +181,5 @@
 
 DHCP=no
-EW
+EW04
 
 $config{'wi1'}=sprintf <<EW1;  #Interlinks ZO
Index: nodes/CNodeHoutmarkt/wleiden.conf
===================================================================
--- nodes/CNodeHoutmarkt/wleiden.conf	(revision 4208)
+++ nodes/CNodeHoutmarkt/wleiden.conf	(revision 4212)
@@ -41,5 +41,5 @@
 
 
-$config{'wi0'}=sprintf <<EW0;   # Omni
+$config{'wi0'}=sprintf <<EW;   # Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -65,16 +65,19 @@
 HEIGTH=15
 
-EW0
+EW
 
-$config{'wi1'}=sprintf <<EW;
+$config{'wi1'}=sprintf <<EW;  # active test AP
 TYPE=wireless
-IP=172.16.1.190/30
-DESC=Link naar Rabo
-SDESC=2rabo
+IP=172.19.8.81/30
+DESC=TestAp
+SDESC=2locatie
 SPEED=11534336
-POINT_TO_POINT=172.16.1.189
+POINT_TO_POINT=
 
-MODE=managed
-ESSID=il-zo.rabo.wleiden.net
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=
+
+MODE=master
+ESSID=il-test.houtmarkt.wleiden.net
 
 POLAR=Vert
@@ -90,5 +93,5 @@
 EW
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Cetim2 
+$config{'wi2'}=sprintf <<EW;  # link naar Cetim2 
 TYPE=wireless
 IP=172.16.0.42/30
@@ -118,7 +121,7 @@
 DHCP=no
 
-EW2
+EW
 
-$config{'wi3'}=sprintf <<EW3;  # link naar Som 
+$config{'wi3'}=sprintf <<EW;  # link naar Som 
 TYPE=wireless
 IP=172.16.0.50/30
@@ -147,5 +150,5 @@
 HEIGTH=22
 
-EW3
+EW
 
 
Index: nodes/CNodeRabo/wleiden.conf
===================================================================
--- nodes/CNodeRabo/wleiden.conf	(revision 4208)
+++ nodes/CNodeRabo/wleiden.conf	(revision 4212)
@@ -37,5 +37,5 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # AP omni
+$config{'wi0'}=sprintf <<EW;  # AP omni
 TYPE=wireless
 IP=$master_ip/26
@@ -64,8 +64,8 @@
 HEIGTH=22
 
-EW0
+EW
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Rudi
+$config{'wi1'}=sprintf <<EW;  # link naar Rudi
 TYPE=wireless
 IP=172.16.0.65/30
@@ -93,7 +93,7 @@
 DHCP=no
 
-EW1
+EW
 
-$config{'wi2'}=sprintf <<EW2;  # Link naar AZC
+$config{'wi2'}=sprintf <<EW;  # Link naar AZC
 TYPE=wireless
 IP=172.16.0.221/30  
@@ -121,7 +121,7 @@
 HEIGTH=22
 
-EW2
+EW
 
-$config{'wi2:0'}=sprintf <<EW20;  # link naar Lebkov
+$config{'wi2:0'}=sprintf <<EW0;  # link naar Lebkov
 TYPE=wireless
 IP=172.16.1.17/30
@@ -135,20 +135,22 @@
 
 DHCP=no
-EW20
+EW0
 
 
-$config{'wi3'}=sprintf <<EW;
+$config{'wi3'}=sprintf <<EW;  # link naar CeTIM
 TYPE=wireless
-IP=172.16.1.189/30
-DESC=Link naar Houtmarkt
-SDESC=2houtmarkt
+IP=172.16.0.98/30
+DESC=Link naar CeTIM
+SDESC=2cetim
 SPEED=11534336
-POINT_TO_POINT=172.16.1.190
+POINT_TO_POINT=172.16.0.97
 
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.97
 
-MODE=master
-ESSID=il-zo.houtmarkt.wleiden.net
+MODE=managed
+ESSID=il-nw.cetim3.wleiden.net
 
-CHANNEL=5
+CHANNEL=1
 
 POLAR=Vert
Index: nodes/CNodeSOM/wleiden.conf
===================================================================
--- nodes/CNodeSOM/wleiden.conf	(revision 4208)
+++ nodes/CNodeSOM/wleiden.conf	(revision 4212)
@@ -28,4 +28,8 @@
 
 DHCP=no
+
+OSPF_AREA=211
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
 
 SIS0