diff --git a/include/REL/m440Dll.h b/include/REL/m440Dll.h
index d7d2c5b8..85c35f28 100644
--- a/include/REL/m440Dll.h
+++ b/include/REL/m440Dll.h
@@ -109,7 +109,7 @@ typedef struct _unkStruct6 {
     m440Func6 unk38;
     s16 unk3C;
     s16 unk3E;
-} unkStruct6; // sizeof 0x40
+} unkStruct6; // sizeof 0x40 // TODO same as unkStruct14?
 
 typedef struct _unkStruct7 {
     GXColor unk0;
@@ -178,7 +178,8 @@ typedef struct _unkStruct13 {
 typedef struct _unkStruct14 {
     s16 unk0;
     s16 unk2;
-    char unk4[0x8];
+    char unk4[4];
+    s32 unk8;
     void *unkC;
     char unk10[0x4];
     void *unk14;
diff --git a/include/dolphin/pad.h b/include/dolphin/pad.h
index 0d525004..e52a6e9f 100644
--- a/include/dolphin/pad.h
+++ b/include/dolphin/pad.h
@@ -84,8 +84,8 @@ PADSamplingCallback PADSetSamplingCallback(PADSamplingCallback);
 #ifdef TARGET_PC
 /* New API to facilitate controller interactions */
 typedef struct PADDeadZones {
-  bool emulateTriggers;
-  bool useDeadzones;
+  BOOL emulateTriggers;
+  BOOL useDeadzones;
   u16 stickDeadZone;
   u16 substickDeadZone;
   u16 leftTriggerActivationZone;
@@ -118,7 +118,7 @@ const char* PADGetNativeButtonName(u32 button);
 /* Returns any pressed native button */
 s32 PADGetNativeButtonPressed(u32 port);
 void PADRestoreDefaultMapping(u32 port);
-void PADBlockInput(bool block);
+void PADBlockInput(BOOL block);
 #endif
 
 #ifdef __cplusplus
diff --git a/src/REL/m429Dll/main.c b/src/REL/m429Dll/main.c
index 01040112..2ae49cb2 100644
--- a/src/REL/m429Dll/main.c
+++ b/src/REL/m429Dll/main.c
@@ -1323,7 +1323,9 @@ void fn_1_3DCC(Work8F68 *arg0)
     }
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_40C0(Work8F68 *arg0, omObjData *arg1, s32 arg2)
 {
diff --git a/src/REL/m430Dll/water.c b/src/REL/m430Dll/water.c
index 999e3e3d..6b802aa2 100644
--- a/src/REL/m430Dll/water.c
+++ b/src/REL/m430Dll/water.c
@@ -1276,8 +1276,8 @@ void fn_1_8CE0(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, var_r31->unk_44[var_r31->unk_40], sizeof(Vec));
-    GXSetArray(GX_VA_CLR0, var_r31->unk_54[var_r31->unk_40], sizeof(GXColor));
+    GXSETARRAY(GX_VA_POS, var_r31->unk_44[var_r31->unk_40], 0x1B8 * sizeof(Vec), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, var_r31->unk_54[var_r31->unk_40], 0x1B8 * sizeof(GXColor), sizeof(GXColor));
     GXSetCullMode(GX_CULL_NONE);
     GXCallDisplayList(var_r31->unk_60, var_r31->unk_64);
     GXSetCullMode(GX_CULL_BACK);
@@ -1372,8 +1372,8 @@ void fn_1_963C(ModelData *model, Mtx matrix, u32 var_r31)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, lbl_1_data_60, sizeof(Vec));
-    GXSetArray(GX_VA_CLR0, lbl_1_data_A8, sizeof(GXColor));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_60, sizeof(lbl_1_data_60), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_A8, sizeof(lbl_1_data_A8), sizeof(GXColor));
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 6);
     GXPosition1x8(0);
     GXColor1x8(3);
@@ -1490,8 +1490,8 @@ void fn_1_9C90(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, lbl_1_data_C0, 0xC);
-    GXSetArray(GX_VA_CLR0, lbl_1_data_A8, 4);
+    GXSETARRAY(GX_VA_POS, lbl_1_data_C0, sizeof(lbl_1_data_C0), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_A8, sizeof(lbl_1_data_A8), sizeof(GXColor));
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 8);
     for (var_r30 = 0; var_r30 < 8; var_r30++) {
         GXPosition1x8(var_r30);
@@ -1579,8 +1579,8 @@ void fn_1_A3A8(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, lbl_1_data_120, 0xC);
-    GXSetArray(GX_VA_CLR0, lbl_1_data_168, 4);
+    GXSETARRAY(GX_VA_POS, lbl_1_data_120, sizeof(lbl_1_data_120), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_168, sizeof(lbl_1_data_168), sizeof(GXColor));
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 6);
     GXPosition1x8(0);
     GXColor1x8(0);
