diff --git a/Richtfunk/bb-fux-kern/etc/config/batman-adv b/Richtfunk/bb-fux-kern/etc/config/batman-adv
new file mode 100644
index 0000000..19e44e0
--- /dev/null
+++ b/Richtfunk/bb-fux-kern/etc/config/batman-adv
@@ -0,0 +1,7 @@
+
+config mesh 'bat0'
+	option gw_mode 'client'
+	option orig_interval '5000'
+	option hop_penalty '5'
+	option multicast_mode '0'
+
diff --git a/Richtfunk/bb-fux-kern/etc/config/network b/Richtfunk/bb-fux-kern/etc/config/network
index 7a6d36f..71e3f58 100644
--- a/Richtfunk/bb-fux-kern/etc/config/network
+++ b/Richtfunk/bb-fux-kern/etc/config/network
@@ -47,34 +47,34 @@ config interface 'ccchh'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'          
+	option igmp_snooping '0'
+
+config switch_vlan
+	option vlan '8'
+	option ports '0t 2t'
+	option device 'switch0'
+
+config interface 'bb_fux_mw_3g_tanz'
+	option ifname 'eth0.8'
+	option macaddr 'de:ad:be:ef:90:1b'
+	option proto 'gluon_mesh'
+	option fixed_mtu '1'
+	option transitive '1'
+	option igmp_snooping '0'
+
+config switch_vlan
+	option vlan '9'
+	option ports '0t 2t'
+	option device 'switch0'
 
-config switch_vlan                   
-        option vlan '8'               
-        option ports '0t 2t'          
-        option device 'switch0'       
-                                     
-config interface 'bb_fux_mw_3g_tanz'              
-        option ifname 'eth0.8'       
-        option macaddr 'de:ad:be:ef:90:1b'
-        option proto 'gluon_mesh'         
-        option fixed_mtu '1'          
-        option transitive '1'             
-        option igmp_snooping '0'      
-                                      
-config switch_vlan     
-        option vlan '9'        
-        option ports '0t 2t'   
-        option device 'switch0'
-                  
 config interface 'bb_fux_hof_1'
-        option ifname 'eth0.9'
-        option macaddr 'de:ad:be:ef:90:1c'
-        option proto 'gluon_mesh'
-        option fixed_mtu '1'
-        option transitive '1'
-        option igmp_snooping '0'
-                               
+	option ifname 'eth0.9'
+	option macaddr 'de:ad:be:ef:90:1c'
+	option proto 'gluon_mesh'
+	option fixed_mtu '1'
+	option transitive '1'
+	option igmp_snooping '0'
+
 config switch_vlan
 	option vlan '10'
 	option ports '0t 2t'
@@ -86,7 +86,7 @@ config interface 'bb_fux_12'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'          
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '11'
@@ -99,7 +99,7 @@ config interface 'bb_fux_17'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'          
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '12'
@@ -112,7 +112,7 @@ config interface 'bb_fux_23'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '13'
@@ -125,7 +125,7 @@ config interface 'bb_fux_28'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '20'
@@ -138,7 +138,7 @@ config interface 'zeise26'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '21'
@@ -151,7 +151,7 @@ config interface 'pgkaltona'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '22'
@@ -164,7 +164,7 @@ config interface 'werkhof'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '23'
@@ -177,7 +177,7 @@ config interface 'doormann22'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
 config switch_vlan
 	option vlan '26'
@@ -190,21 +190,21 @@ config interface 'artfiles'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
+
+config switch_vlan
+	option vlan '35'
+	option ports '0t 2t'
+	option device 'switch0'
+
+config interface 'fcsp'
+	option ifname 'eth0.35'
+	option macaddr 'de:ad:be:ef:90:19'
+	option proto 'gluon_mesh'
+	option fixed_mtu '1'
+	option transitive '1'
+	option igmp_snooping '0'
 
-config switch_vlan                        
-        option vlan '35'                  
-        option ports '0t 2t'              
-        option device 'switch0'           
-                                          
-config interface 'fcsp'                 
-        option ifname 'eth0.35'           
-        option macaddr 'de:ad:be:ef:90:19'
-        option proto 'gluon_mesh'         
-        option fixed_mtu '1'              
-        option transitive '1'             
-        option igmp_snooping '0'          
-                                          
 config interface 'wan'
 	option ifname 'eth0.2'
 	option type 'bridge'
@@ -220,13 +220,13 @@ config interface 'client'
 	option reqprefix 'no'
 	option macaddr 'f8:1a:67:d8:df:d2'
 	option peerdns '1'
-	list ifname 'eth0.1'
-	list ifname 'eth0.6'
-	list ifname 'bat0'
 	option robustness '3'
 	option query_interval '2000'
 	option query_response_interval '500'
 	option sourcefilter '0'
