diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 809c6a0e..7f6bdecb 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -555,7 +555,7 @@ fn_80016700 = .text:0x80016700; // type:function size:0x160
 fn_80016860 = .text:0x80016860; // type:function size:0x28
 createLightTextures = .text:0x80016890; // type:function size:0x98
 fn_80016930 = .text:0x80016930; // type:function size:0x2C
-fn_80016960__3d3dFRC7mVec3_cRC7mVec3_c = .text:0x80016960; // type:function size:0x130
+fn_80016960__3d3dFR7mVec3_cRC7mVec3_c = .text:0x80016960; // type:function size:0x130
 fn_80016A90__3d3dFRC7mVec3_c = .text:0x80016A90; // type:function size:0xCC
 fn_80016B60 = .text:0x80016B60; // type:function size:0xAC
 __ct__Q23d3d13AnmMdlWrapperFv = .text:0x80016C10; // type:function size:0x88
@@ -32160,23 +32160,23 @@ lbl_8051CB1C = .data:0x8051CB1C; // type:object size:0xA data:string
 lbl_8051CB28 = .data:0x8051CB28; // type:object size:0xB data:string
 lbl_8051CB34 = .data:0x8051CB34; // type:object size:0xB data:string
 __vt__20dLytMsgWindowSubtype = .data:0x8051CC50; // type:object size:0x44
-lbl_8051CC98 = .data:0x8051CC98; // type:object size:0x1C
-lbl_8051CCB4 = .data:0x8051CCB4; // type:object size:0xC
-lbl_8051CCC0 = .data:0x8051CCC0; // type:object size:0x20
+lbl_8051CC98 = .data:0x8051CC98; // type:object size:0x1A data:string
+lbl_8051CCB4 = .data:0x8051CCB4; // type:object size:0xB data:string
+lbl_8051CCC0 = .data:0x8051CCC0; // type:object size:0x1B data:string
 lbl_8051CCE0 = .data:0x8051CCE0; // type:object size:0x20 data:string
-lbl_8051CD00 = .data:0x8051CD00; // type:object size:0x10
+lbl_8051CD00 = .data:0x8051CD00; // type:object size:0xE data:string
 lbl_8051CD10 = .data:0x8051CD10; // type:object size:0x1C data:string
-lbl_8051CD2C = .data:0x8051CD2C; // type:object size:0xC
+lbl_8051CD2C = .data:0x8051CD2C; // type:object size:0xA data:string
 lbl_8051CD38 = .data:0x8051CD38; // type:object size:0xC data:string
-lbl_8051CD44 = .data:0x8051CD44; // type:object size:0x10
-lbl_8051CD54 = .data:0x8051CD54; // type:object size:0xC
-lbl_8051CD60 = .data:0x8051CD60; // type:object size:0xC
-lbl_8051CD6C = .data:0x8051CD6C; // type:object size:0x10
+lbl_8051CD44 = .data:0x8051CD44; // type:object size:0xD data:string
+lbl_8051CD54 = .data:0x8051CD54; // type:object size:0xA data:string
+lbl_8051CD60 = .data:0x8051CD60; // type:object size:0xB data:string
+lbl_8051CD6C = .data:0x8051CD6C; // type:object size:0xE data:string
 lbl_8051CD7C = .data:0x8051CD7C; // type:object size:0x14 data:4byte
-lbl_8051CD90 = .data:0x8051CD90; // type:object size:0x10
-lbl_8051CDA0 = .data:0x8051CDA0; // type:object size:0x10
-lbl_8051CDB0 = .data:0x8051CDB0; // type:object size:0xC
-lbl_8051CDBC = .data:0x8051CDBC; // type:object size:0x18
+lbl_8051CD90 = .data:0x8051CD90; // type:object size:0xD data:string
+lbl_8051CDA0 = .data:0x8051CDA0; // type:object size:0xE data:string
+lbl_8051CDB0 = .data:0x8051CDB0; // type:object size:0x9 data:string
+lbl_8051CDBC = .data:0x8051CDBC; // type:object size:0x17 data:string
 __vt__19dLytMsgWindowTalk_c = .data:0x8051CDD4; // type:object size:0x44
 __vt__34sFStateID_c<19dLytMsgWindowTalk_c> = .data:0x8051CF88; // type:object size:0x34
 lbl_8051CFC0 = .data:0x8051CFC0; // type:object size:0x18
@@ -32216,23 +32216,23 @@ lbl_8051D3C0 = .data:0x8051D3C0; // type:object size:0xC
 lbl_8051D3CC = .data:0x8051D3CC; // type:object size:0x14
 __vt__18dLytMsgWindowGet_c = .data:0x8051D3E0; // type:object size:0x44
 __vt__33sFStateID_c<18dLytMsgWindowGet_c> = .data:0x8051D540; // type:object size:0x34
