diff --git a/ChangeLog.md b/ChangeLog.md
index 6f6d1f6..d57e0b2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,7 +1,9 @@
 ## ChangeLog
 
+### v0.0.7o
++ Upgrade MMGen to btc_bch tag version
+
 ### v0.0.7n
-+ Upgrade MMGen to aug1hf tag version
 + Install Bitcoin ABC client with disclaimer
 
 ### v0.0.7m
diff --git a/home.mmgen/bin/mmlive-node-start b/home.mmgen/bin/mmlive-node-start
index 292cd5d..17dbd0b 100755
--- a/home.mmgen/bin/mmlive-node-start
+++ b/home.mmgen/bin/mmlive-node-start
@@ -6,15 +6,16 @@ TW_FILE='mmgen-tracking-wallet.dat'
 DB_CACHE_ARG=
 NOLISTEN_ARG=' -listen=0'
 
-while getopts hAa:d:JKos:tTU OPT
+while getopts hAa:d:eJKos:tTU OPT
 do
 	case "$OPT" in
-	h)  printf "  %-16s Start an MMGen Bitcoin Core node\n" "${PROGNAME^^}:"
+	h)  printf "  %-16s Stop a Bitcoin daemon\n" "${PROGNAME^^}:"
 		echo   "  USAGE:           $PROGNAME"
 		echo   "  OPTIONS:   '-h'   Print this help message"
 		echo   "             '-a a' Additional args to be passed to bitcoind (as one arg, quoted)"
 		echo   "             '-A'   Run the Bitcoin ABC hard-fork client"
 		echo   "             '-d c' Set the -dbcache value to 'c' (default: dynamic, based on available memory)"
+		echo   "             '-e    Run a testnet node"
 		echo   "             '-o'   Start in offline mode"
 		echo   "             '-s n' Try connecting to node 'n'"
 		echo   "             '-t'   Testing mode.  Just print the command that would be executed"
@@ -24,10 +25,12 @@ do
 		echo   "             '-K'   Run the Bitcoin ABC client for a dual-node setup (reduced memory, ports 8443/8442)"
 		exit ;;
 	a) ADD_ARGS+=" $OPTARG" ;;
-	K) TWO_DAEMONS=1 ADD_ARGS+=" --bind=127.0.0.1:8443 --rpcbind=localhost:8442 --rpcallowip=127.0.0.1" ;;&
+	e) TESTNET=1 ADD_ARGS+=" --testnet=1" ;;
+	K) TWO_DAEMONS=1 ;;&
 	K|A) echo 'Running Bitcoin ABC hard-fork (BCH) client!'
-	   TW_FILE='mmgen-tracking-wallet-abc.dat'
-	   ADD_ARGS+=" -datadir=$HOME/.bitcoin-abc" EXEC_SUF='-abc' ;;
+	   TW_FILE='mmgen-tracking-wallet-bch.dat'
+	   ABC_ARGS+=" -datadir=$HOME/.bitcoin-abc --rpcbind=127.0.0.1:8442 --rpcallowip=127.0.0.1"
+	   ABC=1 EXEC_SUF='-abc' ;;
 	d) DB_CACHE_ARG=" -dbcache=$OPTARG" ;;
 	o) ADD_ARGS+=" -maxconnections=0" ;;
 	s) ADD_ARGS+=" -addnode=$OPTARG" ;;
@@ -35,13 +38,19 @@ do
 	J) TWO_DAEMONS=1 ;;&
 	J|U) echo 'Running BIP148-UASF-enforcing client!'
 	   EXEC_SUF='-uasfsegwit1.0' ;;
-	T) ADD_ARGS+=" -onlynet=onion -debug=tor" NOLISTEN_ARG= ;;
+	T) TOR=1 ADD_ARGS+=" -onlynet=onion -debug=tor" NOLISTEN_ARG= ;;
 	*)  exit ;;
 	esac
 done
 
 shift $((OPTIND-1))
 
+[ "$TOR" -a "$ABC" ] && ADD_ARGS+=" --bind=127.0.0.1:8443"
+[ "$TESTNET" -a "$ABC" ] && {
+	ABC_ARGS=" -datadir=$HOME/.bitcoin-abc --rpcbind=127.0.0.1:18442 --rpcallowip=127.0.0.1"
+}
+
+#	ADD_ARGS+=" --bind=127.0.0.1:8443"
 if [ ! "$DB_CACHE_ARG" ]; then
 	M=$(cat /proc/meminfo | grep MemAvailable | awk '{ print $2 }')
 	M=$(((M / 1024) - 3000))
