diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/legonavcontroller.cpp
index 5b5fc38d..eefbbed1 100644
--- a/LEGO1/legonavcontroller.cpp
+++ b/LEGO1/legonavcontroller.cpp
@@ -1,5 +1,6 @@
 #include "legonavcontroller.h"
 
+#include "legoinputmanager.h"
 #include "legoomni.h"
 #include "legoutil.h"
 #include "legovideomanager.h"
@@ -106,18 +107,14 @@ LegoNavController::LegoNavController()
 	MxTimer* timer = Timer();
 	this->m_time = timer->GetTime();
 
-	// TODO: InputManager()
-	// LegoInputManager* inputManager = InputManager();
-	// inputManager->Register(this);
+	InputManager()->Register(this);
 }
 
-// TODO: InputManager()
 // OFFSET: LEGO1 0x10054c30
-// LegoNavController::~LegoNavController()
-// {
-//   LegoInputManager* inputManager = InputManager();
-//   inputManager->UnRegister(this);
-// }
+LegoNavController::~LegoNavController()
+{
+	InputManager()->UnRegister(this);
+}
 
 // OFFSET: LEGO1 0x10054ca0
 void LegoNavController::SetControlMax(int p_hMax, int p_vMax)
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/legonavcontroller.h
index 65b9f5ab..f7cfa3da 100644
--- a/LEGO1/legonavcontroller.h
+++ b/LEGO1/legonavcontroller.h
@@ -37,7 +37,7 @@ class LegoNavController : public MxCore {
 	);
 
 	LegoNavController();
-	// virtual ~LegoNavController(); // vtable+0x0
+	virtual ~LegoNavController() override; // vtable+0x0
 
 	// OFFSET: LEGO1 0x10054b80
 	inline const char* ClassName() const override // vtable+0xc
diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/legoobjectfactory.cpp
index b26686df..db59ad5e 100644
--- a/LEGO1/legoobjectfactory.cpp
+++ b/LEGO1/legoobjectfactory.cpp
@@ -31,8 +31,8 @@ MxCore* LegoObjectFactory::Create(const char* p_name)
 	}
 }
 
-// OFFSET: LEGO1 0x1000fb30 STUB
+// OFFSET: LEGO1 0x1000fb30
 void LegoObjectFactory::Destroy(MxCore* p_object)
 {
-	// TODO
+	delete p_object;
 }
diff --git a/LEGO1/pizza.cpp b/LEGO1/pizza.cpp
index e7eb0261..13df0739 100644
--- a/LEGO1/pizza.cpp
+++ b/LEGO1/pizza.cpp
@@ -20,7 +20,7 @@ Pizza::~Pizza()
 	TickleManager()->UnregisterClient(this);
 }
 
-// OFFSET: LEGO1 0x100388a0
+// OFFSET: LEGO1 0x100388a0 STUB
 MxResult Pizza::Tickle()
 {
 	// TODO