+	list ifname 'eth0.1'
+	list ifname 'eth0.6'
+	list ifname 'bat0'
 
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
@@ -278,23 +278,19 @@ config interface 'mesh_lan'
 	option type 'bridge'
 	option macaddr 'c2:0d:9f:de:d0:94'
 
-config interface 'ibss_radio0'
+config interface 'mesh_radio0'
 	option proto 'gluon_mesh'
 
-config interface 'ibss_radio1'
+config interface 'mesh_radio1'
 	option proto 'gluon_mesh'
 
 config interface 'bat0'
 	option multicast_router '2'
 	option ifname 'bat0'
 	option macaddr 'f8:1a:67:d8:df:d2'
-	option learning '0'
+	option learning '1'
 	option proto 'none'
 
-config interface 'client_lan'
-	option unicast_flood '0'
-	option ifname 'eth0.1'
-
 config device 'local_node_dev'
 	option macaddr '16:41:95:40:f7:dc'
 	option ifname 'br-client'
@@ -303,13 +299,13 @@ config device 'local_node_dev'
 
 config interface 'local_node'
 	option ifname 'local-node'
-	option ipaddr '10.112.0.1'
-	option ip6addr '2a03:2267::1/128'
-	option netmask '255.255.192.0'
+	option ipaddr '10.112.96.1'
+	option ip6addr '2a03:2267:2::1/128'
+	option netmask '255.255.224.0'
 	option proto 'static'
 
 config route6 'local_node_route6'
-	option target '2a03:2267::/64'
+	option target '2a03:2267:2::/64'
 	option gateway '::'
 	option interface 'client'
 
diff --git a/Richtfunk/bb-hafen122-kern/etc/config/network b/Richtfunk/bb-hafen122-kern/etc/config/network
index 62d54c4..05cde3e 100644
--- a/Richtfunk/bb-hafen122-kern/etc/config/network
+++ b/Richtfunk/bb-hafen122-kern/etc/config/network
@@ -41,12 +41,12 @@ config interface 'stpaulikirche'
 	option proto 'gluon_mesh'
 	option fixed_mtu '1'
 	option transitive '1'
-        option igmp_snooping '0'
+	option igmp_snooping '0'
 
-config switch_vlan             
-        option vlan '5'       
-        option ports '0t 1t'   
-        option device 'switch0'
+config switch_vlan
+	option vlan '5'
+	option ports '0t 1t'
+	option device 'switch0'
 
 config interface 'wartung'
 	option proto 'static'
@@ -54,7 +54,6 @@ config interface 'wartung'
 	option ipaddr '192.168.112.18'
 	option netmask '255.255.255.0'
 
-
 config interface 'wan'
 	option ifname 'eth0'
 	option multicast_querier '0'
@@ -76,9 +75,6 @@ config route6 'wan6_unreachable'
 	option gateway '::'
 	option interface 'loopback'
 
-config interface 'ibss_radio0'
-	option proto 'gluon_mesh'
-
 config interface 'mesh_wan'
 	option ifname 'br-wan'
 	option auto '0'
@@ -108,17 +104,6 @@ config interface 'client'
 	option sourcefilter '0'
 	list ifname 'bat0'
 
-config interface 'bat0'
-	option multicast_router '2'
-	option ifname 'bat0'
-	option macaddr 'ec:08:6b:3f:d3:78'
-	option learning '0'
-	option proto 'none'
-
-config interface 'client_lan'
-	option unicast_flood '0'
-	option ifname 'eth1'
-
 config interface 'mesh_vpn'
 	option ifname 'mesh-vpn'
 	option transitive '1'
@@ -126,6 +111,16 @@ config interface 'mesh_vpn'
 	option fixed_mtu '1'
 	option proto 'gluon_mesh'
 
+config interface 'mesh_radio0'
+	option proto 'gluon_mesh'
+
+config interface 'bat0'
+	option multicast_router '2'
+	option ifname 'bat0'
+	option macaddr 'ec:08:6b:3f:d3:78'
+	option learning '1'
+	option proto 'none'
+
 config device 'local_node_dev'
 	option macaddr '16:41:95:40:f7:dc'
 	option ifname 'br-client'
@@ -134,13 +129,13 @@ config device 'local_node_dev'
 
 config interface 'local_node'
 	option ifname 'local-node'
-	option ipaddr '10.112.0.1'
-	option ip6addr '2a03:2267::1/128'
-	option netmask '255.255.192.0'
+	option ipaddr '10.112.96.1'
+	option ip6addr '2a03:2267:2::1/128'
+	option netmask '255.255.224.0'
 	option proto 'static'
 
 config route6 'local_node_route6'
-	option target '2a03:2267::/64'
+	option target '2a03:2267:2::/64'
 	option gateway '::'
 	option interface 'client'