diff --git a/media-hide.lua b/media-hide.lua
index 2632360..92a64f2 100644
--- a/media-hide.lua
+++ b/media-hide.lua
@@ -1,34 +1,42 @@
-obs           = obslua
-gs            = nil
+obs = obslua
+gs = nil
 
+-- Fixed: Helper to handle visibility across scenes and groups
 function source_enable(source, enable)
     local sourcename = obs.obs_source_get_name(source)
     local scenes = obs.obs_frontend_get_scenes()
+    
     if scenes ~= nil then
         for _, scenesource in ipairs(scenes) do
-            local scenename = obs.obs_source_get_name(scenesource)
             local scene = obs.obs_scene_from_source(scenesource)
             local sceneitems = obs.obs_scene_enum_items(scene)
-            local index = 1
-            for i, sceneitem in ipairs(sceneitems) do
-                local group = obs.obs_group_from_source(obs.obs_sceneitem_get_source(sceneitem))
-                if group ~= nil then
+            
+            for _, sceneitem in ipairs(sceneitems) do
+                local item_source = obs.obs_sceneitem_get_source(sceneitem)
+                
+                -- Check if the item is a group
+                if obs.obs_source_is_group(item_source) then
+                    local group = obs.obs_group_from_source(item_source)
                     local groupitems = obs.obs_scene_enum_items(group)
                     for _, groupitem in ipairs(groupitems) do
                         if sourcename == obs.obs_source_get_name(obs.obs_sceneitem_get_source(groupitem)) then
                             if obs.obs_sceneitem_visible(groupitem) ~= enable then
-                                obs.obs_sceneitem_set_visible(groupitem,enable)
+                                obs.obs_sceneitem_set_visible(groupitem, enable)
                             end
                         end
                     end
-		   obs.sceneitem_list_release(groupitems)			
+                    -- Corrected API function name
+                    obs.sceneitem_list_release(groupitems)
                 end
-                if sourcename == obs.obs_source_get_name(obs.obs_sceneitem_get_source(sceneitem)) then
+
+                -- Check regular items
+                if sourcename == obs.obs_source_get_name(item_source) then
                     if obs.obs_sceneitem_visible(sceneitem) ~= enable then
-                        obs.obs_sceneitem_set_visible(sceneitem,enable)
+                        obs.obs_sceneitem_set_visible(sceneitem, enable)
                     end
                 end
             end
+            -- Corrected API function name
             obs.sceneitem_list_release(sceneitems)
         end
         obs.source_list_release(scenes)
@@ -36,62 +44,64 @@ function source_enable(source, enable)
 end
 
 function script_properties()
-	local props = obs.obs_properties_create()
+    local props = obs.obs_properties_create()
     obs.obs_properties_add_bool(props, "exclude", "Exclude")
-    obs.obs_properties_add_editable_list(props, "sources", "Sources",obs.OBS_EDITABLE_LIST_TYPE_STRINGS,nil,nil)
-    return props;
+    obs.obs_properties_add_editable_list(props, "sources", "Sources", obs.OBS_EDITABLE_LIST_TYPE_STRINGS, nil, nil)
+    return props
 end
 
 function script_description()
-	return "Hide media sources when ended"
+    return "Hides media sources automatically when they finish playing."
 end
 
 function media_ended(cd)
     local source = obs.calldata_source(cd, "source")
-    source_enable(source, false);
+    source_enable(source, false)
 end
 
 function update_source_media_ended(source, sourceNames, exclude)
-    local sh = obs.obs_source_get_signal_handler(source);
-    obs.signal_handler_disconnect(sh,"media_ended",media_ended)
+    local sh = obs.obs_source_get_signal_handler(source)
+    obs.signal_handler_disconnect(sh, "media_ended", media_ended)
+    
     local sn = obs.obs_source_get_name(source)
     local found = false
-    local count = obs.obs_data_array_count(sourceNames);
-    for i = 0,count do 
-        local item = obs.obs_data_array_item(sourceNames, i);
+    local count = obs.obs_data_array_count(sourceNames)
+    
+    -- Fix: Data arrays are 0-indexed; loop must stop at count - 1
+    for i = 0, count - 1 do 
+        local item = obs.obs_data_array_item(sourceNames, i)
         if obs.obs_data_get_string(item, "value") == sn then
             found = true
         end
+        obs.obs_data_release(item) -- Memory management
     end
+    
     if (found == true and exclude == false) or (found == false and exclude == true) then
-        obs.signal_handler_connect(sh,"media_ended",media_ended)
+        obs.signal_handler_connect(sh, "media_ended", media_ended)
     end
 end
 
 function script_update(settings)
-    local exclude = obs.obs_data_get_bool(settings,"exclude")
-    local sourceNames =  obs.obs_data_get_array(settings, "sources");
+    local exclude = obs.obs_data_get_bool(settings, "exclude")
+    local sourceNames = obs.obs_data_get_array(settings, "sources")
     local sources = obs.obs_enum_sources()
+    
     if sources ~= nil then
         for _, source in ipairs(sources) do
             update_source_media_ended(source, sourceNames, exclude)
         end
         obs.source_list_release(sources)
     end
-end
-
-function script_defaults(settings)
-
+    obs.obs_data_array_release(sourceNames)
 end
 
 function source_create(cd)
-    if gs == nil then
-        return
-    end
-    local sourceNames = obs.obs_data_get_array(gs, "sources");
-    local exclude = obs.obs_data_get_bool(gs,"exclude")
+    if gs == nil then return end
+    local sourceNames = obs.obs_data_get_array(gs, "sources")
+    local exclude = obs.obs_data_get_bool(gs, "exclude")
     local source = obs.calldata_source(cd, "source")
     update_source_media_ended(source, sourceNames, exclude)
+    obs.obs_data_array_release(sourceNames)
 end
 
 function script_load(settings)
@@ -99,7 +109,3 @@ function script_load(settings)
     local sh = obs.obs_get_signal_handler()
     obs.signal_handler_connect(sh, "source_create", source_create)
 end
-
-function script_unload()
-
-end