diff --git a/TODO.md b/TODO.md
index 92cb7d247..a517659c1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,9 +5,9 @@
 Stuff to be fixed...
 
 - ClipSkip not updated on read gen info
-- Usage of `sd_vae` in quick settings
 - Run VAE with hires at 1280
 - Transformers version
+- Move Restart Server from WebUI to Launch and reload modules
 
 ## Features
 
@@ -15,7 +15,6 @@ Stuff to be added...
 
 - Add Gradio theme maker
 - Create new GitHub hooks/actions for CI/CD  
-- Move Restart Server from WebUI to Launch and reload modules
 - Redo Extensions tab: see <https://vladmandic.github.io/sd-extension-manager/pages/extensions.html>
 - Stream-load models as option for slow storage
 - Autodetect nVidia and AMD: `nvidia-smi` vs `rocm-smi`
@@ -57,7 +56,9 @@ Tech that can be integrated as part of the core workflow...
 
 ### Pending Code Updates
 
-- Use samples format for live preview
-- Identify race condition where generate locks up while fetching preview
-- Use **Approx NN** for live preview
-- Create default `styles.csv`
+- use samples format for live preview
+- identify race condition where generate locks up while fetching preview
+- use **Approx NN** for live preview
+- create default `styles.csv`
+- fix setup not installing `tensorflow` dependencies
+- update default git flags to reduce number of warnings
diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index c5984671c..9eeb71a79 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit c5984671ccd7da7d554f239143648b8157ae1c39
+Subproject commit 9eeb71a796b06f912e1e66acecf4242d165db67b
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index b4e0e55a5..b4b3e154c 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -17,6 +17,7 @@ parser.add_argument("--lowram", action='store_true', help="Load checkpoint weigh
 parser.add_argument("--ckpt", type=str, default=sd_model_file, help="Path to checkpoint of stable diffusion model to load immediately",)
 parser.add_argument('--vae', type=str, help='Path to checkpoint of stable diffusion VAE model to load immediately', default=None)
 parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="Base path where all user data is stored")
+parser.add_argument("--models-dir", type=str, default="models", help="Nase path where all models are stored",)
 
 parser.add_argument("--allow-code", action='store_true', help="Allow custom script execution")
 parser.add_argument("--share", action='store_true', help="Enable to make the UI accessible through Gradio site")
diff --git a/modules/paths_internal.py b/modules/paths_internal.py
index c529c97cf..7f2425cf3 100644
--- a/modules/paths_internal.py
+++ b/modules/paths_internal.py
@@ -15,7 +15,7 @@ parser_pre.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.
 parser_pre.add_argument("--models-dir", type=str, default="models", help="base path where all models are stored",)
 cmd_opts_pre = parser_pre.parse_known_args()[0]
 data_path = cmd_opts_pre.data_dir
-
+print('HERE', data_path)
 models_path = os.path.join(data_path, cmd_opts_pre.models_dir)
 extensions_dir = os.path.join(data_path, "extensions")
 extensions_builtin_dir = os.path.join(script_path, "extensions-builtin")
diff --git a/setup.py b/setup.py
index dc2792e66..73269b0df 100644
--- a/setup.py
+++ b/setup.py
@@ -140,7 +140,7 @@ def update(folder):
         git('checkout master', folder)
     else:
         log.warning(f'Unknown branch for: {folder}')
-    git('pull --rebase --autostash', folder)
+    git('pull --autostash', folder)
     branch = git('branch', folder)