diff --git a/README.md b/README.md
index 54c2fa1f0..4e1a39db6 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The latest release of Stroop can be downloaded from our [Releases Page](https://
* Windows 10 / Windows 8 / Windows 7 / Windows Vista 64-bit or 32-bit
* OpenGL 3.0 or greater (requirement for map tab only)
* .NET Framework 4.6 (See [.NET Framework System Requirements](https://msdn.microsoft.com/en-us/library/8z6watww(v=vs.110).aspx) for more information)
- * Mupen 0.5 rerecording (0.5.1 will not work)
+ * [Mupen 0.5 rerecording](http://adelikat.tasvideos.org/emulatordownloads/mupen64-rr/Mupen64%20v8%20installer.zip) (0.5.1 will not work)
* 64 Marios (Must be super)
* Marios must be American (No PAL or JAP just yet)
diff --git a/Source/SM64 Diagnostic/Config/Config.xml b/Source/SM64 Diagnostic/Config/Config.xml
index 0c9d9460f..0118088e4 100644
--- a/Source/SM64 Diagnostic/Config/Config.xml
+++ b/Source/SM64 Diagnostic/Config/Config.xml
@@ -21,7 +21,7 @@
0x164
0x168
0x16C
- 0xC8
+ 0xD4
240
300
@@ -73,6 +73,9 @@
0x8033b21c
0x8033b218
0x8033b21a
+ 0x8033b260
+ 0x8033b262
+ 0x8033b268
2176
4
0
diff --git a/Source/SM64 Diagnostic/Config/MarioData.xml b/Source/SM64 Diagnostic/Config/MarioData.xml
index 639c7d78b..d4c743671 100644
--- a/Source/SM64 Diagnostic/Config/MarioData.xml
+++ b/Source/SM64 Diagnostic/Config/MarioData.xml
@@ -14,15 +14,14 @@
Yaw (Facing)
Yaw (Moving)
Yaw (Intended)
- Cannon Yaw
Pitch
Roll
Yaw Velocity
Flying Pull Back
- Interaction Object
- Using Object
- Stood On Object
- Held Object
+ Interaction Object
+ Using Object
+ Stood On Object
+ Held Object
HOLP X
HOLP Y
HOLP Z
diff --git a/Source/SM64 Diagnostic/Config/ObjectAssociations.xml b/Source/SM64 Diagnostic/Config/ObjectAssociations.xml
index 700f54b68..af9a9b5dc 100644
--- a/Source/SM64 Diagnostic/Config/ObjectAssociations.xml
+++ b/Source/SM64 Diagnostic/Config/ObjectAssociations.xml
@@ -177,12 +177,10 @@
-