diff --git a/src/REL/m431Dll/main.c b/src/REL/m431Dll/main.c
index 6244ca54..243604cf 100644
--- a/src/REL/m431Dll/main.c
+++ b/src/REL/m431Dll/main.c
@@ -2087,13 +2087,13 @@ void fn_1_72B4(ModelData *model, Mtx mtx)
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetArray(GX_VA_POS, temp_r30->unk1C, sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, temp_r30->unk1C, temp_r30->unk0 * sizeof(Vec) * 4, sizeof(Vec));
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_CLR0, temp_r30->unk24, sizeof(GXColor));
+    GXSETARRAY(GX_VA_CLR0, temp_r30->unk24, temp_r30->unk0 * sizeof(GXColor), sizeof(GXColor));
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX0, temp_r30->unk20, sizeof(HsfVector2f));
+    GXSETARRAY(GX_VA_TEX0, temp_r30->unk20, temp_r30->unk0 * sizeof(HsfVector2f) * 4, sizeof(HsfVector2f));
     fn_1_79FC(mtx, sp128);
     MTXReorder(sp128, spF8);
     if (!omPauseChk() && temp_r30->unkC) {
diff --git a/src/REL/m432Dll/main.c b/src/REL/m432Dll/main.c
index 038512c9..af6c4fe6 100644
--- a/src/REL/m432Dll/main.c
+++ b/src/REL/m432Dll/main.c
@@ -2238,7 +2238,9 @@ void fn_1_AF28(omObjData *object)
     fn_1_4ED8(&var_r31->unk_00, 0);
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_B234(void)
 {
diff --git a/src/REL/m434Dll/map.c b/src/REL/m434Dll/map.c
index b85db706..d533a43f 100644
--- a/src/REL/m434Dll/map.c
+++ b/src/REL/m434Dll/map.c
@@ -342,7 +342,7 @@ void fn_1_2978(ModelData *model, Mtx mtx)
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetArray(GX_VA_POS, lbl_1_bss_2868, sizeof(lbl_1_bss_2868), sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, lbl_1_bss_2868, sizeof(lbl_1_bss_2868), sizeof(Vec));
     GXSetCullMode(GX_CULL_BACK);
     GXCallDisplayList(lbl_1_bss_450.unk0, lbl_1_bss_450.unk4);
     GXSetNumIndStages(0);
diff --git a/src/REL/m435Dll/main.c b/src/REL/m435Dll/main.c
index df551b13..5017ca2d 100755
--- a/src/REL/m435Dll/main.c
+++ b/src/REL/m435Dll/main.c
@@ -4252,7 +4252,9 @@ void fn_1_14760(omObjData* arg0) {
     arg0->func = fn_1_14384;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_14A54(void) {
     lbl_1_bss_0 = omInitObjMan(62, 0x2000);
diff --git a/src/REL/m436Dll/main.c b/src/REL/m436Dll/main.c
index 95440203..c53181f1 100755
--- a/src/REL/m436Dll/main.c
+++ b/src/REL/m436Dll/main.c
@@ -3280,7 +3280,9 @@ void fn_1_10670(omObjData *arg0)
     arg0->func = fn_1_1026C;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_108DC(void)
 {
diff --git a/src/REL/m437Dll/main.c b/src/REL/m437Dll/main.c
index 5ca6de46..56921de4 100755
--- a/src/REL/m437Dll/main.c
+++ b/src/REL/m437Dll/main.c
@@ -3443,7 +3443,9 @@ void fn_1_108A4(omObjData *arg0)
     arg0->func = fn_1_1043C;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_10B30(void)
 {
diff --git a/src/REL/m438Dll/fire.c b/src/REL/m438Dll/fire.c
index 739a356a..1e898ee8 100644
--- a/src/REL/m438Dll/fire.c
+++ b/src/REL/m438Dll/fire.c
@@ -4,6 +4,8 @@
 #define HUSPR_USE_OLD_DEFS
 #include "game/sprite.h"
 
+#include <ext_math.h>
+
 extern u8 texMtxTbl[];
 
 // PROTO
@@ -264,19 +266,19 @@ void fn_1_E790(M438UnkStruct2 *arg0)
             }
             GXClearVtxDesc();
             GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
-            GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
-            GXSetArray(GX_VA_POS, var_r31->unk_44, 12);
+            GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
+            GXSETARRAY(GX_VA_POS, var_r31->unk_44, 4 * sizeof(Vec), sizeof(Vec));
             GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
             GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-            GXSetArray(GX_VA_CLR0, var_r31->unk_48, 4);
+            GXSETARRAY(GX_VA_CLR0, var_r31->unk_48, 4 * sizeof(GXColor), sizeof(GXColor));
             for (var_r27 = 0; var_r27 < var_r31->unk_34; var_r27++) {
                 GXSetVtxDesc(var_r27 + GX_VA_TEX0, GX_INDEX16);
-                GXSetVtxAttrFmt(GX_VTXFMT0, var_r27 + GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0);
-                GXSetArray(var_r27 + GX_VA_TEX0, &var_r31->unk_58[var_r27].unk_04, 8);
+                GXSetVtxAttrFmt(GX_VTXFMT0, var_r27 + GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
+                GXSETARRAY(var_r27 + GX_VA_TEX0, &var_r31->unk_58[var_r27].unk_04, 4 * sizeof(Vec2f), sizeof(Vec2f));
             }
             GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
-            GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGBA6, 0U);
-            GXSetArray(GX_VA_NRM, var_r31->unk_4C, 12);
+            GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0U);
+            GXSETARRAY(GX_VA_NRM, var_r31->unk_4C, sizeof(Vec), sizeof(Vec));
             GXCallDisplayList(var_r31->unk_40, var_r31->unk_3C);
         }
     }
@@ -593,15 +595,15 @@ s16 fn_1_10258(u8 arg0, u8 arg1)
     var_r31->unk_30 = NULL;
     var_r31->unk_02 = arg0;
     var_r31->unk_04 = arg1;
-    var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x98, 0x10000000);
+    var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x98, MEMORY_DEFAULT_NUM);
     var_r31->unk_3C = var_r30;
