Index: scripts/usr/local/lib/7dtd/commands/instances.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 353)
+++ scripts/usr/local/lib/7dtd/commands/instances.sh	(revision 478)
@@ -60,5 +60,4 @@
 				y|Y)
 					cp $SDTD_BASE/templates/config.xml $IPATH/config.xml
-					loadCurrentConfigValues "$INSTANCE"
 					break
 					;;
@@ -70,14 +69,12 @@
 		echo
 	fi
-	configEditAll configQueryValue
-	echo
-	configSetAutoParameters "$INSTANCE"
-	echo
-	echo "Saving"
 	
 	if [ ! -f $IPATH/config.xml ]; then
-		echo "<ServerSettings/>" > $IPATH/config.xml
+		cp $SDTD_BASE/engine/serverconfig.xml $IPATH/config.xml
 	fi
-	saveCurrentConfigValues "$INSTANCE"
+	
+	$EDITOR $IPATH/config.xml
+	configSetAutoParameters "$INSTANCE"
+	
 	if [ -f "$SDTD_BASE/templates/admins.xml" ]; then
 		cp "$SDTD_BASE/templates/admins.xml" "$IPATH/"
@@ -94,54 +91,8 @@
 		
 	if [ $(isRunning "$1") -eq 0 ]; then
-		INSTANCE=$1
-		loadCurrentConfigValues "$1"
+		local INSTANCE=$1
+		local IPATH=$(getInstancePath "$INSTANCE")
 
-		while : ; do
-			echo "What section of the config do you want to edit?"
-			local i=0
-			local sects=()
-			for S in $(listConfigEditFuncs); do
-				(( i++ ))
-				sects[$i]=$S
-				printf "  %2d: %s\n" $i "$S"
-			done
-			echo
-			echo "   W: Save and exit"
-			echo "   Q: Exit WITHOUT saving"
-
-			local SEC
-			while : ; do
-				read -p "Section number: " SEC
-				SEC=$(lowercase $SEC)
-				if [ $(isANumber $SEC) -eq 1 ]; then
-					if [ $SEC -ge 1 -a $SEC -le $i ]; then
-						break
-					fi
-				else
-					if [ "$SEC" = "q" -o "$SEC" = "w" ]; then
-						break
-					fi
-				fi
-				echo "Not a valid section number!"
-			done
-			echo
-			
-			case "$SEC" in
-				q)
-					echo "Not saving"
-					break
-					;;
-				w)
-					configSetAutoParameters "$INSTANCE"
-					echo "Saving"
-					saveCurrentConfigValues "$1"
-					echo "Done"
-					break
-					;;
-				*)
-					configEdit${sects[$SEC]} configQueryValue
-					echo
-			esac
-		done
+		$EDITOR $IPATH/config.xml
 	else
 		echo "Instance $1 is currently running. Please stop it first."
@@ -184,8 +135,7 @@
 	fi
 		
-	INSTANCE=$1
-	loadCurrentConfigValues "$1"
-
-	configEditAll printConfigValue
+	local INSTANCE=$1
+	local IPATH=$(getInstancePath "$INSTANCE")
+	cat $IPATH/config.xml
 }
 
Index: scripts/usr/local/lib/7dtd/commands/updateengine.sh
===================================================================
--- scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 353)
+++ scripts/usr/local/lib/7dtd/commands/updateengine.sh	(revision 478)
@@ -76,6 +76,6 @@
 	if [ "$CHECKONLY" = "yes" ]; then
 		local LOCAL=$(getLocalEngineVersion)
-		local REMOTE=$(getBuildId $(getLocalBranch))
-		local REMOTETIME=$(getBuildUpdateTime $(getLocalBranch))
+		local REMOTE=$(getRemoteBuildId $(getLocalBranch))
+		local REMOTETIME=$(getRemoteBuildUpdateTime $(getLocalBranch))
 		
 		echo "Installed:"
@@ -91,6 +91,6 @@
 		for I in $(getBranchNames); do
 			if [[ $I != test* ]] || [ "$SHOWINTERNAL" = "yes" ]; then