-lbl_8051D578 = .data:0x8051D578; // type:object size:0x1C
-lbl_8051D594 = .data:0x8051D594; // type:object size:0xC
-lbl_8051D5A0 = .data:0x8051D5A0; // type:object size:0x1C
+lbl_8051D578 = .data:0x8051D578; // type:object size:0x1A data:string
+lbl_8051D594 = .data:0x8051D594; // type:object size:0xB data:string
+lbl_8051D5A0 = .data:0x8051D5A0; // type:object size:0x1B data:string
 lbl_8051D5BC = .data:0x8051D5BC; // type:object size:0x1C data:string
-lbl_8051D5D8 = .data:0x8051D5D8; // type:object size:0xC
-lbl_8051D5E4 = .data:0x8051D5E4; // type:object size:0x20
-lbl_8051D604 = .data:0x8051D604; // type:object size:0xC
+lbl_8051D5D8 = .data:0x8051D5D8; // type:object size:0xA data:string
+lbl_8051D5E4 = .data:0x8051D5E4; // type:object size:0x1D data:string
+lbl_8051D604 = .data:0x8051D604; // type:object size:0xB data:string
 lbl_8051D610 = .data:0x8051D610; // type:object size:0x20 data:string
-lbl_8051D630 = .data:0x8051D630; // type:object size:0x10
-lbl_8051D640 = .data:0x8051D640; // type:object size:0xC
-lbl_8051D64C = .data:0x8051D64C; // type:object size:0xC
-lbl_8051D658 = .data:0x8051D658; // type:object size:0x10
+lbl_8051D630 = .data:0x8051D630; // type:object size:0xE data:string
+lbl_8051D640 = .data:0x8051D640; // type:object size:0xA data:string
+lbl_8051D64C = .data:0x8051D64C; // type:object size:0xB data:string
+lbl_8051D658 = .data:0x8051D658; // type:object size:0xE data:string
 lbl_8051D668 = .data:0x8051D668; // type:object size:0xC data:4byte
-lbl_8051D674 = .data:0x8051D674; // type:object size:0x10
-lbl_8051D684 = .data:0x8051D684; // type:object size:0x10
-lbl_8051D694 = .data:0x8051D694; // type:object size:0xC
-lbl_8051D6A0 = .data:0x8051D6A0; // type:object size:0x18
+lbl_8051D674 = .data:0x8051D674; // type:object size:0xD data:string
+lbl_8051D684 = .data:0x8051D684; // type:object size:0xE data:string
+lbl_8051D694 = .data:0x8051D694; // type:object size:0x9 data:string
+lbl_8051D6A0 = .data:0x8051D6A0; // type:object size:0x17 data:string
 __vt__20dLytMsgWindowSword_c = .data:0x8051D6B8; // type:object size:0x44
 __vt__35sFStateID_c<20dLytMsgWindowSword_c> = .data:0x8051D86C; // type:object size:0x34
 lbl_8051D8A0 = .data:0x8051D8A0; // type:object size:0x19 data:string
@@ -38206,7 +38206,7 @@ lbl_805725B8 = .sdata:0x805725B8; // type:object size:0x8 data:4byte
 lbl_805725C0 = .sdata:0x805725C0; // type:object size:0x8 data:4byte
 lbl_805725C8 = .sdata:0x805725C8; // type:object size:0x8 data:4byte
 lbl_805725D0 = .sdata:0x805725D0; // type:object size:0x8 data:4byte
-lbl_805725D8 = .sdata:0x805725D8; // type:object size:0x8 data:4byte
+lbl_805725D8 = .sdata:0x805725D8; // type:object size:0x4 data:4byte
 lbl_805725E0 = .sdata:0x805725E0; // type:object size:0x8 data:4byte
 lbl_805725E8 = .sdata:0x805725E8; // type:object size:0x8 data:4byte
 lbl_805725F0 = .sdata:0x805725F0; // type:object size:0x4 data:4byte
@@ -48853,11 +48853,11 @@ LytMsgWindowGet__STATE_INVISIBLE = .bss:0x805AEBC0; // type:object size:0x40 dat
 LytMsgWindowGet__STATE_IN = .bss:0x805AEC00; // type:object size:0x40 data:4byte
 LytMsgWindowGet__STATE_VISIBLE = .bss:0x805AEC40; // type:object size:0x40 data:4byte
 LytMsgWindowGet__STATE_OUT = .bss:0x805AEC80; // type:object size:0x30 data:4byte
