diff --git a/luci-app-haproxy-tcp/Makefile b/luci-app-haproxy-tcp/Makefile
index d4f09a47d..765a69389 100644
--- a/luci-app-haproxy-tcp/Makefile
+++ b/luci-app-haproxy-tcp/Makefile
@@ -55,6 +55,7 @@ define Package/luci-app-haproxy-tcp/prerm
 /etc/init.d/haproxy-tcp disable
 /etc/init.d/haproxy-tcp stop
 rm -f /usr/sbin/haproxy-tcp
+rm -f /etc/hotplug.d/net/90-haproxy
 exit 0
 endef
 
diff --git a/luci-app-haproxy-tcp/preview.png b/luci-app-haproxy-tcp/preview.png
deleted file mode 100644
index 800d928d0..000000000
Binary files a/luci-app-haproxy-tcp/preview.png and /dev/null differ
diff --git a/luci-mod-admin-full/root/etc/hotplug.d/iface/03-macvlan b/luci-mod-admin-full/root/etc/hotplug.d/iface/03-macvlan
index 3091889e5..6278ee4ed 100755
--- a/luci-mod-admin-full/root/etc/hotplug.d/iface/03-macvlan
+++ b/luci-mod-admin-full/root/etc/hotplug.d/iface/03-macvlan
@@ -25,8 +25,6 @@ _setup_interface() {
 	config_get _type "$1" type
 	[ "$_type" = "macvlan" ] || return 0
 	
-	sleep 1
-	
 	uci -q batch <<-EOF
 	set network.$1_dev=device
 	set network.$1_dev.name=$1
diff --git a/mptcp/files/etc/hotplug.d/iface/30-mptcp b/mptcp/files/etc/hotplug.d/iface/30-mptcp
index 6015db82d..6204eba94 100644
--- a/mptcp/files/etc/hotplug.d/iface/30-mptcp
+++ b/mptcp/files/etc/hotplug.d/iface/30-mptcp
@@ -34,12 +34,13 @@ set_default() {
         }
         local iface
         config_get iface "$config" ifname
-        ip route del default
-        ip route add default scope global nexthop via $gateway dev $iface || {
-		#Fallback: use upcomming interface...
-		network_get_gateway gateway $INTERFACE
-		ip route add default scope global nexthop via $gateway dev $INTERFACE
-		logger -t multipath Faild to set default multipath device! Use $INTERFACE as fallback...
+        [ -n "gateway" ] && {
+		ip route replace default via $gateway dev $iface || {
+			#Fallback: use upcomming interface...
+			network_get_gateway gateway $INTERFACE
+			ip route replace default via $gateway dev $INTERFACE
+			logger -t multipath Failed to set default multipath device! Use $INTERFACE as fallback...
+		}
 	}
     }
 }
@@ -47,8 +48,8 @@ set_default() {
 config_load network
 config_foreach set_default interface
 [ $id = 0 ] && {
-        logger -t multipath device $INTERFACE not fount!
-        echo device $INTERFACE not fount!
+        logger -t multipath device $INTERFACE not found!
+        echo device $INTERFACE not found!
         exit 1
 }
 
@@ -73,10 +74,6 @@ multipath $DEVICE $mode
 
 # IPv4 Updates:
 
-local ipaddr
-local gateway
-local network
-local netmask
 network_get_ipaddr  ipaddr  $INTERFACE
 network_get_gateway gateway $INTERFACE
 network_get_subnet  network $INTERFACE
diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index c6849d30c..b05fce993 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -8,7 +8,6 @@ USE_PROCD=1
 start_service() {
         procd_open_instance
         procd_set_param command hotplug-call net
-        procd_set_param respawn
         procd_set_param watch network.globals
         procd_close_instance
 }
diff --git a/openmptcprouter/files/bin/omr-test-speed b/openmptcprouter/files/bin/omr-test-speed
new file mode 100755
index 000000000..87cc98544
--- /dev/null
+++ b/openmptcprouter/files/bin/omr-test-speed
@@ -0,0 +1,7 @@
+#!/bin/sh
+# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
+
+HOST="proof.ovh.net"
+
+trap : HUP INT TERM
+curl http://$HOST/files/10Gio.dat >/dev/null || echo
diff --git a/openmptcprouter/files/bin/otb-test-download-shadowsocks b/openmptcprouter/files/bin/otb-test-download-shadowsocks
deleted file mode 100755
index 9a56661c7..000000000
--- a/openmptcprouter/files/bin/otb-test-download-shadowsocks
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
-
-HOST="proof.ovh.net"
-
-_ipt() {
-	iptables -w -t nat "$1" socks_emitted_by_myself \
-		-d "$HOST" -j socks_redir -m comment --comment "Test download proof"
-}
-
-_chain_exists() {
-	iptables -w -t nat -nL "$1" 1>/dev/null 2>/dev/null
-}
-
-if ! _chain_exists "socks_emitted_by_myself" || ! _chain_exists "socks_redir"; then
-	echo "Couldn't find the iptables chain to plug myself into. Is ss-redir running?"
-	return 1
-fi
-
-trap : HUP INT TERM
-
-_ipt -A
-curl http://$HOST/files/10Gio.dat >/dev/null || echo
-_ipt -D
diff --git a/openmptcprouter/files/etc/uci-defaults/1950-omr b/openmptcprouter/files/etc/uci-defaults/1950-omr
new file mode 100755
index 000000000..135283984
--- /dev/null
+++ b/openmptcprouter/files/etc/uci-defaults/1950-omr
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	set luci.diag.ping=openmptcprouter.com
+	set luci.diag.dns=openmptcprouter.com
+	set luci.diag.route=openmptcprouter.com
+	commit luci
+EOF
+rm -f /tmp/luci-indexcache
+
+exit 0
diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index 0d96e07d4..7402cc49b 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -245,7 +245,7 @@ stop_service() {
 }
 
 service_triggers() {
-	procd_add_reload_interface_trigger wan
+	procd_add_reload_interface_trigger wan*
 	procd_add_reload_trigger shadowsocks-libev
 	procd_open_validate
 	validate_server_section