Index: scripts/etc/7dtd.conf
===================================================================
--- scripts/etc/7dtd.conf	(revision 15)
+++ scripts/etc/7dtd.conf	(revision 17)
@@ -1,4 +1,4 @@
 #!/bin/sh
-# Version 1
+# Version 4
 
 # Root directory where steamcmd should be placed
@@ -7,8 +7,5 @@
 export STEAM_PASS=
 
-# Root directory of the engine
-export SDTD_ROOT=/home/sdtd/7dtd
-
-# Root of the 7dtd folders, containing e.g. the "instances" folder
+# Root of the 7dtd folders, containing e.g. the "engine", "instances" folders
 export SDTD_BASE=/home/sdtd
 
@@ -21,9 +18,5 @@
 
 # Paths to binaries. Use "which BINARYNAME" to find the path of a single binary
-export CP=/bin/cp
 export RSYNC=/usr/bin/rsync
-export DU=/usr/bin/du
-export FREE=/usr/bin/free
-export AWK=/usr/bin/awk
-export PIDOF=/bin/pidof
 export WINE=/usr/bin/wine
+export XMLSTARLET=/usr/bin/xmlstarlet
Index: scripts/etc/bash_completion.d/7dtd
===================================================================
--- scripts/etc/bash_completion.d/7dtd	(revision 17)
+++ scripts/etc/bash_completion.d/7dtd	(revision 17)
@@ -0,0 +1,24 @@
+. /usr/local/lib/7dtd/common.sh
+
+_sdtd() {
+	local cur prev opts
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+	opts="help $(listCommands)"
+	
+	case "${COMP_CWORD}" in
+		1)
+			COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+			return 0
+			;;
+		*)
+			if [ "$(type -t sdtdCommand$(camelcasePrep ${COMP_WORDS[1]})Expects)" = "function" ]; then
+				COMPREPLY=( $(compgen -W "$(sdtdCommand$(camelcasePrep ${COMP_WORDS[1]})Expects $COMP_CWORD)" -- ${cur}) )
+				return 0
+			fi
+			;;
+	esac
+}
+complete -F _sdtd 7dtd.sh
Index: scripts/etc/init.d/7dtd.sh
===================================================================
--- scripts/etc/init.d/7dtd.sh	(revision 15)
+++ scripts/etc/init.d/7dtd.sh	(revision 17)
@@ -1,4 +1,4 @@
 #!/bin/sh
-# Version 3
+# Version 4
 
 ### BEGIN INIT INFO
@@ -14,28 +14,13 @@
 ### END INIT INFO
 
-. /usr/local/bin/7dtd-common.sh
-checkRootLoadConf
-
 case "$1" in
     start)
-    	echo "Starting all 7dtd instances:"
-        for I in $(getInstanceList); do
-            echo "Starting: $I"
-            /usr/local/bin/7dtd-start.sh $I
-        done
-        echo "All done"
+    	/usr/local/bin/7dtd.sh start "!"
     ;;
     stop)
-    	echo "Stopping all 7dtd instances:"
-        for I in $(getInstanceList); do
-            echo "Stopping: $I"
-            /usr/local/bin/7dtd-kill.sh $I
-            echo
-            echo
-        done
-        echo "All done"
+    	/usr/local/bin/7dtd.sh kill "!"
     ;;
     status)
-        /usr/local/bin/7dtd-instances.sh
+    	/usr/local/bin/7dtd.sh instances
     ;;
     *)