-    var_r31->unk_34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * 2, 0x10000000);
+    var_r31->unk_34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * 2, MEMORY_DEFAULT_NUM);
     var_r31->unk_48 = 0;
-    var_r31->unk_4C = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 << 8, 0x10000000);
-    var_r31->unk_50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x30, 0x10000000);
-    var_r31->unk_54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x10, 0x10000000);
-    var_r31->unk_58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0xC, 0x10000000);
-    var_r31->unk_5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * 0x30), 0x10000000);
+    var_r31->unk_4C = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 << 8, MEMORY_DEFAULT_NUM);
+    var_r31->unk_50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x30, MEMORY_DEFAULT_NUM);
+    var_r31->unk_54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x10, MEMORY_DEFAULT_NUM);
+    var_r31->unk_58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0xC, MEMORY_DEFAULT_NUM);
+    var_r31->unk_5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * 0x30), MEMORY_DEFAULT_NUM);
     DCFlushRangeNoSync(var_r31->unk_4C, arg0 << 8);
     var_r31->unk_0C.x = var_r31->unk_0C.y = var_r31->unk_0C.z = 0.0f;
     var_r31->unk_18.x = var_r31->unk_18.y = var_r31->unk_18.z = 0.0f;
diff --git a/src/REL/m440Dll/main.c b/src/REL/m440Dll/main.c
index aa700cf7..31d8a98a 100644
--- a/src/REL/m440Dll/main.c
+++ b/src/REL/m440Dll/main.c
@@ -1344,12 +1344,12 @@ void fn_1_5C2C(s16 arg0, HsfObject *arg1, unkStruct6 *arg2, u16 arg3)
         arg2->unk38 = NULL;
         arg2->unk3C = 0xFF;
         arg2->unk3E = 0;
-        arg2->unk18 = HuMemDirectMallocNum(HEAP_DATA, arg1->data.vertex->count * 0xC, var_r29->unk_48);
+        arg2->unk18 = HuMemDirectMallocNum(HEAP_DATA, arg1->data.vertex->count * sizeof(Vec), var_r29->unk_48);
         fn_1_6554(arg2, arg1);
         fn_1_6B58(arg2, arg1);
