diff --git a/3.3.5a/x32dbg/game.dd32 b/3.3.5a/x32dbg/game.dd32
index 2a979b2..94126c7 100644
--- a/3.3.5a/x32dbg/game.dd32
+++ b/3.3.5a/x32dbg/game.dd32
@@ -336,6 +336,30 @@
       "icount": "0x0",
       "parent": "0x7b760"
     },
+    {
+      "manual": true,
+      "start": "0x7bf30",
+      "end": "0x7bf45",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x7bf30"
+    },
+    {
+      "manual": true,
+      "start": "0x7bf50",
+      "end": "0x7bf6a",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x7bf50"
+    },
+    {
+      "manual": true,
+      "start": "0x7bf70",
+      "end": "0x7bf81",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x7bf70"
+    },
     {
       "manual": true,
       "start": "0x7bf90",
@@ -15968,6 +15992,22 @@
       "icount": "0x0",
       "parent": "0x281b00"
     },
+    {
+      "manual": true,
+      "start": "0x281be0",
+      "end": "0x281caa",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x281be0"
+    },
+    {
+      "manual": true,
+      "start": "0x281cb0",
+      "end": "0x281d86",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x281cb0"
+    },
     {
       "manual": true,
       "start": "0x282340",
@@ -16416,6 +16456,30 @@
       "icount": "0x0",
       "parent": "0x28e900"
     },
+    {
+      "manual": true,
+      "start": "0x28ebb0",
+      "end": "0x28ed77",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x28ebb0"
+    },
+    {
+      "manual": true,
+      "start": "0x28ee20",
+      "end": "0x28f36c",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x28ee20"
+    },
+    {
+      "manual": true,
+      "start": "0x28f3d0",
+      "end": "0x28f691",
+      "module": "wow.exe",
+      "icount": "0x0",
+      "parent": "0x28f3d0"
+    },
     {
       "manual": true,
       "start": "0x28fae0",
@@ -19790,6 +19854,24 @@
       "text": "j_nullsub_3",
       "address": "0x7b760"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "HandleClose",
+      "address": "0x7bf30"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "HandleCreate",
+      "address": "0x7bf50"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "HandleDuplicate",
+      "address": "0x7bf70"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31514,6 +31596,18 @@
       "text": "GxPrimVertexPtr",
       "address": "0x281b00"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxTexFlags__CGxTexFlags",
+      "address": "0x281be0"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "GxTexCreate",
+      "address": "0x281cb0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
@@ -31850,6 +31944,24 @@
       "text": "CGxDeviceD3d__ICursorCreate",
       "address": "0x28e900"
     },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ICreateWindow",
+      "address": "0x28ebb0"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ISetCaps",
+      "address": "0x28ee20"
+    },
+    {
+      "manual": true,
+      "module": "wow.exe",
+      "text": "CGxDeviceD3d__ICreateD3dDevice",
+      "address": "0x28f3d0"
+    },
     {
       "manual": true,
       "module": "wow.exe",
diff --git a/3.3.5a/x32dbg/types.json b/3.3.5a/x32dbg/types.json
index 4790e85..d7e0605 100644
--- a/3.3.5a/x32dbg/types.json
+++ b/3.3.5a/x32dbg/types.json
@@ -1042,7 +1042,7 @@
         },
         {
           "type": "uint32_t",
-          "name": "m_unkCC",
+          "name": "m_shaderConstants",
           "arrsize": 6,
           "offset": 204
         },
@@ -1077,11 +1077,16 @@
           "offset": 248
         },
         {
-          "type": "uint32_t",
-          "name": "unkFC",
-          "arrsize": 6,
+          "type": "int32_t",
+          "name": "m_hardwareCursor",
           "offset": 252
         },
+        {
+          "type": "uint32_t",
+          "name": "unk100",
+          "arrsize": 5,
+          "offset": 256
+        },
         {
           "type": "uint32_t",
           "name": "unk114",
@@ -1548,8 +1553,34 @@
         {
           "type": "uint32_t",
           "name": "unk2904",
-          "arrsize": 1049,
+          "arrsize": 20,
           "offset": 10500
+        },
+        {
+          "type": "int32_t",
+          "name": "m_hardwareCursor",
+          "offset": 10580
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk2958",
+          "offset": 10584
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk295C",
+          "offset": 10588
+        },
+        {
+          "type": "CImVector",
+          "name": "m_cursorImage",
+          "arrsize": 1024,
+          "offset": 10592
+        },
+        {
+          "type": "CGxTex*",
+          "name": "m_cursorTexture",
+          "offset": 14688
         }
       ]
     },