-lbl_805AECB0 = .bss:0x805AECB0; // type:object size:0x10
-LytMsgWindowSword__STATE_INVISIBLE = .bss:0x805AECC0; // type:object size:0x40 data:4byte
-LytMsgWindowSword__STATE_IN = .bss:0x805AED00; // type:object size:0x40 data:4byte
-LytMsgWindowSword__STATE_WAIT = .bss:0x805AED40; // type:object size:0x40 data:4byte
-LytMsgWindowSword__STATE_VISIBLE = .bss:0x805AED80; // type:object size:0x40 data:4byte
+lbl_805AECB0 = .bss:0x805AECB0; // type:object size:0xC
+LytMsgWindowSword__STATE_INVISIBLE = .bss:0x805AECC0; // type:object size:0x30 data:4byte
+LytMsgWindowSword__STATE_IN = .bss:0x805AED00; // type:object size:0x30 data:4byte
+LytMsgWindowSword__STATE_WAIT = .bss:0x805AED40; // type:object size:0x30 data:4byte
+LytMsgWindowSword__STATE_VISIBLE = .bss:0x805AED80; // type:object size:0x30 data:4byte
 LytMsgWindowSword__STATE_OUT = .bss:0x805AEDC0; // type:object size:0x30 data:4byte
 lbl_805AEDF0 = .bss:0x805AEDF0; // type:object size:0xC
 StateID_Invisible__19dLytMsgWindowWood_c = .bss:0x805AEE00; // type:object size:0x30 data:4byte
diff --git a/configure.py b/configure.py
index 99f33c89..6a924d56 100644
--- a/configure.py
+++ b/configure.py
@@ -414,7 +414,7 @@ config.libs = [
             Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_talk.cpp"),
             Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_link.cpp"),
             Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_get.cpp"),
-            Object(NonMatching, "d/lyt/msg_window/d_lyt_msg_window_sword.cpp"),
+            Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_sword.cpp"),
             Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_wood.cpp"),
             Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_stone.cpp"),
             Object(Matching, "d/lyt/msg_window/d_lyt_msg_window_demo.cpp"),
diff --git a/include/toBeSorted/d_d3d.h b/include/toBeSorted/d_d3d.h
index 605c998c..f088d007 100644
--- a/include/toBeSorted/d_d3d.h
+++ b/include/toBeSorted/d_d3d.h
@@ -18,7 +18,7 @@
 
 namespace d3d {
 
-f32 fn_80016960(const mVec3_c&, const mVec3_c& pos);
+f32 fn_80016960(mVec3_c&, const mVec3_c& pos);
 bool fn_80016A90(const mVec3_c& pos);
 
 class AnmMdlWrapper : protected m3d::mdlAnmChr {
diff --git a/src/d/lyt/msg_window/d_lyt_msg_window_link.cpp b/src/d/lyt/msg_window/d_lyt_msg_window_link.cpp
index 7ed55489..e966279c 100644
--- a/src/d/lyt/msg_window/d_lyt_msg_window_link.cpp
+++ b/src/d/lyt/msg_window/d_lyt_msg_window_link.cpp
@@ -157,10 +157,9 @@ void dLytMsgWindowLink_c::executeState_In() {
         if (mAnm[LINK_ANIM_IN].isEndReached()) {
             v = mTranslationTo;
         } else {
-            // TODO - when you fix this, fix other instances of this
-            // by searching for de4663d6
-            v = mpPanes[4]->GetTranslate();
-            v += (mTranslationTo - v) / 2.0f;
+            v.copyFrom(mpPanes[4]->GetTranslate());
+            mVec3_c tmp = (mTranslationTo - v) / 2.0f;
+            v += tmp;
         }
         mpPanes[4]->SetTranslate(v);
     }
diff --git a/src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp b/src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp
index a7551517..e74bde12 100644
--- a/src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp
+++ b/src/d/lyt/msg_window/d_lyt_msg_window_sword.cpp
@@ -234,10 +234,9 @@ void dLytMsgWindowSword_c::executeState_Out() {
         if (mAnm[SWORD_ANIM_OUT].isEndReached()) {
             v = mTranslationFrom;
         } else {
-            // TODO - when you fix this, fix other instances of this
-            // by searching for de4663d6
-            v = mpPanes[2]->GetTranslate();
-            v += (mTranslationTo - v) / 2.0f;
+            v.copyFrom(mpPanes[2]->GetTranslate());
+            mVec3_c tmp = (mTranslationTo - v) / 2.0f;
+            v += tmp;
         }
         mpPanes[2]->SetTranslate(v);
     }
diff --git a/src/d/lyt/msg_window/d_lyt_msg_window_talk.cpp b/src/d/lyt/msg_window/d_lyt_msg_window_talk.cpp
index 56a4d1ef..8cdf182e 100644
--- a/src/d/lyt/msg_window/d_lyt_msg_window_talk.cpp
+++ b/src/d/lyt/msg_window/d_lyt_msg_window_talk.cpp
@@ -157,10 +157,9 @@ void dLytMsgWindowTalk_c::executeState_In() {
         if (mAnm[TALK_ANIM_IN].isEndReached()) {
             v = mTranslationTo;
         } else {
-            // TODO - when you fix this, fix other instances of this
-            // by searching for de4663d6
-            v = mpPanes[4]->GetTranslate();
-            v += (mTranslationTo - v) / 2.0f;
+            v.copyFrom(mpPanes[4]->GetTranslate());
+            mVec3_c tmp = (mTranslationTo - v) / 2.0f;
+            v += tmp;
         }
         mpPanes[4]->SetTranslate(v);
     }