diff --git a/src/PlayX/lua/entities/gmod_playx/cl_init.lua b/src/PlayX/lua/entities/gmod_playx/cl_init.lua
index b11923d0..9f6e4f23 100644
--- a/src/PlayX/lua/entities/gmod_playx/cl_init.lua
+++ b/src/PlayX/lua/entities/gmod_playx/cl_init.lua
@@ -165,7 +165,7 @@ function ENT:SetProjectorBounds(forward, right, up)
 end
 
 function ENT:CreateBrowser()
-    self.Browser = vgui.Create("HTML")
+    self.Browser = vgui.Create("DHTML")
     self.Browser:SetMouseInputEnabled(false)        
     self.Browser:SetSize(self.HTMLWidth, self.HTMLHeight)
     self.Browser:SetPaintedManually(true)
@@ -195,7 +195,13 @@ function ENT:Play(handler, uri, start, volume, handlerArgs)
     if not self.Browser then
         self:CreateBrowser()
     end
-    
+	
+    self.Browser:AddFunction("gmod","Ready",function() 
+		if not IsValid(self) then return end
+		MsgN("PlayX DEBUG: Page loaded, preparing to inject")
+        self:InjectPage()
+    end)
+	
     self.Browser.OpeningURL = function(_, url, target, postdata)
         local query = url:match("^http://playx.sktransport/%?(.*)$")
         
@@ -221,7 +227,8 @@ function ENT:Play(handler, uri, start, volume, handlerArgs)
     else
         self.Browser:OpenURL(PlayX.HostURL)
     end
-    
+	
+    self.Browser:QueueJavascript("gmod.Ready()")
     self.Playing = true
 end
 
diff --git a/src/PlayX/lua/playxlib.lua b/src/PlayX/lua/playxlib.lua
index 34bc2ee5..8b9a7a4d 100644
--- a/src/PlayX/lua/playxlib.lua
+++ b/src/PlayX/lua/playxlib.lua
@@ -379,8 +379,7 @@ playxlib.HandlerResult = HandlerResult
 -- Make callable
 local mt = {}
 mt.__call = function(...)
-    local arg = {...}
-    return HandlerResult.new(unpack(arg))
+    return HandlerResult.new(...)
 end
 setmetatable(HandlerResult, mt)
 
@@ -556,7 +555,7 @@ setInterval(function() {
     
     local body = [[
 <div style="width: ]] .. width .. [[px; height: ]] .. height .. [[px; overflow: hidden">
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" 
+<object
   type="application/x-shockwave-flash"
   src="]] .. url .. [["
   width="100%" height="100%" id="player">