diff --git a/lib/geth_commands.js b/lib/geth_commands.js
index 0d2b3a04c..9b81fd7b1 100644
--- a/lib/geth_commands.js
+++ b/lib/geth_commands.js
@@ -95,13 +95,21 @@ GethCommands.prototype.mainCommand = function(address) {
   cmd += "--rpcport " + config.rpcPort + " ";
   cmd += "--rpcaddr " + config.rpcHost + " ";
   if (config.rpcCorsDomain) {
-    // TODO: show gigantic warning when cors is set to *
+    if (config.rpcCorsDomain === '*') {
+      console.log('==================================');
+      console.log('make sure you know what you are doing');
+      console.log('==================================');
+    }
     cmd += "--rpccorsdomain=\"" + config.rpcCorsDomain + "\" ";
   } else {
-    // TODO: show warning when cors is not set
+    console.log('==================================');
+    console.log('warning: cors is not set');
+    console.log('==================================');
   }
 
-  //"nodiscover": true,
+  if (config.nodiscover) {
+    cmd += "--nodiscover ";
+  }
 
   if (config.mineWhenNeeded || config.mine) {
     cmd += "--mine ";