-				local BUILD=$(getBuildId $I)
-				local CREATED=$(getBuildUpdateTime $I)
+				local BUILD=$(getRemoteBuildId $I)
+				local CREATED=$(getRemoteBuildUpdateTime $I)
 				printf "%-*s | %*s | %2s\n" 22 "$I" 8 "$BUILD" "$CREATED"
 			fi
@@ -107,6 +107,6 @@
 			for I in $(getBranchNames); do
 				if [[ $I != test* ]] || [ "$SHOWINTERNAL" = "yes" ]; then
-					local BUILD=$(getBuildId $I)
-					local CREATED=$(getBuildUpdateTime $I)
+					local BUILD=$(getRemoteBuildId $I)
+					local CREATED=$(getRemoteBuildUpdateTime $I)
 					if [ $BUILD -gt $MAXREMOTE ]; then
 						MAXREMOTE=$BUILD
@@ -134,10 +134,10 @@
 
 	local LOCAL=$(getLocalEngineVersion)
-	local REMOTE=$(getBuildId $BRANCHNAME)
+	local REMOTE=$(getRemoteBuildId $BRANCHNAME)
 
 	if [ "$FORCED" = "yes" -o $REMOTE -gt $LOCAL ]; then
 		echo "A newer version of the engine is available."
 		echo "Local build id:     $LOCAL (installed on $(getLocalEngineUpdateTime))"
-		echo "Available build id: $REMOTE (from $(getBuildUpdateTime $BRANCHNAME))"
+		echo "Available build id: $REMOTE (from $(getRemoteBuildUpdateTime $BRANCHNAME))"
 		echo
 
@@ -222,68 +222,2 @@
 	fi
 }
-
-# Get the latest remote (on Steam) engine version numbers etc
-updateRemoteEngineInfo() {
-	local DOCHECK=no
-	if [ ! -e /tmp/7dtd-appinfo ]; then
-		DOCHECK=yes
-	else
-		AGE=$((`date +%s` - `stat -L --format %Y /tmp/7dtd-appinfo`))
-		if [ $AGE -gt 600 ]; then
-			DOCHECK=yes
-		fi
-	fi
-	if [ "$DOCHECK" = "yes" ]; then
-		echo "Updating version information..."
-		rm /root/Steam/appcache/appinfo.vdf
-		cd $SDTD_BASE/steamcmd
-
-		./steamcmd.sh +login anonymous +app_info_request 294420 +app_info_update +app_info_update 1 +app_info_print 294420 +quit | grep -A 1000 \"294420\" 2>/dev/null > /tmp/7dtd-appinfo
-	
-		local BUILDID=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"public\" | grep -B 10 \} --max-count=1 | grep \"buildid\" | cut -d\" -f4)
-
-		if [ $(isANumber "$BUILDID") -eq 0 ]; then
-			rm -f /tmp/7dtd-appinfo
-		fi
-	fi
-}
-
-# Get the latest build id (on Steam)
-# Params:
-#   1. Branch name
-# Returns:
-#   "?" if data could not be retrieved
-#   BuildId otherwise
-getBuildId() {
-	local BUILDID=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"buildid\" | cut -d\" -f4)
-
-	if [ $(isANumber "$BUILDID") -eq 0 ]; then
-		echo "?"
-	else
-		echo $BUILDID
-	fi
-}
-
-# Get the update time of the latest build (on Steam)
-# Params:
-#   1. Branch name
-# Returns:
-#   "?" if data could not be retrieved
-#   Update timestamp otherwise
-getBuildUpdateTime() {
-	local TIMESTAMP=$(grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -A 1000 \"$1\" | grep -B 10 \} --max-count=1 | grep \"timeupdated\" | cut -d\" -f4)
-	
-	if [ $(isANumber "$TIMESTAMP") -eq 0 ]; then
-		echo "?"
-	else
-		date --date="@${TIMESTAMP}" "+%Y-%m-%d %H:%M:%S"
-	fi
-}
-
-# Get a list of available branch names, blank separated
-# Returns:
-#   Blank separated list of branch names (can be empty if an error occured)
-getBranchNames() {
-	grep -A 1000 \"branches\" /tmp/7dtd-appinfo | grep -E '^[[:space:]]*"[^"]+"[[:space:]]*$' | tail --lines=+2 | cut -d\" -f2
-}
-