diff --git a/plugins/autoSyndrome.cpp b/plugins/autoSyndrome.cpp
index 314ffb066..0f388790a 100644
--- a/plugins/autoSyndrome.cpp
+++ b/plugins/autoSyndrome.cpp
@@ -74,7 +74,7 @@ DFhackCExport command_result plugin_shutdown(color_ostream& out) {
     return CR_OK;
 }*/
 
-DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
+DFhackCExport command_result plugin_enable(color_ostream& out, bool enable)
 {
     if (enabled == enable)
         return CR_OK;
diff --git a/plugins/digFlood.cpp b/plugins/digFlood.cpp
index 9893fa46c..0d3a8f7a2 100644
--- a/plugins/digFlood.cpp
+++ b/plugins/digFlood.cpp
@@ -29,10 +29,24 @@ void onDig(color_ostream& out, void* ptr);
 void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, set<df::coord>& jobLocations);
 EventManager::EventHandler digHandler(onDig, 0);
 
-bool enabled = false;
+//bool enabled = false;
+DFHACK_PLUGIN_IS_ENABLED(enabled);
 bool digAll = false;
 set<string> autodigMaterials;
 
+DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
+    if (enabled == enable)
+        return CR_OK;
+    
+    enabled = enable;
+    if ( enabled ) {
+        EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, digHandler, plugin_self);
+    } else {
+        EventManager::unregisterAll(plugin_self);
+    }
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
 {
     commands.push_back(PluginCommand(
@@ -46,7 +60,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
         "  digFlood 0 MICROCLINE COAL_BITUMINOUS 1\n"
         "    disable plugin and remove microcline and bituminous coal from being monitored, then re-enable plugin"
         "  digFlood 1 MICROCLINE 0 COAL_BITUMINOUS 1\n"
-        "    don't monitor microcline, do monitor COAL_BITUMINOUS, then enable plugin\n"
+        "    do monitor microcline, don't monitor COAL_BITUMINOUS, then enable plugin\n"
         "  digFlood CLEAR\n"
         "    remove all inorganics from monitoring\n"
         "  digFlood digAll1\n"
@@ -56,7 +70,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
         "\n"
         "Note that while order matters, multiple commands can be sequenced in one line. It is recommended to alter your dfhack.init file so that you won't have to type in every mineral type you want to dig every time you start the game. Material names are case sensitive.\n"
     ));
-    EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, digHandler, plugin_self);
     return CR_OK;
 }
 
@@ -152,12 +165,11 @@ command_result digFlood (color_ostream &out, std::vector <std::string> & paramet
     for ( size_t a = 0; a < parameters.size(); a++ ) {
         int32_t i = (int32_t)strtol(parameters[a].c_str(), NULL, 0);
         if ( i == 0 && parameters[a] == "0" ) {
-            EventManager::unregisterAll(plugin_self);
+            plugin_enable(out, false);
             adding = false;
             continue;
         } else if ( i == 1 ) {
-            EventManager::unregisterAll(plugin_self);
-            EventManager::registerListener(EventManager::EventType::JOB_COMPLETED, digHandler, plugin_self);
+            plugin_enable(out, true);
             adding = true;
             continue;
         }
diff --git a/plugins/treefarm.cpp b/plugins/treefarm.cpp
index f10efa856..7f619dbdc 100644
--- a/plugins/treefarm.cpp
+++ b/plugins/treefarm.cpp
@@ -27,6 +27,7 @@ command_result treefarm (color_ostream &out, std::vector <std::string> & paramet
 EventManager::EventHandler handler(&checkFarms, -1);
 int32_t frequency = 1200*30;
 
+DFHACK_PLUGIN_IS_ENABLED(enabled);
 DFHACK_PLUGIN("treefarm");
 
 DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
@@ -48,6 +49,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     return CR_OK;
 }
 
+DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
+    enabled = enable;
+    return CR_OK;
+}
+
 DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 {
     return CR_OK;
@@ -55,6 +61,8 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
 
 void checkFarms(color_ostream& out, void* ptr) {
     EventManager::unregisterAll(plugin_self);
+    if ( !enabled )
+        return;
     EventManager::registerTick(handler, frequency, plugin_self);
     CoreSuspender suspend;
     
@@ -131,15 +139,18 @@ command_result treefarm (color_ostream &out, std::vector <std::string> & paramet
     if ( parameters.size() == 1 ) {
         int32_t i = atoi(parameters[0].c_str());
         if ( i < 1 ) {
+            plugin_enable(out, false);
             out.print("treefarm disabled\n");
             return CR_OK;
         }
+        plugin_enable(out, true);
         frequency = i;
     }
     
-    EventManager::registerTick(handler, 1, plugin_self);
-    
-    out.print("treefarm enabled with update frequency %d ticks\n", frequency);
+    if ( enabled ) {
+        EventManager::registerTick(handler, 1, plugin_self);
+        out.print("treefarm enabled with update frequency %d ticks\n", frequency);
+    }
     return CR_OK;
 }