Index: LuaModules.lua
===================================================================
--- LuaModules.lua	(revision 10)
+++ LuaModules.lua	(working copy)
@@ -83,8 +83,8 @@
 
     if not name then return end
 
-	local loaded  = IsAddOnLoaded(addon)
-	local isondemand = IsAddOnLoadOnDemand(addon)
+	local loaded  = IsAddOnLoaded(name)
+	local isondemand = IsAddOnLoadOnDemand(name)
 
     if loaded then
         return LoadAddOn
@@ -94,15 +94,11 @@
 end
 
 
-local function libstubLoad(name)
-    return _G.LibStub(name)
-end
-
 local function loader_LibStub(name)
     if not _G.LibStub then return end
 
-    if LibStub:GetLibrary(lib,true) then
-        return libstubLoad
+    if _G.LibStub:GetLibrary(name, true) then
+        return _G.LibStub
     end
 end
 
@@ -189,6 +185,7 @@
 		ns._NAME = modname
 		ns._M = ns
 		ns._PACKAGE = gsub (modname, "[^.]*$", "")
+		ns._G = _G
 	end
 	setfenv (2, ns)
 	for i, f in ipairs ({...}) do