Index: scripts/usr/local/lib/7dtd/commands/instances.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 18)
+++ scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 19)
@@ -3,5 +3,5 @@
 
 
-sdtdCommandInstances() {
+sdtdSubcommandInstancesList() {
 	printf "%-*s | %-*s | %-*s | %-*s\n" 20 "Instance name" 8 "Running" 7 "Players" 5 "Port"
 	printf -v line "%*s-+-%*s-+-%*s-+-%*s\n" 20 " " 8 " " 7 " " 5 " "
@@ -22,11 +22,135 @@
 		printf "%-*s | %*s |   %2s/%2d | %5d\n" 20 "$I" 8 "$run" $cur $max $port
 	done
-	exit 0
+}
+
+sdtdSubcommandInstancesCreate() {
+	while : ; do
+		readInstanceName
+		[ $(isValidInstance "$INSTANCE") -eq 0 ] && break
+		echo "Instance name already in use."
+		INSTANCE=
+	done
+	echo
+	
+	local IPATH=$(getInstancePath "$INSTANCE")
+	mkdir -p "$IPATH" 2>/dev/null
+
+	if [ $(configTemplateExists) -eq 1 ]; then
+		local USETEMPLATE
+		while : ; do
+			read -p "Use the config template? [Yn] " USETEMPLATE
+			USETEMPLATE=${USETEMPLATE:-Y}
+			case $USETEMPLATE in
+				y|Y)
+					cp $SDTD_BASE/templates/config.xml $IPATH/config.xml
+					loadCurrentConfigValues "$INSTANCE"
+					break
+					;;
+				n|N)
+					break
+					;;
+			esac
+		done
+	fi
+	configEditAll
+	echo
+	configSetAutoParameters "$INSTANCE"
+	echo
+	echo "Saving"
+	
+	if [ ! -f $IPATH/config.xml ]; then
+		echo "<ServerSettings/>" > $IPATH/config.xml
+	fi
+	saveCurrentConfigValues "$INSTANCE"
+	if [ -f "$SDTD_BASE/templates/admins.xml" ]; then
+		cp "$SDTD_BASE/templates/admins.xml" "$IPATH/"
+	fi
+	chown -R $SDTD_USER.$SDTD_GROUP $IPATH
+	echo "Done"
+}
+
+sdtdSubcommandInstancesEdit() {
+	if [ $(isValidInstance "$1") -eq 0 ]; then
+		echo "No instance given or not a valid instance!"
+		return
+	fi
+
+	if [ $(isRunning "$1") -eq 0 ]; then
+		INSTANCE=$1
+		loadCurrentConfigValues "$1"
+		configEditAll
+		echo
+		configSetAutoParameters "$INSTANCE"
+		echo
+		echo "Saving"
+		saveCurrentConfigValues "$1"
+		echo "Done"
+	else
+		echo "Instance $1 is currently running. Please stop it first."
+	fi
+}
+
+sdtdSubcommandInstancesDelete() {
+	if [ $(isValidInstance "$1") -eq 0 ]; then
+		echo "No instance given or not a valid instance!"
+		return
+	fi
+
+	if [ $(isRunning "$1") -eq 0 ]; then
+		local SECCODE=$(dd if=/dev/urandom bs=1 count=100 2>/dev/null \
+			| tr -cd '[:alnum:]' | head -c5)
+		local SECCODEIN
+		echo
+		echo "WARNING: Do you really want to delete the following instance?"
+		echo "    $1"
+		echo "This will delete all of its configuration and save data."
+		echo "If you REALLY want to continue enter the following security code:"
+		echo "    $SECCODE"
+		echo
+		read -p "Security code: " -e SECCODEIN
+		if [ "$SECCODE" = "$SECCODEIN" ]; then
+			rm -R "$(getInstancePath "$1")"
+			echo "Done"
+		else
+			echo "Security code did not match, aborting."
+		fi
+	else
+		echo "Instance $1 is currently running. Please stop it first."
+	fi
+}
+
+sdtdCommandInstances() {
+	SUBCMD=$1
+	shift
+	case $SUBCMD in
+		list)
+			sdtdSubcommandInstancesList "$@"
+			;;
+		create)
+			sdtdSubcommandInstancesCreate "$@"
+			;;
+		edit)
+			sdtdSubcommandInstancesEdit "$@"
+			;;
+		delete)
+			sdtdSubcommandInstancesDelete "$@"
+			;;
+		*)
+			sdtdCommandInstancesHelp
+			;;
+	esac
 }
 
 sdtdCommandInstancesHelp() {
-	echo "Usage: $(basename $0) instances"
-	echo
-	echo "List all defined instances and their status."
+	line() {
+		printf "  %-*s %s\n" 19 "$1" "$2"
+	}
+
+	echo "Usage: $(basename $0) instances <subcommand>"
+	echo "Subcommands are:"
+	line "list" "List all defined instances and their status."
+	line "create" "Create a new instance"
+	line "edit <instance>" "Edit an existing instance"
+	line "delete <instance>" "Delete an existing instance"
 }
 
@@ -34,2 +158,18 @@
 	echo "List all defined instances"
 }
+
+sdtdCommandInstancesExpects() {
+	case $1 in
+		2)
+			echo "list create edit delete"
+			;;
+		3)
+			case $2 in
+				edit|delete)
+					echo "$(getInstanceList)"
+					;;
+			esac
+			;;
+	esac
+}
+
Index: scripts/usr/local/lib/7dtd/commands/status.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/status.sh	(revision 18)
+++ scripts/usr/local/lib/7dtd/commands/status.sh	(revision 19)
@@ -53,5 +53,4 @@
 
 	echo
-	exit 0
 }
 
Index: scripts/usr/local/lib/7dtd/commands/updateengine.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 18)
+++ scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 19)
@@ -7,5 +7,5 @@
 	for I in $(getInstanceList); do
 		if [ $(isRunning $I) -eq 1 ]; then
-			echo "At least one instance is still running."
+			echo "At least one instance is still running (\"$I\")."
 			echo "Before updating the engine please stop all instances!"
 			return