diff --git a/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy-tcp.lua b/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy-tcp.lua
index ce1775afb..1d9f8fe3d 100644
--- a/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy-tcp.lua
+++ b/luci-app-haproxy-tcp/luasrc/model/cbi/haproxy-tcp.lua
@@ -50,8 +50,8 @@ o.datatype    = "range(1, 10)"
 o.rmempty     = false
 
 
-o = s:option(DynamicList, "upstreams", translate("UpStream Server"), translate("e.g. [123.123.123.123:65101 check]"))
-o.placeholder = "123.123.123.123:65101"
+o = s:option(DynamicList, "upstreams", translate("UpStream Server"), translate("e.g. [123.123.123.123:65101 weight 1 check]"))
+o.placeholder = "123.123.123.123:65101 weight 1 check"
 o.rmempty     = false
 
 return m
diff --git a/luci-app-haproxy-tcp/root/etc/init.d/haproxy-tcp b/luci-app-haproxy-tcp/root/etc/init.d/haproxy-tcp
index c7c0dd836..a38f0c875 100755
--- a/luci-app-haproxy-tcp/root/etc/init.d/haproxy-tcp
+++ b/luci-app-haproxy-tcp/root/etc/init.d/haproxy-tcp
@@ -21,8 +21,8 @@ _err() {
 validate_section() {
 	uci_validate_section haproxy-tcp general "${1}" \
 		'enable:bool:0'            \
-		'retries:uinteger:1'       \
-		'timeout:uinteger:1000'    \
+		'retries:uinteger:3'       \
+		'timeout:uinteger:4000'    \
 		'startup_delay:uinteger:5' \
 		'admin_stats:port:7777'    \
 		'listen:string'            \
@@ -61,13 +61,13 @@ start_instance() {
 
 	defaults
 	    mode tcp
-	    retries ${retries:-2}
-	    timeout connect ${timeout:-1000}
-	    timeout client ${timeout:-1000}
-	    timeout server ${timeout:-1000}
+	    retries ${retries}
+	    timeout connect ${timeout}
+	    timeout client ${timeout}
+	    timeout server ${timeout}
 
 	listen admin_stats
-	    bind 0.0.0.0:${admin_stats:-7777}
+	    bind 0.0.0.0:${admin_stats}
 	    mode http
 	    stats uri /
 	    stats refresh 10s
@@ -109,7 +109,6 @@ start_service() {
 
 stop_service() {
 	killall $PROG_NAME
-	service_stop $PROG_NAME
 	rm -rf /var/etc/$PROG_NAME.cfg
 }
 
diff --git a/luci-app-haproxy-tcp/root/etc/uci-defaults/luci-haproxy-tcp b/luci-app-haproxy-tcp/root/etc/uci-defaults/41_luci-haproxy-tcp
similarity index 90%
rename from luci-app-haproxy-tcp/root/etc/uci-defaults/luci-haproxy-tcp
rename to luci-app-haproxy-tcp/root/etc/uci-defaults/41_luci-haproxy-tcp
index a8923938c..5735f8406 100644
--- a/luci-app-haproxy-tcp/root/etc/uci-defaults/luci-haproxy-tcp
+++ b/luci-app-haproxy-tcp/root/etc/uci-defaults/41_luci-haproxy-tcp
@@ -12,4 +12,5 @@ EOF
 
 /etc/init.d/haproxy-tcp enable
 
+rm -f /tmp/luci-indexcache
 exit 0