-        arg2->unkC = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * 0xC, var_r29->unk_48);
-        arg2->unk10 = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * 0xC, var_r29->unk_48);
-        arg2->unk14 = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * 0xC, var_r29->unk_48);
+        arg2->unkC = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * sizeof(Vec), var_r29->unk_48);
+        arg2->unk10 = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * sizeof(Vec), var_r29->unk_48);
+        arg2->unk14 = HuMemDirectMallocNum(HEAP_DATA, arg2->unk8 * sizeof(Vec), var_r29->unk_48);
         if (arg2->unk28->numAttrs != 0) {
             arg2->unk1C = HuMemDirectMallocNum(HEAP_DATA, arg1->data.st->count * 8, var_r29->unk_48);
             var_r22 = arg1->data.st->data;
@@ -1879,10 +1879,10 @@ void fn_1_806C(ModelData *arg0, Mtx arg1)
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetArray(GX_VA_POS, temp_r31->unkC, 12);
+    GXSETARRAY(GX_VA_POS, temp_r31->unkC, temp_r31->unk8 * sizeof(Vec), sizeof(Vec));
     GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_F32, 0);
-    GXSetArray(GX_VA_NRM, temp_r31->unk14, 12);
+    GXSETARRAY(GX_VA_NRM, temp_r31->unk14, temp_r31->unk8 * sizeof(Vec), sizeof(Vec));
     lbl_1_bss_C = temp_r31->unk3C;
     if (temp_r31->unk28->unk34 == 0) {
         GXSetNumTevStages(1);
@@ -1897,7 +1897,7 @@ void fn_1_806C(ModelData *arg0, Mtx arg1)
     else {
         GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
         GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-        GXSetArray(GX_VA_TEX0, temp_r31->unk1C, 8);
+        GXSETARRAY(GX_VA_TEX0, temp_r31->unk1C, sizeof(Vec2f), sizeof(Vec2f)); // TODO PC
         temp_r29 = &temp_r31->unk2C[temp_r31->unk28->unk38[0]];
         fn_1_7D60(temp_r29->unk80, temp_r29, 0);
         lbl_1_bss_2C = 1;
@@ -2269,19 +2269,19 @@ s16 fn_1_956C(AnimData *arg0, s16 arg1, f32 arg2, s16 arg3, s16 arg4)
         var_r24->unk60 = -1;
         var_r24->unk62 = 0;
     }
-    var_r25 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 0xC * 4, temp_r28->unk_48);
+    var_r25 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec) * 4, temp_r28->unk_48);
     var_r31->unk1C = var_r25;
 
     for (var_r30 = 0; var_r30 < (arg1 * 4); var_r30++, var_r25++) {
         var_r25->x = var_r25->y = var_r25->z = 0.0f;
     }
-    var_r27 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 4, temp_r28->unk_48);
+    var_r27 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(GXColor), temp_r28->unk_48);
     var_r31->unk24 = var_r27;
 
     for (var_r30 = 0; var_r30 < arg1; var_r30++, var_r27++) {
         var_r27->r = var_r27->g = var_r27->b = var_r27->a = 0xFF;
     }
-    var_r29 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 8 * 4, temp_r28->unk_48);
+    var_r29 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(Vec2f) * 4, temp_r28->unk_48);
     var_r31->unk20 = var_r29;
 
     for (var_r30 = 0; var_r30 < arg1; var_r30++) {
@@ -2458,13 +2458,13 @@ void fn_1_9C04(ModelData *arg0, Mtx arg1)
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-    GXSetArray(GX_VA_POS, temp_r30->unk1C, 0xC);
+    GXSETARRAY(GX_VA_POS, temp_r30->unk1C, temp_r30->unk0 * sizeof(Vec) * 4, sizeof(Vec));
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_CLR0, temp_r30->unk24, 4);
+    GXSETARRAY(GX_VA_CLR0, temp_r30->unk24, temp_r30->unk0 * sizeof(GXColor), sizeof(GXColor));
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX0, temp_r30->unk20, 8);
+    GXSETARRAY(GX_VA_TEX0, temp_r30->unk20, temp_r30->unk0 * sizeof(Vec2f) * 4, sizeof(Vec2f));
     fn_1_9344(arg1, sp128);
     MTXReorder(sp128, spF8);
     if (((u8)omPauseChk() == 0) && (temp_r30->unkC)) {
@@ -2510,8 +2510,8 @@ void fn_1_9C04(ModelData *arg0, Mtx arg1)
             }
         }
     }
