diff --git a/.gitignore b/.gitignore
index f641c13521..d8124490a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ libconftest.dylib*
 *.a
 *.pb.cc
 *.pb.h
+*.dat
 
 *.log
 *.trs
@@ -146,3 +147,6 @@ make
 # CLion
 .idea
 cmake-build-debug
+
+# clang-check
+*.plist
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 7dede8bfc3..7ce4c07e4a 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -53,6 +53,8 @@ Dash Core is now available at `./src/dashd`
 
 Before running, you may create an empty configuration file:
 
+    mkdir -p "/Users/${USER}/Library/Application Support/DashCore"
+
     touch "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
 
     chmod 600 "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
diff --git a/doc/tor.md b/doc/tor.md
index 3abbfc1e34..8c3cbb24fd 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -19,7 +19,7 @@ outgoing connections, but more is possible.
 
 	-onion=ip:port  Set the proxy server to use for Tor hidden services. You do not
 	                need to set this if it's the same as -proxy. You can use -noonion
-	                to explicitly disable access to hidden service.
+	                to explicitly disable access to hidden services.
 
 	-listen         When using -proxy, listening is disabled by default. If you want
 	                to run a hidden service (see next section), you'll need to enable
@@ -30,12 +30,15 @@ outgoing connections, but more is possible.
 	-seednode=X     SOCKS5. In Tor mode, such addresses can also be exchanged with
 	                other P2P nodes.
 
-	-onlynet=tor    Only connect to .onion nodes and drop IPv4/6 connections.
+	-onlynet=onion  Make outgoing connections only to .onion addresses. Incoming
+	                connections are not affected by this option. This option can be
+	                specified multiple times to allow multiple network types, e.g.
+	                ipv4, ipv6, or onion.
 
 An example how to start the client if the Tor proxy is running on local host on
 port 9050 and only allows .onion nodes to connect:
 
-	./dashd -onion=127.0.0.1:9050 -onlynet=tor -listen=0 -addnode=ssapp53tmftyjmjb.onion
+	./dashd -onion=127.0.0.1:9050 -onlynet=onion -listen=0 -addnode=ssapp53tmftyjmjb.onion
 
 In a typical situation, this suffices to run behind a Tor proxy:
 
diff --git a/src/dummywallet.cpp b/src/dummywallet.cpp
index c3f85e0ec7..3bfbdd5f11 100644
--- a/src/dummywallet.cpp
+++ b/src/dummywallet.cpp
@@ -33,17 +33,49 @@ public:
 
 void DummyWalletInit::AddWalletOptions() const
 {
-    std::vector<std::string> opts = {"-createwalletbackups=<n>", "-disablewallet", "-instantsendnotify=<cmd>",
-        "-keypool=<n>", "-rescan=<mode>", "-salvagewallet", "-spendzeroconfchange", "-upgradewallet",
-        "-wallet=<path>", "-walletbackupsdir=<dir>", "-walletbroadcast", "-walletdir=<dir>",
-        "-walletnotify=<cmd>", "-zapwallettxes=<mode>", "-discardfee=<amt>", "-fallbackfee=<amt>",
-        "-mintxfee=<amt>", "-paytxfee=<amt>", "-txconfirmtarget=<n>", "-hdseed=<hex>", "-mnemonic=<text>",
-        "-mnemonicpassphrase=<text>", "-usehd", "-keepass", "-keepassid=<id>", "-keepasskey=<key>",
-        "-keepassname=<name>", "-keepassport=<port>", "-enablecoinjoin", "-coinjoinamount=<n>",
-        "-coinjoinautostart", "-coinjoindenomsgoal=<n>", "-coinjoindenomshardcap=<n>", "-coinjoinmultisession",
-        "-coinjoinrounds=<n>", "-coinjoinsessions=<n>", "-dblogsize=<n>", "-flushwallet", "-privdb",
-        "-walletrejectlongchains"};
-    gArgs.AddHiddenArgs(opts);
+    gArgs.AddHiddenArgs({
+        "-avoidpartialspends",
+        "-createwalletbackups=<n>",
+        "-disablewallet",
+        "-instantsendnotify=<cmd>",
+        "-keypool=<n>",
+        "-rescan=<mode>",
+        "-salvagewallet",
+        "-spendzeroconfchange",
+        "-upgradewallet",
+        "-wallet=<path>",
+        "-walletbackupsdir=<dir>",
+        "-walletbroadcast",
+        "-walletdir=<dir>",
+        "-walletnotify=<cmd>",
+        "-zapwallettxes=<mode>",
+        "-discardfee=<amt>",
+        "-fallbackfee=<amt>",
+        "-mintxfee=<amt>",
+        "-paytxfee=<amt>",
+        "-txconfirmtarget=<n>",
+        "-hdseed=<hex>",
+        "-mnemonic=<text>",
+        "-mnemonicpassphrase=<text>",
+        "-usehd",
+        "-keepass",
+        "-keepassid=<id>",
+        "-keepasskey=<key>",
+        "-keepassname=<name>",
+        "-keepassport=<port>",
+        "-enablecoinjoin",
+        "-coinjoinamount=<n>",
+        "-coinjoinautostart",
+        "-coinjoindenomsgoal=<n>",
+        "-coinjoindenomshardcap=<n>",
+        "-coinjoinmultisession",
+        "-coinjoinrounds=<n>",
+        "-coinjoinsessions=<n>",
+        "-dblogsize=<n>",
+        "-flushwallet",
+        "-privdb",
+        "-walletrejectlongchains"
+    });
 }
 
 const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();