@@ -51,7 +60,7 @@ if [ ! "$DB_CACHE_ARG" ]; then
 	[ "$M" ] && DB_CACHE_ARG=" -dbcache=$M"
 fi
 
-CMD="bitcoind$EXEC_SUF -daemon -wallet=$TW_FILE$DB_CACHE_ARG$NOLISTEN_ARG$ADD_ARGS"
+CMD="bitcoind$EXEC_SUF -daemon -wallet=$TW_FILE$DB_CACHE_ARG$NOLISTEN_ARG$ADD_ARGS$ABC_ARGS"
 if [ "$TESTING" ]; then MSG='Would execute'; else MSG='Executing'; fi
 echo "$MSG: $CMD"
 [ ! "$TESTING" ] && eval $CMD
diff --git a/home.mmgen/bin/mmlive-node-stop b/home.mmgen/bin/mmlive-node-stop
new file mode 100755
index 0000000..e9d7f10
--- /dev/null
+++ b/home.mmgen/bin/mmlive-node-stop
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+PROGNAME=`basename $0`
+DESC='Bitcoin Core'
+
+while getopts hAet OPT
+do
+	case "$OPT" in
+	h)  printf "  %-16s Stop an MMGen bitcoind node\n" "${PROGNAME^^}:"
+		echo   "  USAGE:           $PROGNAME"
+		echo   "  OPTIONS:   '-h'   Print this help message"
+		echo   "             '-e'   Stop a testnet node"
+		echo   "             '-A'   Stop the Bitcoin ABC hard-fork client"
+		echo   "             '-t'   Testing mode.  Just print the command that would be executed"
+		exit ;;
+	A) ABC=1 DESC='Bitcoin ABC hard-fork (BCH)' PORT_ARG=' --rpcport=8442' ;;
+	e) TESTNET=1 ADD_ARGS+=' --rpcconnect=127.0.0.1' PORT_ARG=' --rpcport=18332' ;;
+	t) TESTING=1 ;;
+	*)  exit ;;
+	esac
+done
+
+shift $((OPTIND-1))
+
+[ "$TESTNET" -a "$ABC" ] && PORT_ARG=' --rpcport=18442'
+
+CMD="bitcoin-cli$ADD_ARGS$PORT_ARG stop"
+
+if [ "$TESTING" ]; then
+	echo "Would execute: $CMD"
+else
+	echo "Stopping the $DESC client!"
+	eval $CMD
+fi
diff --git a/upgrade/0.0.7/upgrade-n.sh b/upgrade/0.0.7/upgrade-n.sh
index ae0ec66..9482c7e 100755
--- a/upgrade/0.0.7/upgrade-n.sh
+++ b/upgrade/0.0.7/upgrade-n.sh
@@ -1,21 +1,9 @@
 #!/bin/bash
 #:REV: 0.0.7n
-#:DESC: Upgrade MMGen to aug1hf tag version
 #:DESC: Install Bitcoin ABC client with disclaimer
 
 set -e
 
-function upgrade_mmgen {
-	echo "Upgrading MMGen to version '$VER'"
-	(
-		cd /setup/git/MMGenLive/
-		eval "$BUILD_SYSTEM chroot_install_mmgen_user_at_commit 'IN_MMLIVE_SYSTEM=1' 'MMGEN_COMMIT=$VER'"
-	)
-}
-
-VER='aug1hf'
-[ -d ~mmgen/src/mmgen-$VER ] || upgrade_mmgen
-
 VERSION='0.14.6'
 SUBVERSION='-abc'
 CHKSUM='9f37b8ec36a37944b016bbbf07340adb8ba644abb897b2d2e0edeb99ccf709c0'
diff --git a/upgrade/0.0.7/upgrade-o.sh b/upgrade/0.0.7/upgrade-o.sh
new file mode 100755
index 0000000..a872454
--- /dev/null
+++ b/upgrade/0.0.7/upgrade-o.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#:REV: 0.0.7o
+#:DESC: Upgrade MMGen to btc_bch tag version
+
+set -e
+
+function upgrade_mmgen {
+	echo "Upgrading MMGen to version '$VER'"
+	(
+		cd /setup/git/MMGenLive/
+		eval "$BUILD_SYSTEM chroot_install_mmgen_user_at_commit 'IN_MMLIVE_SYSTEM=1' 'MMGEN_COMMIT=$VER'"
+	)
+}
+
+VER='btc_bch'
+[ -d ~mmgen/src/mmgen-$VER ] || upgrade_mmgen
+
+exit 0