Index: nodes/CNodeRick/wleiden.yaml
===================================================================
--- nodes/CNodeRick/wleiden.yaml	(revision 10096)
+++ nodes/CNodeRick/wleiden.yaml	(revision 10104)
@@ -3,106 +3,96 @@
 #
 comment   : "None"
-ileiden   : False
-interfaces: "ue1,ue0,ath0,vr2,vr0,vr1"
-latitude  : "4.47100"
-location  : "Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
-longitude : "52.13999"
-masterip  : "172.20.145.1"
-nodename  : "Rick"
-nodetype  : "CNode"
+interfaces: ue1,ue0,ath0,vr2,vr0,vr1
+latitude  : 0
+location  : 'Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden'
+longitude : 0
+masterip  : 172.20.145.1
+release   : 9.0-RELEASE
+nodename  : Rick
+nodetype  : CNode
 rdnap_x   : 92280
 rdnap_y   : 461707
-release   : "9.0-RELEASE"
-remote_access: "riff.vanderzwet.net:2022"
-status    : "up"
+status    : up
+ileiden   : no
+remote_access: riff.vanderzwet.net:2022
+iface_ue1:
+  comment    : 'Lokaal Dev netwerk'
+  compass    : 'None'
+  desc       : 'LokaalDev'
+  dhcp       : '10-20'
+  interface  : 'ue1'
+  ip         : '172.17.23.1/24'
+  mode       : 'ap-wds'
+  sdesc      : '2dev'
+  status     : 'up'
+  type       : 'eth'
 
+iface_ue0:
+  comment    : 'Lokaal netwerk'
+  compass    : 'None'
+  desc       : 'Lokaal'
+  dhcp       : '150-170'
+  interface  : 'ue0'
+  ip         : '172.20.145.129/26'
+  mode       : 'ap-wds'
+  sdesc      : '2desk'
+  status     : 'up'
+  type       : 'eth'
 
 iface_ath0:
-  comment    : "Internal Wireless"
-  interface  : "ath0"
-  ip         : "172.20.145.1/26"
-  desc       : "Internal Wireless"
-  sdesc      : "binnen"
-  mode       : "ap-wds"
-  type       : "11b"
-  channel    : "1"
-  ssid       : "ap-wirelessleiden-rick"
-  dhcp       : "10-60"
-  captive_portal_whitelist: "172.20.145.26"
-  compass    : "None"
-  dhcp_static: "00:22:43:84:32:6d,172.20.145.26;00:22:43:84:32:7d,172.20.145.27"
-  status     : "up"
+  captive_portal_whitelist: '172.20.145.26'
+  channel    : '1'
+  comment    : 'Internal Wireless'
+  compass    : 'None'
+  desc       : 'Internal Wireless'
+  dhcp       : '10-60'
+  dhcp_static: '00:22:43:84:32:6d,172.20.145.26;00:22:43:84:32:7d,172.20.145.27'
+  interface  : 'ath0'
+  ip         : '172.20.145.1/26'
+  mode       : 'ap-wds'
+  sdesc      : 'binnen'
+  ssid       : 'ap-wirelessleiden-rick'
+  status     : 'up'
+  type       : '11b'
 
-
-iface_ue0:
-  comment    : "Lokaal netwerk"
-  interface  : "ue0"
-  ip         : "172.20.145.129/26"
-  desc       : "Lokaal"
-  sdesc      : "2desk"
-  mode       : "ap-wds"
-  type       : "eth"
-  dhcp       : "150-170"
-  compass    : "None"
-  status     : "up"
-
-
-iface_ue1:
-  comment    : "Lokaal Dev netwerk"
-  interface  : "ue1"
-  ip         : "172.17.23.1/24"
-  desc       : "LokaalDev"
-  sdesc      : "2dev"
-  mode       : "ap-wds"
-  type       : "eth"
-  dhcp       : "10-20"
-  compass    : "None"
-  status     : "up"
-
+iface_vr2:
+  comment    : 'Access Point achter'
+  compass    : 'None'
+  desc       : 'Access Point'
+  dhcp       : '70-120'
+  interface  : 'vr2'
+  ip         : '172.20.145.65/26'
+  mode       : 'ap-wds'
+  ns_ip      : '172.20.145.66/26'
+  ns_mac     : '00:15:6d:30:d2:d1'
+  sdesc      : 'binnen'
+  ssid       : 'ap-wirelessleiden-rick-2'
+  status     : 'up'
+  type       : 'eth'
 
 iface_vr0:
-  comment    : "Link to proxy interface"
-  interface  : "vr0"
-  ip         : "172.16.3.97/30"
-  desc       : "Proxy Link"
-  sdesc      : "2proxy"
-  type       : "eth"
-  dhcp       : "False"
-  compass    : "None"
-  status     : "up"
-
+  comment    : 'Link to proxy interface'
+  compass    : 'None'
+  desc       : 'Proxy Link'
+  dhcp       : 'False'
+  interface  : 'vr0'
+  ip         : '172.16.3.97/30'
+  sdesc      : '2proxy'
+  status     : 'up'
+  type       : 'eth'
 
 iface_vr1:
-  comment    : "Link naar Haagwijk"
-  interface  : "vr1"
-  ip         : "172.16.4.148/29"
-  desc       : "Link naar Haagwijk"
-  sdesc      : "2haagwijk"
-  mode       : "station-wds"
-  type       : "eth"
-  ssid       : "il-zw.haagwijk.wleiden.net"
-  dhcp       : "no"
-  bridge_type: "NanoStation5"
-  compass    : "sw"
-  ns_ip      : "172.16.4.147/29"
-  ns_mac     : "00:15:6d:bd:68:99"
-  status     : "up"
+  comment    : 'Link naar Haagwijk'
+  compass    : 'sw'
+  desc       : 'Link naar Haagwijk'
+  dhcp       : 'no'
+  interface  : 'vr1'
+  ip         : '172.16.4.148/29'
+  mode       : 'station-wds'
+  ns_ip      : '172.16.4.147/29'
+  ns_mac     : '00:15:6d:bd:68:99'
+  sdesc      : '2haagwijk'
+  ssid       : 'il-zw.haagwijk.wleiden.net'
+  status     : 'up'
+  type       : 'eth'
 
-
-iface_vr2:
-  comment    : "Access Point achter"
-  interface  : "vr2"
-  ip         : "172.20.145.65/26"
-  desc       : "Access Point"
-  sdesc      : "binnen"
-  mode       : "ap-wds"
-  type       : "eth"
-  ssid       : "ap-wirelessleiden-rick-2"
-  dhcp       : "70-120"
-  bridge_type: "NanoStation2"
-  compass    : "None"
-  ns_ip      : "172.20.145.66/26"
-  ns_mac     : "00:15:6d:30:d2:d1"
-  status     : "up"
-
-