@@ -1767,7 +1798,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_42",
+          "name": "v_fn_42_Draw",
           "offset": 168
         },
         {
@@ -1817,7 +1848,7 @@
         },
         {
           "type": "void*",
-          "name": "v_fn_52",
+          "name": "v_fn_52_PoolSizeSet",
           "offset": 208
         },
         {
@@ -2052,8 +2083,8 @@
           "offset": 4
         },
         {
-          "type": "int8_t",
-          "name": "unk5",
+          "type": "bool",
+          "name": "hwCursor",
           "offset": 5
         },
         {
@@ -2222,6 +2253,145 @@
         }
       ]
     },
+    {
+      "name": "CGxTex",
+      "members": [
+        {
+          "type": "CiRect",
+          "name": "m_updateRect"
+        },
+        {
+          "type": "int16_t",
+          "name": "m_updatePlaneMin",
+          "offset": 16
+        },
+        {
+          "type": "int16_t",
+          "name": "m_updatePlaneMax",
+          "offset": 18
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_width",
+          "offset": 20
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_height",
+          "offset": 24
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_depth",
+          "offset": 28
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_target",
+          "offset": 32
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_format",
+          "offset": 36
+        },
+        {
+          "type": "uint32_t",
+          "name": "m_dataFormat",
+          "offset": 40
+        },
+        {
+          "type": "CGxTexFlags",
+          "name": "m_flags",
+          "offset": 44
+        },
+        {
+          "type": "void*",
+          "name": "m_userArg",
+          "offset": 48
+        },
+        {
+          "type": "void*",
+          "name": "m_userFunc",
+          "offset": 52
+        },
+        {
+          "type": "void*",
+          "name": "m_apiSpecificData",
+          "offset": 56
+        },
+        {
+          "type": "void*",
+          "name": "m_apiSpecificData2",
+          "offset": 60
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk40",
+          "offset": 64
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk44",
+          "offset": 68
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk48",
+          "offset": 72
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk4C",
+          "offset": 76
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk50",
+          "offset": 80
+        },
+        {
+          "type": "uint32_t",
+          "name": "unk54",
+          "offset": 84
+        },
+        {
+          "type": "int8_t",
+          "name": "char58",
+          "offset": 88
+        },
+        {
+          "type": "int8_t",
+          "name": "char59",
+          "offset": 89
+        },
+        {
+          "type": "int8_t",
+          "name": "m_needsUpdate",
+          "offset": 90
+        },
+        {
+          "type": "int8_t",
+          "name": "m_needsCreation",
+          "offset": 91
+        },
+        {
+          "type": "int8_t",
+          "name": "m_needsFlagUpdate",
+          "offset": 92
+        },
+        {
+          "type": "int8_t",
+          "name": "char5D",
+          "offset": 93
+        },
+        {
+          "type": "uint16_t",
+          "name": "m_pad",
+          "offset": 94
+        }
+      ]
+    },
     {
       "name": "CGxShader",
       "members": [
@@ -2429,6 +2599,15 @@
         }
       ]
     },
+    {
+      "name": "CGxTexFlags",
+      "members": [
+        {
+          "type": "uint32_t",
+          "name": "m_flags"
+        }
+      ]
+    },
     {
       "name": "CGxDeviceD3d",
       "members": [
@@ -2439,37 +2618,37 @@
         {
           "type": "void*",
           "name": "m_hwnd",
-          "offset": 14696
+          "offset": 14692
         },
         {
           "type": "uint16_t",
           "name": "m_hwndClass",
-          "offset": 14700
+          "offset": 14696
         },
         {
           "type": "uint16_t",
           "name": "unk396E",
-          "offset": 14702
+          "offset": 14698
         },
         {
           "type": "int32_t",
           "name": "m_ownhwnd",
-          "offset": 14704
+          "offset": 14700
         },
         {
           "type": "void*",
           "name": "m_d3dLib",
-          "offset": 14708
+          "offset": 14704
         },
         {
           "type": "IDirect3D9*",
           "name": "m_d3d",
-          "offset": 14712
+          "offset": 14708
         },
         {
           "type": "IDirect3DDevice9*",
           "name": "m_d3dDevice",
-          "offset": 14716
+          "offset": 14712
         },
         {
           "type": "D3DCAPS9",