-    DCFlushRangeNoSync(temp_r30->unk1C, temp_r30->unk0 * 0xC * 4);
-    DCFlushRangeNoSync(temp_r30->unk20, temp_r30->unk0 * 8 * 4);
+    DCFlushRangeNoSync(temp_r30->unk1C, temp_r30->unk0 * sizeof(Vec) * 4);
+    DCFlushRangeNoSync(temp_r30->unk20, temp_r30->unk0 * sizeof(Vec2f) * 4);
     GXCallDisplayList(temp_r30->unk28, temp_r30->unk4);
 }
 
diff --git a/src/REL/m441Dll/main.c b/src/REL/m441Dll/main.c
index bc0d7e77..e3d30e63 100644
--- a/src/REL/m441Dll/main.c
+++ b/src/REL/m441Dll/main.c
@@ -23,6 +23,12 @@
 #include "ext_math.h"
 #include "version.h"
 
+
+#ifndef __MWERKS__
+#include <game/hsfex.h>
+#include <game/audio.h>
+#endif
+
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))
 
@@ -700,7 +706,9 @@ HsfanimStruct00 lbl_1_data_48C = {
     { { 255, 255, 255, 0 }, { 255, 255, 255, 0 }, { 255, 255, 255, 0 }, { 255, 255, 255, 0 } },
 };
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_2454(omObjData *object)
 {
diff --git a/src/REL/m450Dll/main.c b/src/REL/m450Dll/main.c
index 84bd07f6..ba4a5901 100644
--- a/src/REL/m450Dll/main.c
+++ b/src/REL/m450Dll/main.c
@@ -1589,13 +1589,13 @@ void fn_1_56C4(ModelData *arg0, Mtx arg1)
         GXClearVtxDesc();
         GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
         GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
-        GXSetArray(GX_VA_POS, var_r31->unk_14, 0xC);
+        GXSETARRAY(GX_VA_POS, var_r31->unk_14, var_r31->unk_64 * sizeof(Vec) * 4, sizeof(Vec));
         GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
         GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-        GXSetArray(GX_VA_CLR0, var_r31->unk_20, 4);
+        GXSETARRAY(GX_VA_CLR0, var_r31->unk_20, var_r31->unk_64 * sizeof(GXColor), sizeof(GXColor));
         GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
         GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-        GXSetArray(GX_VA_TEX0, var_r31->unk_18, 8);
+        GXSETARRAY(GX_VA_TEX0, var_r31->unk_18, var_r31->unk_64 * sizeof(Vec2f) * 4, sizeof(Vec2f));
         sp130[0][0] = arg1[0][0];
         sp130[1][0] = arg1[0][1];
         sp130[2][0] = arg1[0][2];
@@ -1651,8 +1651,8 @@ void fn_1_56C4(ModelData *arg0, Mtx arg1)
                 }
             }
         }
-        DCFlushRangeNoSync(var_r31->unk_14, var_r31->unk_64 * 0xC * 4);
-        DCFlushRangeNoSync(var_r31->unk_18, var_r31->unk_64 * 8 * 4);
+        DCFlushRangeNoSync(var_r31->unk_14, var_r31->unk_64 * sizeof(Vec) * 4);
+        DCFlushRangeNoSync(var_r31->unk_18, var_r31->unk_64 * sizeof(Vec2f) * 4);
         GXCallDisplayList(var_r31->unk_24, var_r31->unk_58);
     }
 }
@@ -6098,7 +6098,9 @@ void fn_1_1A3F0(void)
     lbl_1_bss_30C.y += 150.0f;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 void fn_1_1A714(void)
 {
diff --git a/src/REL/m455Dll/stage.c b/src/REL/m455Dll/stage.c
index 71bd7ab4..c320e330 100644
--- a/src/REL/m455Dll/stage.c
+++ b/src/REL/m455Dll/stage.c
@@ -630,7 +630,7 @@ void fn_1_4B1C(ModelData *model, Mtx matrix)
     GXClearVtxDesc();
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
-    GXSetArray(GX_VA_POS, lbl_1_data_278, sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_278, sizeof(lbl_1_data_278), sizeof(Vec));
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
     for(i=0; i<4; i++) {
         GXPosition1x16(i);
@@ -721,16 +721,16 @@ void fn_1_4E64(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
     
-    GXSetArray(GX_VA_POS, lbl_1_data_2A8, sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_2A8, sizeof(lbl_1_data_2A8), sizeof(Vec));
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_CLR0, lbl_1_data_3E0, sizeof(GXColor));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_3E0, sizeof(lbl_1_data_3E0), sizeof(GXColor));
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX0, lbl_1_data_448, sizeof(float)*2);
+    GXSETARRAY(GX_VA_TEX0, lbl_1_data_448, sizeof(lbl_1_data_448), sizeof(float)*2);
     GXSetVtxDesc(GX_VA_TEX1, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX1, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX1, &work2->unk874[0][0], sizeof(float)*2);
