diff --git a/LEGO1/mxentity.cpp b/LEGO1/mxentity.cpp
index f6fd86fd..d5e97e6c 100644
--- a/LEGO1/mxentity.cpp
+++ b/LEGO1/mxentity.cpp
@@ -12,9 +12,9 @@ MxEntity::~MxEntity()
 }
 
 // OFFSET: LEGO1 0x10001070
-MxResult MxEntity::SetEntityId(MxS32 p_id, MxAtomId *p_atom)
+MxResult MxEntity::SetEntityId(MxS32 p_id, const MxAtomId &p_atom)
 {
   this->m_mxEntityId = p_id;
-  // FIXME: MxAtomId operator call, probably it will be return whatever the comparison is for comparing this->m_atom to the p_atom
+  this->m_atom = p_atom;
   return FALSE;
 }
\ No newline at end of file
diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h
index d37fea80..6c98782d 100644
--- a/LEGO1/mxentity.h
+++ b/LEGO1/mxentity.h
@@ -25,7 +25,7 @@ class MxEntity : public MxCore
     return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name);
   }
 
-  virtual MxResult MxEntity::SetEntityId(MxS32 p_id, MxAtomId *p_atom);
+  virtual MxResult SetEntityId(MxS32 p_id, const MxAtomId &p_atom); // vtable+0x14
 private:
   MxS32 m_mxEntityId; // 0x8
   MxAtomId m_atom; // 0xc
diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/mxeventmanager.cpp
index 47321191..5383c25a 100644
--- a/LEGO1/mxeventmanager.cpp
+++ b/LEGO1/mxeventmanager.cpp
@@ -15,7 +15,4 @@ MxEventManager::~MxEventManager()
 // OFFSET: LEGO1 0x100c0450
 void MxEventManager::Init()
 {
-  // huh?
-  // imagine if the devs actually put this here to troll us
-  return;
 }
\ No newline at end of file