diff --git a/include/System/Game/GameSystem.h b/include/System/Game/GameSystem.h
index 4ff8e08d..0538655f 100644
--- a/include/System/Game/GameSystem.h
+++ b/include/System/Game/GameSystem.h
@@ -21,6 +21,21 @@ class GameSystem : public NerveExecutor
 {
 public:
     GameSystem();
+
+    void* mFIFOBase; // _8
+    u32* _C; // GameSequenceDirector*
+    u32* _10; // GameSystemDimmingWatcher*
+    u32* _14; // GameSystemErrorWatcher*
+    u32* _18; // GameSystemFontHolder*
+    u32* _1C; // GameSystemFrameControl*
+    u32* _20; // GameSystemObjHolder*
+    u32* _24; // GameSystemSceneController*
+    u32* _28; // GameSystemStationedArchiveLoader*
+    u32* _2C; // HomeButtonLayout*
+    u32* _30; // SystemWipeHolder*
+    u32* _34; // HomeButtonStateNotifier*
+
+    bool mIsLoadingSystemArchive; // _38
 };
 
 #endif // GAMESYSTEM_H
\ No newline at end of file
diff --git a/include/System/Game/GameSystem/GameSystemErrorWatcher.h b/include/System/Game/GameSystem/GameSystemErrorWatcher.h
new file mode 100644
index 00000000..f63a996a
--- /dev/null
+++ b/include/System/Game/GameSystem/GameSystemErrorWatcher.h
@@ -0,0 +1,18 @@
+#ifndef GAMESYSTEMERRORWATCHER_H
+#define GAMESYSTEMERRORWATCHER_H
+
+#include "Actor/Nerve/NerveExecutor.h"
+
+class GameSystemErrorWatcher : public NerveExecutor
+{
+public:
+    GameSystemErrorWatcher();
+
+    void initAfterResourceLoaded();
+    void movement();
+    void draw();
+    bool isWarning() const;
+    void setPermissionUpdateWiiRemoteStatus(bool);
+};
+
+#endif // GAMESYSTEMERROROWATCHER_H
\ No newline at end of file
diff --git a/include/System/ScenarioDataParser.h b/include/System/ScenarioDataParser.h
new file mode 100644
index 00000000..30460243
--- /dev/null
+++ b/include/System/ScenarioDataParser.h
@@ -0,0 +1,10 @@
+#ifndef SCENARIODATAPARSER_H
+#define SCENARIODATAPARSER_H
+
+class ScenarioData
+{
+public:
+    ScenarioData(const char *);
+};
+
+#endif // SCENARIODATAPARSER_H
\ No newline at end of file
diff --git a/source/Actor/NameObj/NameObj.cpp b/source/Actor/NameObj/NameObj.cpp
index d549eb79..ab51dd73 100644
--- a/source/Actor/NameObj/NameObj.cpp
+++ b/source/Actor/NameObj/NameObj.cpp
@@ -11,8 +11,7 @@ NameObj::NameObj(const char *pName)
     mFlags = temp;
     _A = temp2;
 
-    NameObjRegister* pReg = SingletonHolder<NameObjRegister>::sInstance;
-    pReg->add(this);
+    SingletonHolder<NameObjRegister>::sInstance->add(this);
 }
 
 void NameObj::init(const JMapInfoIter &infoIter)
diff --git a/source/System/Game/GameSystem.cpp b/source/System/Game/GameSystem.cpp
index ac6816f0..ca3d64ca 100644
--- a/source/System/Game/GameSystem.cpp
+++ b/source/System/Game/GameSystem.cpp
@@ -1,10 +1,15 @@
 #include "System/Game/GameSystem.h"
+#include "MR/ModelUtil.h"
+#include <revolution/os.h>
 
 void main()
 {
+    OSInitFastCast();
     DVDInit();
     VIInit();
-
-    // blah blah mutex
+    // HeapMemoryWatcher::createRootHeap()
+    OSInitMutex(&MR::MutexHolder<0>::sMutex);
+    OSInitMutex(&MR::MutexHolder<1>::sMutex);
+    OSInitMutex(&MR::MutexHolder<2>::sMutex);
     nw4r::lyt::LytInit();
 }
\ No newline at end of file