+    GXSETARRAY(GX_VA_TEX1, &work2->unk874[0][0], sizeof(work2->unk874), sizeof(float)*2);
     GXBegin(GX_QUADS, GX_VTXFMT0, 48);
     for(i=0; i<12; i++) {
         s16 index;
@@ -886,8 +886,8 @@ void fn_1_59A0(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, lbl_1_data_604, sizeof(Vec));
-    GXSetArray(GX_VA_CLR0, lbl_1_data_670, sizeof(GXColor));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_604, sizeof(lbl_1_data_604), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_670, sizeof(lbl_1_data_670), sizeof(GXColor));
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 6);
     GXPosition1x8(0);
     GXColor1x8(0);
diff --git a/src/REL/m456Dll/stage.c b/src/REL/m456Dll/stage.c
index 14e18f6b..0929ca33 100644
--- a/src/REL/m456Dll/stage.c
+++ b/src/REL/m456Dll/stage.c
@@ -518,7 +518,7 @@ void fn_1_464C(ModelData *model, Mtx matrix)
     GXClearVtxDesc();
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
-    GXSetArray(GX_VA_POS, lbl_1_data_388, sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_388, sizeof(lbl_1_data_388), sizeof(Vec));
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
     for (i = 0; i < 4; i++) {
         GXPosition1x16(i);
@@ -609,16 +609,16 @@ void fn_1_4994(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
 
-    GXSetArray(GX_VA_POS, lbl_1_data_3B8, sizeof(Vec));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_3B8, sizeof(lbl_1_data_3B8), sizeof(Vec));
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_CLR0, lbl_1_data_4F0, sizeof(GXColor));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_4F0, sizeof(lbl_1_data_4F0), sizeof(GXColor));
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX0, lbl_1_data_558, sizeof(float) * 2);
+    GXSETARRAY(GX_VA_TEX0, lbl_1_data_558, sizeof(lbl_1_data_558), sizeof(float) * 2);
     GXSetVtxDesc(GX_VA_TEX1, GX_INDEX16);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX1, GX_TEX_ST, GX_F32, 0);
-    GXSetArray(GX_VA_TEX1, &work2->unk874[0][0], sizeof(float) * 2);
+    GXSETARRAY(GX_VA_TEX1, &work2->unk874[0][0], sizeof(work2->unk874), sizeof(float) * 2);
     GXBegin(GX_QUADS, GX_VTXFMT0, 48);
     for (i = 0; i < 12; i++) {
         s16 index;
@@ -776,8 +776,8 @@ void fn_1_54D0(ModelData *model, Mtx matrix)
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
-    GXSetArray(GX_VA_POS, lbl_1_data_714, sizeof(Vec));
-    GXSetArray(GX_VA_CLR0, lbl_1_data_780, sizeof(GXColor));
+    GXSETARRAY(GX_VA_POS, lbl_1_data_714, sizeof(lbl_1_data_714), sizeof(Vec));
+    GXSETARRAY(GX_VA_CLR0, lbl_1_data_780, sizeof(lbl_1_data_780), sizeof(GXColor));
     GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 6);
     GXPosition1x8(0);
     GXColor1x8(0);
diff --git a/src/REL/m461Dll/main.c b/src/REL/m461Dll/main.c
index 1c4b57cc..ac2ad1a2 100644
--- a/src/REL/m461Dll/main.c
+++ b/src/REL/m461Dll/main.c
@@ -1127,7 +1127,9 @@ void fn_1_507C(WorkPlayerOld *player, s32 attr)
     player->unk3C &= ~attr;
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
 
 Vec lbl_1_data_A0 = { 0, 600, 600 };
 Vec lbl_1_data_AC = { 0, 1, 0 };
diff --git a/src/REL/nisDll/main.c b/src/REL/nisDll/main.c
index 4dc839ce..1ee9dbd0 100644
--- a/src/REL/nisDll/main.c
+++ b/src/REL/nisDll/main.c
@@ -19,4 +19,6 @@ void fn_1_68(omObjData *object)
     }
 }
 
+#ifdef __MWERKS__
 #include "src/REL/executor.c"
+#endif
\ No newline at end of file