Index: nodes/CNodeHaagwijk/wleiden.conf
===================================================================
--- nodes/CNodeHaagwijk/wleiden.conf	(revision 6566)
+++ nodes/CNodeHaagwijk/wleiden.conf	(revision 7405)
@@ -9,17 +9,12 @@
 $nodetype='CNode';
 $nodename='Haagwijk';
-
 $status='up';
-
 $release="5.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
-
 # edugis x,y 92434,461987
 $X='92434';
 $Y='461987';
-
 $LOKATIE='Beethovenlaan, Leiden';
 
@@ -27,61 +22,43 @@
 TYPE=ethernet
 IP=172.20.144.65/28
-
 DESC=Ethernet naar Haagwijk (bieb)
 SDESC=eth
 SPEED=10240000000
-
 DHCP=no
-
 ED0
 
-$config{'rl0'}=sprintf <<EP1;  # Wandy naar LivingLab
+$config{'rl0'}=sprintf <<EP1;  # Nanostation5 naar LivingLab
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.2.246/30
-
 DESC=a2livinglab
 SDESC=802.11a
 SPEED=10240000000
-
 DHCP=no
-
 EP1
 
-$config{'rl0:0'}=sprintf <<EP10;  # Wandy management
+$config{'rl0:0'}=sprintf <<EP10;  # Nanostation5 management
 TYPE=ethernet naar a-wandy
 IP=172.16.3.85/30
-
 DESC=a-link naar livinglab
 SDESC=802.11a
 SPEED=10240000000
-
 DHCP=no
-
 POINT_TO_POINT=172.16.3.86
-
 MODE=managed
 ESSID=il-zo.livinglab.wleiden.net
 #CHANNEL=36
-
-
 EP10
-
 
 $config{'wi0'}=sprintf <<EW0;  # omni
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=omni 8Dbi
 SDESC=no
 SPEED=11534336
-
 DHCP=10-60
-
-
 MODE=master
 ESSID=ap-omni.Haagwijk.wleiden.net
 CHANNEL=4
-
 POLAR=Ver
 ANTENNA=omni
@@ -91,5 +68,4 @@
 CABLE=9
 HEIGTH=13
-
 EW0
 
@@ -101,11 +77,7 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.1.158
-
-
 MODE=master
 ESSID=il-nw.haagwijk.wleiden.net
-
 CHANNEL=7
-
 POLAR=Hor
 ANTENNA=SD15
@@ -114,9 +86,6 @@
 BEAMWIDTH=40
 CABLE=8
-
 DHCP=no
-
 EW1
-
 
 $config{'wi2'}=sprintf <<EW2;  # Link naar LCPL 
@@ -127,11 +96,7 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.1.174
-
-
 MODE=master
 ESSID=il-o.haagwijk.wleiden.net
-
 CHANNEL=1
-
 POLAR=Hor
 ANTENNA=SD15
@@ -140,11 +105,6 @@
 BEAMWIDTH=40
 CABLE=8
-
 DHCP=no
-
 EW2
-
-
-
 
 $config{'wi2:0'}=sprintf <<EW20;  # Link naar Lorentzhof
@@ -155,11 +115,6 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.1.229
-
-
 DHCP=no
-
 EW20
-
-
 
 $config{'wi3'}=sprintf <<EW3;  # Link naar het ROCl  
@@ -170,11 +125,7 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.3.90
-
-
 MODE=master
 ESSID=il-z.haagwijk.wleiden.net
-
 CHANNEL=1
-
 POLAR=Hor
 ANTENNA=SD15
@@ -183,7 +134,5 @@
 BEAMWIDTH=40
 CABLE=8
-
-DHCP=130-190
-
+DHCP=no
 EW3