diff --git a/modules/ui_image_generation.py b/modules/ui_image_generation.py
index b420bc52..b8a0653e 100644
--- a/modules/ui_image_generation.py
+++ b/modules/ui_image_generation.py
@@ -378,7 +378,7 @@ def create_ui():
                                 shared.gradio['image_steps'] = gr.Slider(1, 100, value=shared.settings['image_steps'], step=1, label="Steps")
                                 shared.gradio['image_cfg_scale'] = gr.Slider(
                                     0.0, 10.0,
-                                    value=0.0,
+                                    value=shared.settings['image_cfg_scale'],
                                     step=0.1,
                                     label="CFG Scale",
                                     info="Z-Image Turbo: 0.0 | Qwen: 4.0"
@@ -705,7 +705,10 @@ def generate(state):
     t1 = time.time()
     save_generated_images(all_images, state, seed)
 
-    logger.info(f'Images generated in {(t1-t0):.2f} seconds ({state["image_steps"]/(t1-t0):.2f} steps/s, seed {seed})')
+    total_images = int(state['image_batch_count']) * int(state['image_batch_size'])
+    total_steps = state["image_steps"] * int(state['image_batch_count'])
+    logger.info(f'Generated {total_images} images in {(t1-t0):.2f} seconds ({total_steps/(t1-t0):.2f} steps/s, seed {seed})')
+
     return all_images
 
 
@@ -737,9 +740,10 @@ def load_image_model_wrapper(model_name, dtype, attn_backend, cpu_offload, compi
 
 
 def unload_image_model_wrapper():
+    previous_name = shared.image_model_name
     unload_image_model()
-    if shared.image_model_name != 'None':
-        return f"Model: **{shared.image_model_name}** (not loaded)"
+    if previous_name != 'None':
+        return f"Model: **{previous_name}** (unloaded)"
     return "No model loaded"
 
 
diff --git a/modules/utils.py b/modules/utils.py
index 13a814ae..b478f066 100644
--- a/modules/utils.py
+++ b/modules/utils.py
@@ -157,14 +157,7 @@ def get_available_models():
 
 def get_available_image_models():
     model_dir = Path(shared.args.image_model_dir)
-
-    # Find directories with safetensors files
-    dirs_with_safetensors = set()
-    for item in os.listdir(model_dir):
-        item_path = model_dir / item
-        if item_path.is_dir():
-            if any(file.lower().endswith(('.safetensors', '.pt')) for file in os.listdir(item_path) if (item_path / file).is_file()):
-                dirs_with_safetensors.add(item)
+    model_dir.mkdir(parents=True, exist_ok=True)
 
     # Find valid model directories
     model_dirs = []