diff --git a/.clang-format b/.clang-format
index 19e35762..5d97094c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -30,6 +30,7 @@ QualifierOrder:
   - const
   - volatile
   - type
+RemoveSemicolon: true
 SpaceAfterCStyleCast: true
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 3bc28a0d..324d7195 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -14,13 +14,13 @@ class Act1State : public LegoState {
 	{
 		// STRING: LEGO1 0x100f0154
 		return "Act1State";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x100338b0
 	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, Act1State::ClassName()) || LegoState::IsA(p_name);
-	};
+	}
 
 	virtual MxBool SetFlag() override;                          // vtable+0x18
 	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1c
@@ -36,15 +36,15 @@ class Act1State : public LegoState {
 	// Act1State::`scalar deleting destructor'
 
 protected:
-	undefined m_unk0x8[0x10]; // 0x8
-	MxU32 m_unk0x18;          // 0x18
-	undefined2 m_unk0x1c;     // 0x1c
-	undefined m_unk0x1e;      // 0x1e
-	undefined m_unk0x1f;      // 0x1f
-	undefined m_unk0x20;      // 0x20
-	MxBool m_unk0x21;         // 0x21
-	undefined m_unk0x22;      // 0x22
-							  // TODO
+	undefined m_unk0x08[0x10]; // 0x08
+	MxU32 m_unk0x18;           // 0x18
+	undefined2 m_unk0x1c;      // 0x1c
+	undefined m_unk0x1e;       // 0x1e
+	undefined m_unk0x1f;       // 0x1f
+	undefined m_unk0x20;       // 0x20
+	MxBool m_unk0x21;          // 0x21
+	undefined m_unk0x22;       // 0x22
+							   // TODO
 };
 
 #endif // ACT1STATE_H
diff --git a/LEGO1/lego/legoomni/include/act2brick.h b/LEGO1/lego/legoomni/include/act2brick.h
index e9f771ad..635fac2d 100644
--- a/LEGO1/lego/legoomni/include/act2brick.h
+++ b/LEGO1/lego/legoomni/include/act2brick.h
@@ -8,9 +8,9 @@
 class Act2Brick : public LegoPathActor {
 public:
 	Act2Brick();
-	virtual ~Act2Brick() override; // vtable+0x0
+	virtual ~Act2Brick() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1007a360
diff --git a/LEGO1/lego/legoomni/include/act2policestation.h b/LEGO1/lego/legoomni/include/act2policestation.h
index 4746236f..3fa7ebb4 100644
--- a/LEGO1/lego/legoomni/include/act2policestation.h
+++ b/LEGO1/lego/legoomni/include/act2policestation.h
@@ -7,7 +7,7 @@
 // SIZE 0x68
 class Act2PoliceStation : public LegoEntity {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e200
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h
index f9794f7c..fe27b743 100644
--- a/LEGO1/lego/legoomni/include/act3.h
+++ b/LEGO1/lego/legoomni/include/act3.h
@@ -11,8 +11,8 @@ class Act3 : public LegoWorld {
 
 	virtual ~Act3() override; // vtable+00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10072510
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/act3state.h b/LEGO1/lego/legoomni/include/act3state.h
index c88c4620..1c8643f7 100644
--- a/LEGO1/lego/legoomni/include/act3state.h
+++ b/LEGO1/lego/legoomni/include/act3state.h
@@ -4,7 +4,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d4fc8
-// SIZE 0xc
+// SIZE 0x0c
 class Act3State : public LegoState {
 public:
 	inline Act3State() { m_unk0x08 = 0; }
diff --git a/LEGO1/lego/legoomni/include/ambulancemissionstate.h b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
index 923a0cc3..cefc3c21 100644
--- a/LEGO1/lego/legoomni/include/ambulancemissionstate.h
+++ b/LEGO1/lego/legoomni/include/ambulancemissionstate.h
@@ -46,18 +46,18 @@ class AmbulanceMissionState : public LegoState {
 	// AmbulanceMissionState::`scalar deleting destructor'
 
 protected:
-	undefined4 m_unk0x8; // 0x08
-	undefined4 m_unk0xc; // 0x0c
-	MxU16 m_unk0x10;     // 0x10
-	MxU16 m_unk0x12;     // 0x12
-	MxU16 m_unk0x14;     // 0x14
-	MxU16 m_unk0x16;     // 0x16
-	MxU16 m_unk0x18;     // 0x18
-	MxU16 m_color1;      // 0x1a
-	MxU16 m_color2;      // 0x1c
-	MxU16 m_color3;      // 0x1e
-	MxU16 m_color4;      // 0x20
-	MxU16 m_color5;      // 0x22
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	MxU16 m_unk0x10;      // 0x10
+	MxU16 m_unk0x12;      // 0x12
+	MxU16 m_unk0x14;      // 0x14
+	MxU16 m_unk0x16;      // 0x16
+	MxU16 m_unk0x18;      // 0x18
+	MxU16 m_color1;       // 0x1a
+	MxU16 m_color2;       // 0x1c
+	MxU16 m_color3;       // 0x1e
+	MxU16 m_color4;       // 0x20
+	MxU16 m_color5;       // 0x22
 };
 
 #endif // AMBULANCEMISSIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/animstate.h b/LEGO1/lego/legoomni/include/animstate.h
index 9ac03a4c..8d785b11 100644
--- a/LEGO1/lego/legoomni/include/animstate.h
+++ b/LEGO1/lego/legoomni/include/animstate.h
@@ -8,7 +8,7 @@
 class AnimState : public LegoState {
 public:
 	AnimState();
-	virtual ~AnimState() override; // vtable+0x0
+	virtual ~AnimState() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10065070
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -30,11 +30,11 @@ class AnimState : public LegoState {
 	// AnimState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x8;
-	undefined4 m_unk0xc;
-	void* m_unk0x10;
-	undefined4 m_unk0x14;
-	void* m_unk0x18;
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	void* m_unk0x10;      // 0x10
+	undefined4 m_unk0x14; // 0x14
+	void* m_unk0x18;      // 0x18
 };
 
 #endif // ANIMSTATE_H
diff --git a/LEGO1/lego/legoomni/include/buildingentity.h b/LEGO1/lego/legoomni/include/buildingentity.h
index 0e9a9d45..490c6a0d 100644
--- a/LEGO1/lego/legoomni/include/buildingentity.h
+++ b/LEGO1/lego/legoomni/include/buildingentity.h
@@ -8,9 +8,9 @@
 class BuildingEntity : public LegoEntity {
 public:
 	BuildingEntity();
-	virtual ~BuildingEntity() override; // vtable+0x0
+	virtual ~BuildingEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/bumpbouy.h b/LEGO1/lego/legoomni/include/bumpbouy.h
index 112801b2..7dc02c82 100644
--- a/LEGO1/lego/legoomni/include/bumpbouy.h
+++ b/LEGO1/lego/legoomni/include/bumpbouy.h
@@ -7,7 +7,7 @@
 // VTABLE: LEGO1 0x100d6790
 class BumpBouy : public LegoAnimActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100274e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/elevatorbottom.h b/LEGO1/lego/legoomni/include/elevatorbottom.h
index 5bf8bced..e52f5556 100644
--- a/LEGO1/lego/legoomni/include/elevatorbottom.h
+++ b/LEGO1/lego/legoomni/include/elevatorbottom.h
@@ -9,9 +9,9 @@
 class ElevatorBottom : public LegoWorld {
 public:
 	ElevatorBottom();
-	virtual ~ElevatorBottom() override; // vtable+0x0
+	virtual ~ElevatorBottom() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10017f20
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h
index 9efb8886..baa42ab2 100644
--- a/LEGO1/lego/legoomni/include/gasstation.h
+++ b/LEGO1/lego/legoomni/include/gasstation.h
@@ -11,10 +11,10 @@
 class GasStation : public LegoWorld {
 public:
 	GasStation();
-	virtual ~GasStation() override; // vtable+0x0
+	virtual ~GasStation() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10004780
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index 57fd0d39..a756e783 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -28,13 +28,13 @@ class GasStationState : public LegoState {
 	// GasStationState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x08[3];
-	undefined4 m_unk0x14;
-	undefined2 m_unk0x18;
-	undefined2 m_unk0x1a;
-	undefined2 m_unk0x1c;
-	undefined2 m_unk0x1e;
-	undefined2 m_unk0x20;
+	undefined4 m_unk0x08[3]; // 0x08
+	undefined4 m_unk0x14;    // 0x14
+	undefined2 m_unk0x18;    // 0x18
+	undefined2 m_unk0x1a;    // 0x1a
+	undefined2 m_unk0x1c;    // 0x1c
+	undefined2 m_unk0x1e;    // 0x1e
+	undefined2 m_unk0x20;    // 0x20
 };
 
 #endif // GASSTATIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/gifmanager.h b/LEGO1/lego/legoomni/include/gifmanager.h
index 898ab1fb..1d424fb7 100644
--- a/LEGO1/lego/legoomni/include/gifmanager.h
+++ b/LEGO1/lego/legoomni/include/gifmanager.h
@@ -76,7 +76,7 @@ class GifManagerBase {
 // SIZE 0x24
 class GifManager : public GifManagerBase {
 public:
-	GifManager() { m_ownership = TRUE; };
+	GifManager() { m_ownership = TRUE; }
 	virtual ~GifManager() override;
 
 	// SYNTHETIC: LEGO1 0x1005a580
diff --git a/LEGO1/lego/legoomni/include/helicopter.h b/LEGO1/lego/legoomni/include/helicopter.h
index 10bcd7da..74670324 100644
--- a/LEGO1/lego/legoomni/include/helicopter.h
+++ b/LEGO1/lego/legoomni/include/helicopter.h
@@ -12,7 +12,7 @@ class HelicopterSubclass {
 	MxResult FUN_100040a0(Vector4& p_v, float p_f);
 
 private:
-	Mx4DPointFloat m_unk0x0;  // 0x0
+	Mx4DPointFloat m_unk0x00; // 0x00
 	Mx4DPointFloat m_unk0x18; // 0x18
 	undefined4 m_unk0x30;     // 0x30
 };
@@ -22,7 +22,7 @@ class HelicopterSubclass {
 class Helicopter : public IslePathActor {
 public:
 	Helicopter();
-	virtual ~Helicopter() override; // vtable+0x0
+	virtual ~Helicopter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10003070
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/helicopterstate.h b/LEGO1/lego/legoomni/include/helicopterstate.h
index 52a92192..a1562157 100644
--- a/LEGO1/lego/legoomni/include/helicopterstate.h
+++ b/LEGO1/lego/legoomni/include/helicopterstate.h
@@ -5,7 +5,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d5418
-// SIZE 0xc
+// SIZE 0x0c
 class HelicopterState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000e0d0
@@ -22,23 +22,23 @@ class HelicopterState : public LegoState {
 	}
 
 	// FUNCTION: LEGO1 0x1000e0b0
-	virtual MxBool VTable0x14() override { return FALSE; }; // vtable+0x14
+	virtual MxBool VTable0x14() override { return FALSE; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x1000e0c0
 	virtual MxBool SetFlag() override
 	{
-		m_unk0x8 = 0;
+		m_unk0x08 = 0;
 		return TRUE;
-	}; // vtable+0x18
+	} // vtable+0x18
 
-	inline void SetUnknown8(MxU32 p_unk0x8) { m_unk0x8 = p_unk0x8; }
-	inline MxU32 GetUnkown8() { return m_unk0x8; }
+	inline void SetUnknown8(MxU32 p_unk0x08) { m_unk0x08 = p_unk0x08; }
+	inline MxU32 GetUnkown8() { return m_unk0x08; }
 
 	// SYNTHETIC: LEGO1 0x1000e190
 	// HelicopterState::`scalar deleting destructor'
 
 protected:
-	MxU32 m_unk0x8; // 0x8
+	MxU32 m_unk0x08; // 0x08
 };
 
 #endif // HELICOPTERSTATE_H
diff --git a/LEGO1/lego/legoomni/include/historybook.h b/LEGO1/lego/legoomni/include/historybook.h
index a5299f63..9152e07a 100644
--- a/LEGO1/lego/legoomni/include/historybook.h
+++ b/LEGO1/lego/legoomni/include/historybook.h
@@ -8,9 +8,9 @@
 class HistoryBook : public LegoWorld {
 public:
 	HistoryBook();
-	virtual ~HistoryBook() override; // vtable+0x0
+	virtual ~HistoryBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10082390
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/hospital.h b/LEGO1/lego/legoomni/include/hospital.h
index 194cb690..ad8bd137 100644
--- a/LEGO1/lego/legoomni/include/hospital.h
+++ b/LEGO1/lego/legoomni/include/hospital.h
@@ -9,7 +9,7 @@
 class Hospital : public LegoWorld {
 public:
 	Hospital();
-	virtual ~Hospital() override; // vtable+0x0
+	virtual ~Hospital() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 	virtual MxResult Tickle() override;               // vtable+0x08
diff --git a/LEGO1/lego/legoomni/include/hospitalstate.h b/LEGO1/lego/legoomni/include/hospitalstate.h
index a38cfd2e..a6ccd77a 100644
--- a/LEGO1/lego/legoomni/include/hospitalstate.h
+++ b/LEGO1/lego/legoomni/include/hospitalstate.h
@@ -9,6 +9,7 @@
 class HospitalState : public LegoState {
 public:
 	HospitalState();
+	virtual ~HospitalState() override {}
 
 	// FUNCTION: LEGO1 0x10076400
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -29,13 +30,13 @@ class HospitalState : public LegoState {
 	// HospitalState::`scalar deleting destructor'
 
 private:
-	undefined m_unk0x8[4]; // 0x8
-	undefined2 m_unk0xc;   // 0xc
-	undefined2 m_unk0xe;   // 0xe
-	undefined2 m_unk0x10;  // 0x10
-	undefined2 m_unk0x12;  // 0x12
-	undefined2 m_unk0x14;  // 0x14
-	undefined2 m_unk0x16;  // 0x16
+	undefined m_unk0x08[4]; // 0x08
+	undefined2 m_unk0x0c;   // 0x0c
+	undefined2 m_unk0x0e;   // 0x0e
+	undefined2 m_unk0x10;   // 0x10
+	undefined2 m_unk0x12;   // 0x12
+	undefined2 m_unk0x14;   // 0x14
+	undefined2 m_unk0x16;   // 0x16
 };
 
 #endif // HOSPITALSTATE_H
diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h
index fe6efff8..b46099cd 100644
--- a/LEGO1/lego/legoomni/include/infocenter.h
+++ b/LEGO1/lego/legoomni/include/infocenter.h
@@ -132,8 +132,8 @@ class Infocenter : public LegoWorld {
 	Infocenter();
 	virtual ~Infocenter() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1006eb40
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/infocenterdoor.h b/LEGO1/lego/legoomni/include/infocenterdoor.h
index de3159f6..1d7b361d 100644
--- a/LEGO1/lego/legoomni/include/infocenterdoor.h
+++ b/LEGO1/lego/legoomni/include/infocenterdoor.h
@@ -8,9 +8,9 @@
 class InfocenterDoor : public LegoWorld {
 public:
 	InfocenterDoor();
-	virtual ~InfocenterDoor(); // vtable+0x0
+	virtual ~InfocenterDoor(); // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100377b0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/infocenterstate.h b/LEGO1/lego/legoomni/include/infocenterstate.h
index 8314529f..9399f8f4 100644
--- a/LEGO1/lego/legoomni/include/infocenterstate.h
+++ b/LEGO1/lego/legoomni/include/infocenterstate.h
@@ -10,7 +10,7 @@
 class InfocenterState : public LegoState {
 public:
 	InfocenterState();
-	virtual ~InfocenterState();
+	virtual ~InfocenterState() override;
 
 	// FUNCTION: LEGO1 0x10071840
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/isle.h b/LEGO1/lego/legoomni/include/isle.h
index 148e099f..04871028 100644
--- a/LEGO1/lego/legoomni/include/isle.h
+++ b/LEGO1/lego/legoomni/include/isle.h
@@ -24,7 +24,7 @@ class Isle : public LegoWorld {
 public:
 	Isle();
 	virtual ~Isle() override;
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10030910
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/isleactor.h b/LEGO1/lego/legoomni/include/isleactor.h
index f9092363..d8253821 100644
--- a/LEGO1/lego/legoomni/include/isleactor.h
+++ b/LEGO1/lego/legoomni/include/isleactor.h
@@ -6,7 +6,7 @@
 // VTABLE: LEGO1 0x100d5178
 class IsleActor : public LegoActor {
 public:
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000e660
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 2e92c251..2770b457 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -15,9 +15,9 @@ class IslePathActor : public LegoPathActor {
 	IslePathActor();
 
 	// FUNCTION: LEGO1 0x10002e10
-	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x0
+	inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10002ea0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/jukebox.h b/LEGO1/lego/legoomni/include/jukebox.h
index 9710a841..f760641d 100644
--- a/LEGO1/lego/legoomni/include/jukebox.h
+++ b/LEGO1/lego/legoomni/include/jukebox.h
@@ -10,8 +10,8 @@ class JukeBox : public LegoWorld {
 public:
 	JukeBox();
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005d6f0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/jukeboxentity.h b/LEGO1/lego/legoomni/include/jukeboxentity.h
index a0121eed..38691ba6 100644
--- a/LEGO1/lego/legoomni/include/jukeboxentity.h
+++ b/LEGO1/lego/legoomni/include/jukeboxentity.h
@@ -8,9 +8,9 @@
 class JukeBoxEntity : public LegoEntity {
 public:
 	JukeBoxEntity();
-	virtual ~JukeBoxEntity() override; // vtable+0x0
+	virtual ~JukeBoxEntity() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10085cc0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoact2state.h b/LEGO1/lego/legoomni/include/legoact2state.h
index b2ae4b7e..e37af2dc 100644
--- a/LEGO1/lego/legoomni/include/legoact2state.h
+++ b/LEGO1/lego/legoomni/include/legoact2state.h
@@ -7,6 +7,8 @@
 // SIZE 0x10
 class LegoAct2State : public LegoState {
 public:
+	virtual ~LegoAct2State() override {}
+
 	// FUNCTION: LEGO1 0x1000df80
 	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
diff --git a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
index 0cc18935..633fc5eb 100644
--- a/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoactioncontrolpresenter.h
@@ -10,7 +10,7 @@
 class LegoActionControlPresenter : public MxMediaPresenter {
 public:
 	inline LegoActionControlPresenter() { m_unk0x50 = Extra::ActionType::e_none; }
-	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~LegoActionControlPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d0e0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h
index 82dc429d..c8ad60cd 100644
--- a/LEGO1/lego/legoomni/include/legoanimationmanager.h
+++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h
@@ -9,10 +9,10 @@
 class LegoAnimationManager : public MxCore {
 public:
 	LegoAnimationManager();
-	virtual ~LegoAnimationManager() override; // vtable+0x0
+	virtual ~LegoAnimationManager() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005ec80
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h
index 594c13ca..2a2845cf 100644
--- a/LEGO1/lego/legoomni/include/legoanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h
@@ -87,11 +87,11 @@ class LegoAnimClass : public LegoTree {
 	virtual LegoTreeNodeData* CreateData() override;           // vtable+0x0c
 	virtual MxResult VTable0x10(LegoMemory* p_stream, MxS32);  // vtable+0x10
 
-	inline MxLong GetUnknown0x8() { return m_unk0x8; }
+	inline MxLong GetUnknown0x8() { return m_unk0x08; }
 
 private:
-	MxLong m_unk0x8;      // 0x08
-	undefined4 m_unk0xc;  // 0x0c
+	MxLong m_unk0x08;     // 0x08
+	undefined4 m_unk0x0c; // 0x0c
 	undefined4 m_unk0x10; // 0x10
 	undefined4 m_unk0x14; // 0x14
 };
diff --git a/LEGO1/lego/legoomni/include/legocachesound.h b/LEGO1/lego/legoomni/include/legocachesound.h
index 1c3dfcc4..44ddb859 100644
--- a/LEGO1/lego/legoomni/include/legocachesound.h
+++ b/LEGO1/lego/legoomni/include/legocachesound.h
@@ -9,7 +9,7 @@
 class LegoCacheSound : public MxCore {
 public:
 	LegoCacheSound();
-	virtual ~LegoCacheSound() override; // vtable+0x0
+	virtual ~LegoCacheSound() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10006580
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocachesoundlist.h b/LEGO1/lego/legoomni/include/legocachesoundlist.h
index c97d578f..2080ae14 100644
--- a/LEGO1/lego/legoomni/include/legocachesoundlist.h
+++ b/LEGO1/lego/legoomni/include/legocachesoundlist.h
@@ -25,7 +25,7 @@ class LegoCacheSoundList : public MxPtrList<LegoCacheSound> {
 	virtual MxS8 Compare(LegoCacheSound* p_a, LegoCacheSound* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 };
 
 // VTABLE: LEGO1 0x100d64a0
diff --git a/LEGO1/lego/legoomni/include/legocameracontroller.h b/LEGO1/lego/legoomni/include/legocameracontroller.h
index 7d038d02..a3ef12a7 100644
--- a/LEGO1/lego/legoomni/include/legocameracontroller.h
+++ b/LEGO1/lego/legoomni/include/legocameracontroller.h
@@ -12,7 +12,7 @@
 class LegoCameraController : public LegoPointOfViewController {
 public:
 	LegoCameraController();
-	virtual ~LegoCameraController() override; // vtable+0x0
+	virtual ~LegoCameraController() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+04
 
diff --git a/LEGO1/lego/legoomni/include/legocarbuild.h b/LEGO1/lego/legoomni/include/legocarbuild.h
index cfe4990d..3ce04e02 100644
--- a/LEGO1/lego/legoomni/include/legocarbuild.h
+++ b/LEGO1/lego/legoomni/include/legocarbuild.h
@@ -10,8 +10,8 @@ class LegoCarBuild : public LegoWorld {
 	LegoCarBuild();
 	virtual ~LegoCarBuild() override;
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10022940
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
index fb2d254d..d15e2f19 100644
--- a/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
@@ -8,7 +8,7 @@
 class LegoCarBuildAnimPresenter : public LegoAnimPresenter {
 public:
 	LegoCarBuildAnimPresenter();
-	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x0
+	virtual ~LegoCarBuildAnimPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10078510
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legocontrolmanager.h b/LEGO1/lego/legoomni/include/legocontrolmanager.h
index f2f04026..0206c520 100644
--- a/LEGO1/lego/legoomni/include/legocontrolmanager.h
+++ b/LEGO1/lego/legoomni/include/legocontrolmanager.h
@@ -40,9 +40,9 @@ class LegoControlManagerEvent : public LegoEventNotificationParam {
 class LegoControlManager : public MxCore {
 public:
 	LegoControlManager();
-	virtual ~LegoControlManager() override; // vtable+0x0
+	virtual ~LegoControlManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10028cb0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h
index 99813972..c5088097 100644
--- a/LEGO1/lego/legoomni/include/legoentity.h
+++ b/LEGO1/lego/legoomni/include/legoentity.h
@@ -9,7 +9,7 @@
 #include "roi/legoroi.h"
 
 // VTABLE: LEGO1 0x100d4858
-// SIZE 0x68 (probably)
+// SIZE 0x68
 class LegoEntity : public MxEntity {
 public:
 	enum {
@@ -17,16 +17,15 @@ class LegoEntity : public MxEntity {
 		c_bit2 = 0x02
 	};
 
-	// Inlined at 0x100853f7
 	inline LegoEntity() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c290
 	virtual ~LegoEntity() override { Destroy(TRUE); }
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1000c2f0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0064
 		return "LegoEntity";
@@ -38,22 +37,23 @@ class LegoEntity : public MxEntity {
 		return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
 	}
 
-	virtual MxResult Create(MxDSAction& p_dsAction);                     // vtable+0x18
-	virtual void Destroy(MxBool p_fromDestructor);                       // vtable+0x1c
-	virtual void ParseAction(char*);                                     // vtable+0x20
-	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
-	virtual void SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir,
-								   const Vector3& p_up);  // vtable+0x28
-	virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
+	virtual MxResult Create(MxDSAction& p_dsAction);                                                 // vtable+0x18
+	virtual void Destroy(MxBool p_fromDestructor);                                                   // vtable+0x1c
+	virtual void ParseAction(char*);                                                                 // vtable+0x20
+	virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2);                             // vtable+0x24
+	virtual void SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir, const Vector3& p_up); // vtable+0x28
+	virtual void ResetWorldTransform(MxBool p_inVehicle);                                            // vtable+0x2c
+
 	// FUNCTION: LEGO1 0x10001090
 	virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
-	virtual void VTable0x34();                                                        // vtable+0x34
-	virtual void VTable0x38();                                                        // vtable+0x38
-	virtual void VTable0x3c();                                                        // vtable+0x3c
-	virtual void VTable0x40();                                                        // vtable+0x40
-	virtual void VTable0x44();                                                        // vtable+0x44
-	virtual void VTable0x48();                                                        // vtable+0x48
-	virtual void VTable0x4c();                                                        // vtable+0x4c
+
+	virtual void VTable0x34(); // vtable+0x34
+	virtual void VTable0x38(); // vtable+0x38
+	virtual void VTable0x3c(); // vtable+0x3c
+	virtual void VTable0x40(); // vtable+0x40
+	virtual void VTable0x44(); // vtable+0x44
+	virtual void VTable0x48(); // vtable+0x48
+	virtual void VTable0x4c(); // vtable+0x4c
 
 	void FUN_10010c30();
 	void SetLocation(Mx3DPointFloat& p_location, Mx3DPointFloat& p_direction, Mx3DPointFloat& p_up, MxBool);
diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index aa691da8..d1c1383f 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -25,7 +25,7 @@ class LegoEntityList : public MxPtrList<LegoEntity> {
 	virtual MxS8 Compare(LegoEntity* p_a, LegoEntity* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 };
 
 // VTABLE: LEGO1 0x100d64e8
diff --git a/LEGO1/lego/legoomni/include/legoentitypresenter.h b/LEGO1/lego/legoomni/include/legoentitypresenter.h
index 249e8b5c..291809ab 100644
--- a/LEGO1/lego/legoomni/include/legoentitypresenter.h
+++ b/LEGO1/lego/legoomni/include/legoentitypresenter.h
@@ -10,10 +10,10 @@ class LegoEntity;
 class LegoEntityPresenter : public MxCompositePresenter {
 public:
 	LegoEntityPresenter();
-	virtual ~LegoEntityPresenter() override; // vtable+0x0
+	virtual ~LegoEntityPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100534b0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06b8
 		return "LegoEntityPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
index 731b53bb..650ef8f6 100644
--- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
+++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h
@@ -18,7 +18,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
 			new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
 		clone->m_roi = m_roi;
 		return clone;
-	}; // vtable+0x4
+	} // vtable+0x04
 
 	inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
 	inline LegoEventNotificationParam(
diff --git a/LEGO1/lego/legoomni/include/legoextraactor.h b/LEGO1/lego/legoomni/include/legoextraactor.h
index c4c76cee..87a0ab21 100644
--- a/LEGO1/lego/legoomni/include/legoextraactor.h
+++ b/LEGO1/lego/legoomni/include/legoextraactor.h
@@ -7,7 +7,7 @@
 class LegoExtraActor : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x1002b7a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f3204
 		return "LegoExtraActor";
diff --git a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
index 9b136074..f86cf448 100644
--- a/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
+++ b/LEGO1/lego/legoomni/include/legoflctexturepresenter.h
@@ -11,7 +11,7 @@ class LegoFlcTexturePresenter : public MxFlcPresenter {
 	LegoFlcTexturePresenter();
 
 	// FUNCTION: LEGO1 0x1005def0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0634
 		return "LegoFlcTexturePresenter";
diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index 51d7b888..318aa7a3 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -35,7 +35,7 @@ class LegoGameState {
 	void FUN_1003a720(MxU32);
 	void HandleAction(MxU32);
 
-	inline MxU8 GetUnknownC() { return m_unk0xc; }
+	inline MxU8 GetUnknownC() { return m_unk0x0c; }
 	inline MxU32 GetUnknown10() { return m_unk0x10; }
 	inline MxS32 GetCurrentAct() { return m_currentAct; }
 	inline undefined4 GetUnknown424() { return m_unk0x424; }
@@ -61,10 +61,10 @@ class LegoGameState {
 	MxS32 ReadVariable(LegoStorage* p_stream, MxVariableTable* p_to);
 	void SetROIHandlerFunction();
 
-	char* m_savePath;                           // 0x0
-	MxS16 m_stateCount;                         // 0x4
-	LegoState** m_stateArray;                   // 0x8
-	MxU8 m_unk0xc;                              // 0xc
+	char* m_savePath;                           // 0x00
+	MxS16 m_stateCount;                         // 0x04
+	LegoState** m_stateArray;                   // 0x08
+	MxU8 m_unk0x0c;                             // 0x0c
 	MxU32 m_unk0x10;                            // 0x10
 	MxS32 m_currentAct;                         // 0x14
 	LegoBackgroundColor* m_backgroundColor;     // 0x18
diff --git a/LEGO1/lego/legoomni/include/legohideanimpresenter.h b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
index 06e8af33..29232923 100644
--- a/LEGO1/lego/legoomni/include/legohideanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legohideanimpresenter.h
@@ -12,7 +12,7 @@ class LegoHideAnimPresenter : public LegoLoopingAnimPresenter {
 	virtual ~LegoHideAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006d880
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06cc
 		return "LegoHideAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 913df81c..e872eff6 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -75,10 +75,10 @@ class LegoInputManager : public MxPresenter {
 	void Register(MxCore*);
 	void UnRegister(MxCore*);
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1005b8c0
-	virtual MxResult PutData() override { return SUCCESS; }; // vtable+0x4c
+	virtual MxResult PutData() override { return SUCCESS; } // vtable+0x4c
 
 	MxResult Create(HWND p_hwnd);
 	void Destroy();
diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index ac376ab1..a4699945 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -9,7 +9,7 @@ class LegoJetski : public LegoJetskiRaceActor {
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10013e80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f053c
 		return "LegoJetski";
diff --git a/LEGO1/lego/legoomni/include/legojetskiraceactor.h b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
index 8b3a38c7..149b7011 100644
--- a/LEGO1/lego/legoomni/include/legojetskiraceactor.h
+++ b/LEGO1/lego/legoomni/include/legojetskiraceactor.h
@@ -7,7 +7,7 @@
 class LegoJetskiRaceActor : public LegoCarRaceActor {
 public:
 	// FUNCTION: LEGO1 0x10081d80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0554
 		return "LegoJetskiRaceActor";
diff --git a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
index 47dc4e1f..b0fc9db9 100644
--- a/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloadcachesoundpresenter.h
@@ -14,7 +14,7 @@ class LegoLoadCacheSoundPresenter : public MxWavePresenter {
 	virtual ~LegoLoadCacheSoundPresenter() override;
 
 	// FUNCTION: LEGO1 0x10018450
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05a0
 		return "LegoLoadCacheSoundPresenter";
diff --git a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
index ab3da3eb..34b6ed2e 100644
--- a/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
@@ -11,7 +11,7 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
 	virtual ~LegoLocomotionAnimPresenter() override;
 
 	// FUNCTION: LEGO1 0x1006ce50
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f06e4
 		return "LegoLocomotionAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
index d4f47d7e..22bdffc9 100644
--- a/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
@@ -8,7 +8,7 @@
 class LegoLoopingAnimPresenter : public LegoAnimPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000c9a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0700
 		return "LegoLoopingAnimPresenter";
diff --git a/LEGO1/lego/legoomni/include/legomodelpresenter.h b/LEGO1/lego/legoomni/include/legomodelpresenter.h
index 8ba2ec8d..e0480d23 100644
--- a/LEGO1/lego/legoomni/include/legomodelpresenter.h
+++ b/LEGO1/lego/legoomni/include/legomodelpresenter.h
@@ -12,7 +12,7 @@ class LegoModelPresenter : public MxVideoPresenter {
 	static void configureLegoModelPresenter(MxS32 p_modelPresenterConfig);
 
 	// FUNCTION: LEGO1 0x1000ccb0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f067c
 		return "LegoModelPresenter";
diff --git a/LEGO1/lego/legoomni/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h
index 5219c61a..5e251563 100644
--- a/LEGO1/lego/legoomni/include/legonavcontroller.h
+++ b/LEGO1/lego/legoomni/include/legonavcontroller.h
@@ -37,11 +37,11 @@ class LegoNavController : public MxCore {
 	);
 
 	LegoNavController();
-	virtual ~LegoNavController() override;            // vtable+0x0
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual ~LegoNavController() override;            // vtable+0x00
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10054b80
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f66d8
 		return "LegoNavController";
diff --git a/LEGO1/lego/legoomni/include/legoomni.h b/LEGO1/lego/legoomni/include/legoomni.h
index 7a8ee7f0..f27bf140 100644
--- a/LEGO1/lego/legoomni/include/legoomni.h
+++ b/LEGO1/lego/legoomni/include/legoomni.h
@@ -126,7 +126,7 @@ class LegoOmni : public MxOmni {
 
 	inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
 	inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
-	inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
+	inline void SetExit(MxBool p_exit) { m_exit = p_exit; }
 
 	inline void CloseMainWindow() { PostMessageA(m_windowHandle, WM_CLOSE, 0, 0); }
 
diff --git a/LEGO1/lego/legoomni/include/legopalettepresenter.h b/LEGO1/lego/legoomni/include/legopalettepresenter.h
index 242c7bc0..04ee620b 100644
--- a/LEGO1/lego/legoomni/include/legopalettepresenter.h
+++ b/LEGO1/lego/legoomni/include/legopalettepresenter.h
@@ -10,10 +10,10 @@
 class LegoPalettePresenter : public MxVideoPresenter {
 public:
 	LegoPalettePresenter();
-	virtual ~LegoPalettePresenter() override; // vtable+0x0
+	virtual ~LegoPalettePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10079f30
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f061c
 		return "LegoPalettePresenter";
diff --git a/LEGO1/lego/legoomni/include/legopartpresenter.h b/LEGO1/lego/legoomni/include/legopartpresenter.h
index 69d34e47..8f14633d 100644
--- a/LEGO1/lego/legoomni/include/legopartpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopartpresenter.h
@@ -8,7 +8,7 @@
 class LegoPartPresenter : public MxMediaPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000cf70
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f05d8
 		return "LegoPartPresenter";
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index 2f0ce280..adc1c392 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -13,7 +13,7 @@ class LegoPathActor : public LegoActor {
 	virtual ~LegoPathActor() override;
 
 	// FUNCTION: LEGO1 0x1000c430
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0114
 		return "LegoPathActor";
diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h
index ada96e7e..86298726 100644
--- a/LEGO1/lego/legoomni/include/legopathcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopathcontroller.h
@@ -8,12 +8,12 @@
 class LegoPathController : public MxCore {
 public:
 	LegoPathController();
-	virtual ~LegoPathController() override { Destroy(); };
+	virtual ~LegoPathController() override { Destroy(); }
 
 	virtual MxResult Tickle() override; // vtable+08
 
 	// FUNCTION: LEGO1 0x10045110
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f11b8
 		return "LegoPathController";
diff --git a/LEGO1/lego/legoomni/include/legopathpresenter.h b/LEGO1/lego/legoomni/include/legopathpresenter.h
index 792b99eb..ab66a5df 100644
--- a/LEGO1/lego/legoomni/include/legopathpresenter.h
+++ b/LEGO1/lego/legoomni/include/legopathpresenter.h
@@ -11,7 +11,7 @@ class LegoPathPresenter : public MxMediaPresenter {
 	virtual ~LegoPathPresenter() override;
 
 	// FUNCTION: LEGO1 0x100449a0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0690
 		return "LegoPathPresenter";
diff --git a/LEGO1/lego/legoomni/include/legophonemepresenter.h b/LEGO1/lego/legoomni/include/legophonemepresenter.h
index b5aa3616..2a2ec497 100644
--- a/LEGO1/lego/legoomni/include/legophonemepresenter.h
+++ b/LEGO1/lego/legoomni/include/legophonemepresenter.h
@@ -11,10 +11,10 @@
 class LegoPhonemePresenter : public MxFlcPresenter {
 public:
 	LegoPhonemePresenter();
-	virtual ~LegoPhonemePresenter() override; // vtable+0x0
+	virtual ~LegoPhonemePresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1004e310
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f064c
 		return "LegoPhonemePresenter";
diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h
index a47825f3..e1335e33 100644
--- a/LEGO1/lego/legoomni/include/legoplantmanager.h
+++ b/LEGO1/lego/legoomni/include/legoplantmanager.h
@@ -9,12 +9,12 @@
 class LegoPlantManager : public MxCore {
 public:
 	LegoPlantManager();
-	virtual ~LegoPlantManager() override; // vtable+0x0
+	virtual ~LegoPlantManager() override; // vtable+0x00
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10026290
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f318c
 		return "LegoPlantManager";
diff --git a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
index 99c213e2..27a58291 100644
--- a/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
+++ b/LEGO1/lego/legoomni/include/legopointofviewcontroller.h
@@ -30,10 +30,10 @@ class LegoMouseController : public MxCore {
 	virtual void RightUp(int, int);   // vtable+0x28
 
 private:
-	BOOL m_isButtonDown; // 0x08
-	undefined4 m_unk0xc; // 0x0c
-	MxDouble m_buttonX;  // 0x10
-	MxDouble m_buttonY;  // 0x18
+	BOOL m_isButtonDown;  // 0x08
+	undefined4 m_unk0x0c; // 0x0c
+	MxDouble m_buttonX;   // 0x10
+	MxDouble m_buttonY;   // 0x18
 };
 
 // SYNTHETIC: LEGO1 0x100655b0
diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h
index e3f9df88..1ebf015a 100644
--- a/LEGO1/lego/legoomni/include/legorace.h
+++ b/LEGO1/lego/legoomni/include/legorace.h
@@ -11,12 +11,12 @@
 class LegoRace : public LegoWorld {
 public:
 	LegoRace();
-	virtual ~LegoRace() override; // vtable+0x0
+	virtual ~LegoRace() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10015ba0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07c4
 		return "LegoRace";
diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h
index fc6c6a2d..40eb6ef6 100644
--- a/LEGO1/lego/legoomni/include/legoraceactor.h
+++ b/LEGO1/lego/legoomni/include/legoraceactor.h
@@ -8,7 +8,7 @@
 class LegoRaceActor : public LegoAnimActor {
 public:
 	// FUNCTION: LEGO1 0x10014af0
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0bf4
 		return "LegoRaceActor";
diff --git a/LEGO1/lego/legoomni/include/legoracecar.h b/LEGO1/lego/legoomni/include/legoracecar.h
index f080ba46..beb70632 100644
--- a/LEGO1/lego/legoomni/include/legoracecar.h
+++ b/LEGO1/lego/legoomni/include/legoracecar.h
@@ -11,7 +11,7 @@ class LegoRaceCar : public LegoCarRaceActor {
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10014290
-	inline const char* ClassName() const override // vtable+0xc
+	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0548
 		return "LegoRaceCar";
diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index e6d11bd1..41942312 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -7,9 +7,11 @@
 #include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d46c0
+// SIZE 0x08
 class LegoState : public MxCore {
 public:
-	virtual ~LegoState() override; // vtable+0x00
+	// FUNCTION: LEGO1 0x10005f40
+	virtual ~LegoState() override {}
 
 	// FUNCTION: LEGO1 0x100060d0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -24,9 +26,20 @@ class LegoState : public MxCore {
 		return !strcmp(p_name, LegoState::ClassName()) || MxCore::IsA(p_name);
 	}
 
-	virtual MxBool VTable0x14();                       // vtable+0x14
-	virtual MxBool SetFlag();                          // vtable+0x18
-	virtual MxResult VTable0x1c(LegoFile* p_legoFile); // vtable+0x1C
+	// FUNCTION: LEGO1 0x10005f90
+	virtual MxBool VTable0x14() { return TRUE; } // vtable+0x14
+
+	// FUNCTION: LEGO1 0x10005fa0
+	virtual MxBool SetFlag() { return FALSE; } // vtable+0x18
+
+	// FUNCTION: LEGO1 0x10005fb0
+	virtual MxResult VTable0x1c(LegoFile* p_legoFile)
+	{
+		if (p_legoFile->IsWriteMode()) {
+			p_legoFile->FUN_10006030(this->ClassName());
+		}
+		return SUCCESS;
+	} // vtable+0x1c
 
 	// SYNTHETIC: LEGO1 0x10006160
 	// LegoState::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
index a155595e..b0463448 100644
--- a/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
+++ b/LEGO1/lego/legoomni/include/legovehiclebuildstate.h
@@ -6,7 +6,7 @@
 #include "mxstring.h"
 
 // VTABLE: LEGO1 0x100d66e0
-// SIZE 0x50 (from 1000acd7)
+// SIZE 0x50
 class LegoVehicleBuildState : public LegoState {
 public:
 	LegoVehicleBuildState(char* p_classType);
@@ -30,10 +30,10 @@ class LegoVehicleBuildState : public LegoState {
 
 public:
 	struct UnkStruct {
-		undefined4 m_unk0x00;
-		undefined2 m_unk0x04;
-		undefined2 m_unk0x06;
-		undefined2 m_unk0x08;
+		undefined4 m_unk0x00; // 0x00
+		undefined2 m_unk0x04; // 0x04
+		undefined2 m_unk0x06; // 0x06
+		undefined2 m_unk0x08; // 0x08
 
 		UnkStruct();
 	};
diff --git a/LEGO1/lego/legoomni/include/legovideomanager.h b/LEGO1/lego/legoomni/include/legovideomanager.h
index ce9963e4..42a065b9 100644
--- a/LEGO1/lego/legoomni/include/legovideomanager.h
+++ b/LEGO1/lego/legoomni/include/legovideomanager.h
@@ -25,7 +25,7 @@ class LegoVideoManager : public MxVideoManager {
 	void EnableFullScreenMovie(MxBool p_enable, MxBool p_scale);
 	void MoveCursor(MxS32 p_cursorX, MxS32 p_cursorY);
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 	virtual void Destroy() override;    // vtable+0x18
 	virtual MxResult Create(MxVideoParam& p_videoParam, MxU32 p_frequencyMS, MxBool p_createThread)
 		override;                                                                          // vtable+0x2c
diff --git a/LEGO1/lego/legoomni/include/legoworld.h b/LEGO1/lego/legoomni/include/legoworld.h
index b6176067..7e995e73 100644
--- a/LEGO1/lego/legoomni/include/legoworld.h
+++ b/LEGO1/lego/legoomni/include/legoworld.h
@@ -33,10 +33,10 @@ class LegoWorld : public LegoEntity {
 	};
 
 	LegoWorld();
-	virtual ~LegoWorld() override; // vtable+0x0
+	virtual ~LegoWorld() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1001d690
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/legoworldlist.h b/LEGO1/lego/legoomni/include/legoworldlist.h
index 64849968..6467859c 100644
--- a/LEGO1/lego/legoomni/include/legoworldlist.h
+++ b/LEGO1/lego/legoomni/include/legoworldlist.h
@@ -25,7 +25,7 @@ class LegoWorldList : public MxPtrList<LegoWorld> {
 	virtual MxS8 Compare(LegoWorld* p_a, LegoWorld* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x10059a00
 	// LegoWorldList::`scalar deleting destructor'
diff --git a/LEGO1/lego/legoomni/include/legoworldpresenter.h b/LEGO1/lego/legoomni/include/legoworldpresenter.h
index b1fcf90a..3d0fba37 100644
--- a/LEGO1/lego/legoomni/include/legoworldpresenter.h
+++ b/LEGO1/lego/legoomni/include/legoworldpresenter.h
@@ -8,7 +8,7 @@
 class LegoWorldPresenter : public LegoEntityPresenter {
 public:
 	LegoWorldPresenter();
-	virtual ~LegoWorldPresenter() override; // vtable+0x0
+	virtual ~LegoWorldPresenter() override; // vtable+0x00
 
 	static void configureLegoWorldPresenter(MxS32 p_legoWorldPresenterQuality);
 
diff --git a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
index bb75af8d..787484b0 100644
--- a/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
+++ b/LEGO1/lego/legoomni/include/mxbackgroundaudiomanager.h
@@ -54,8 +54,8 @@ class MxBackgroundAudioManager : public MxCore {
 	MxResult OpenMusic(MxAtomId& p_script);
 	void DestroyMusic();
 
-	MxBool m_musicEnabled; // 0x8
-	MxDSAction m_action1;  // 0xc
+	MxBool m_musicEnabled; // 0x08
+	MxDSAction m_action1;  // 0x0c
 	MxAudioPresenter* m_unk0xa0;
 	MxDSAction m_action2; // 0xa4
 	MxAudioPresenter* m_unk0x138;
diff --git a/LEGO1/lego/legoomni/include/mxtransitionmanager.h b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
index 31c6f8f7..ab673b11 100644
--- a/LEGO1/lego/legoomni/include/mxtransitionmanager.h
+++ b/LEGO1/lego/legoomni/include/mxtransitionmanager.h
@@ -11,11 +11,11 @@
 class MxTransitionManager : public MxCore {
 public:
 	MxTransitionManager();
-	virtual ~MxTransitionManager() override; // vtable+0x0
+	virtual ~MxTransitionManager() override; // vtable+0x00
 
 	void SetWaitIndicator(MxVideoPresenter* p_waitIndicator);
 
-	virtual MxResult Tickle(); // vtable+0x8
+	virtual MxResult Tickle(); // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1004b950
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/pizza.h b/LEGO1/lego/legoomni/include/pizza.h
index 78eb4f75..b2679fd1 100644
--- a/LEGO1/lego/legoomni/include/pizza.h
+++ b/LEGO1/lego/legoomni/include/pizza.h
@@ -15,10 +15,10 @@ class Pizza : public IsleActor {
 	Pizza();
 	virtual ~Pizza() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10037f90
-	inline const char* ClassName() const // vtable+0xc
+	inline const char* ClassName() const // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f038c
 		return "Pizza";
diff --git a/LEGO1/lego/legoomni/include/pizzamissionstate.h b/LEGO1/lego/legoomni/include/pizzamissionstate.h
index 7c792ed4..e8668544 100644
--- a/LEGO1/lego/legoomni/include/pizzamissionstate.h
+++ b/LEGO1/lego/legoomni/include/pizzamissionstate.h
@@ -3,16 +3,18 @@
 
 #include "legostate.h"
 
+// SIZE 0x20
 struct PizzaMissionStateEntry {
 public:
-	undefined2 m_unk0x0;
+	undefined2 m_unk0x00;
 	MxU8 m_id;
-	undefined m_unk0x3[0x15];
+	undefined m_unk0x03[0x15];
 	MxU16 m_color;
 	undefined m_unk0x18[6];
 };
 
 // VTABLE: LEGO1 0x100d7408
+// SIZE 0xb0
 class PizzaMissionState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x10039290
@@ -39,9 +41,9 @@ class PizzaMissionState : public LegoState {
 	PizzaMissionStateEntry* GetState(MxU8 p_id);
 
 protected:
-	undefined4 m_unk0x8;
-	undefined4 m_unk0xc;
-	PizzaMissionStateEntry m_state[5];
+	undefined4 m_unk0x08;              // 0x08
+	undefined4 m_unk0x0c;              // 0x0c
+	PizzaMissionStateEntry m_state[5]; // 0x10
 };
 
 #endif // PIZZAMISSIONSTATE_H
diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h
index 0261cd49..cb82ee35 100644
--- a/LEGO1/lego/legoomni/include/police.h
+++ b/LEGO1/lego/legoomni/include/police.h
@@ -13,12 +13,12 @@
 class Police : public LegoWorld {
 public:
 	Police();
-	virtual ~Police() override; // vtable+0x0
+	virtual ~Police() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x1005e1e0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0450
 		return "Police";
diff --git a/LEGO1/lego/legoomni/include/policeentity.h b/LEGO1/lego/legoomni/include/policeentity.h
index cdb89af6..490e35a3 100644
--- a/LEGO1/lego/legoomni/include/policeentity.h
+++ b/LEGO1/lego/legoomni/include/policeentity.h
@@ -8,7 +8,7 @@
 class PoliceEntity : public BuildingEntity {
 public:
 	// FUNCTION: LEGO1 0x1000ed60
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0328
 		return "PoliceEntity";
diff --git a/LEGO1/lego/legoomni/include/policestate.h b/LEGO1/lego/legoomni/include/policestate.h
index 77005cef..33799092 100644
--- a/LEGO1/lego/legoomni/include/policestate.h
+++ b/LEGO1/lego/legoomni/include/policestate.h
@@ -9,6 +9,7 @@
 class PoliceState : public LegoState {
 public:
 	PoliceState();
+	virtual ~PoliceState() override {}
 
 	// FUNCTION: LEGO1 0x1005e860
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -29,8 +30,8 @@ class PoliceState : public LegoState {
 	// PoliceState::`scalar deleting destructor'
 
 private:
-	undefined4 m_unk0x8; // 0x8
-	undefined4 m_unk0xc; // 0xc
+	undefined4 m_unk0x08; // 0x08
+	undefined4 m_unk0x0c; // 0x0c
 };
 
 #endif // POLICESTATE_H
diff --git a/LEGO1/lego/legoomni/include/racecar.h b/LEGO1/lego/legoomni/include/racecar.h
index ddd4a9ac..596473b4 100644
--- a/LEGO1/lego/legoomni/include/racecar.h
+++ b/LEGO1/lego/legoomni/include/racecar.h
@@ -9,7 +9,7 @@
 class RaceCar : public IslePathActor {
 public:
 	RaceCar();
-	virtual ~RaceCar() override; // vtable+0x0
+	virtual ~RaceCar() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10028270
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/racestate.h b/LEGO1/lego/legoomni/include/racestate.h
index 7d2de4f6..3bbb86f6 100644
--- a/LEGO1/lego/legoomni/include/racestate.h
+++ b/LEGO1/lego/legoomni/include/racestate.h
@@ -6,8 +6,8 @@
 struct RaceStateEntry {
 public:
 	MxU8 m_id;
-	undefined m_unk0x1[1];
-	MxU16 m_unk0x2;
+	undefined m_unk0x01[1];
+	MxU16 m_unk0x02;
 	MxU16 m_color;
 };
 
@@ -41,9 +41,9 @@ class RaceState : public LegoState {
 	RaceStateEntry* GetState(MxU8 p_id);
 
 protected:
-	RaceStateEntry m_state[5];
-	undefined2 m_unk0x26[2];
-	undefined4 m_unk0x28;
+	RaceStateEntry m_state[5]; // 0x08
+	undefined2 m_unk0x26[2];   // 0x26
+	undefined4 m_unk0x28;      // 0x28
 };
 
 #endif // RACESTATE_H
diff --git a/LEGO1/lego/legoomni/include/radio.h b/LEGO1/lego/legoomni/include/radio.h
index 536b9a7b..4edf734f 100644
--- a/LEGO1/lego/legoomni/include/radio.h
+++ b/LEGO1/lego/legoomni/include/radio.h
@@ -32,7 +32,7 @@ class Radio : public MxCore {
 
 private:
 	RadioState* m_state; // 0x08
-	MxBool m_unk0xc;     // 0x0c
+	MxBool m_unk0x0c;    // 0x0c
 
 	void CreateRadioState();
 };
diff --git a/LEGO1/lego/legoomni/include/registrationbook.h b/LEGO1/lego/legoomni/include/registrationbook.h
index 53baeae9..d47dbf28 100644
--- a/LEGO1/lego/legoomni/include/registrationbook.h
+++ b/LEGO1/lego/legoomni/include/registrationbook.h
@@ -8,10 +8,10 @@
 class RegistrationBook : public LegoWorld {
 public:
 	RegistrationBook();
-	virtual ~RegistrationBook() override; // vtable+0x0
+	virtual ~RegistrationBook() override; // vtable+0x00
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
-	virtual MxResult Tickle() override;               // vtable+0x8
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
+	virtual MxResult Tickle() override;               // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10076e10
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/score.h b/LEGO1/lego/legoomni/include/score.h
index 2df0e37c..03d69eb8 100644
--- a/LEGO1/lego/legoomni/include/score.h
+++ b/LEGO1/lego/legoomni/include/score.h
@@ -12,8 +12,8 @@
 class Score : public LegoWorld {
 public:
 	Score();
-	virtual ~Score() override;                        // vtable+0x0
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual ~Score() override;                        // vtable+0x00
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100010c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/include/scorestate.h b/LEGO1/lego/legoomni/include/scorestate.h
index fde33e1a..e02c2e56 100644
--- a/LEGO1/lego/legoomni/include/scorestate.h
+++ b/LEGO1/lego/legoomni/include/scorestate.h
@@ -4,7 +4,7 @@
 #include "legostate.h"
 
 // VTABLE: LEGO1 0x100d53f8
-// SIZE 0xc
+// SIZE 0x0c
 class ScoreState : public LegoState {
 public:
 	// FUNCTION: LEGO1 0x1000de40
@@ -12,13 +12,13 @@ class ScoreState : public LegoState {
 	{
 		// STRING: LEGO1 0x100f0084
 		return "ScoreState";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x1000de50
 	inline virtual MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, ScoreState::ClassName()) || LegoState::IsA(p_name);
-	};
+	}
 
 	virtual MxBool VTable0x14() override; // vtable+0x14
 	virtual MxBool SetFlag() override;    // vtable+0x18
@@ -30,7 +30,7 @@ class ScoreState : public LegoState {
 	// ScoreState::`scalar deleting destructor'
 
 private:
-	MxBool m_playCubeTutorial;
+	MxBool m_playCubeTutorial; // 0x08
 };
 
 #endif // SCORESTATE_H
diff --git a/LEGO1/lego/legoomni/include/towtrackmissionstate.h b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
index ef5bacda..9e3b78f3 100644
--- a/LEGO1/lego/legoomni/include/towtrackmissionstate.h
+++ b/LEGO1/lego/legoomni/include/towtrackmissionstate.h
@@ -21,6 +21,7 @@ class TowTrackMissionState : public LegoState {
 	{
 		return !strcmp(p_name, TowTrackMissionState::ClassName()) || LegoState::IsA(p_name);
 	}
+
 	virtual MxResult VTable0x1c(LegoFile* p_legoFile) override; // vtable+0x1C
 
 	inline MxU16 GetColor(MxU8 p_id)
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index f5add3e0..0f099228 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -342,7 +342,7 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 {
 	MxU32 state = m_unk0x30;
 	if (state == 1) {
-		p_v.EqualsImpl(m_unk0x0.GetData());
+		p_v.EqualsImpl(m_unk0x00.GetData());
 		p_v[3] = acos(p_v[3]) * (1 - p_f) * 2.0;
 		return p_v.NormalizeQuaternion();
 	}
@@ -352,7 +352,7 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 		return p_v.NormalizeQuaternion();
 	}
 	else if (state == 3) {
-		double d1 = p_v.Dot(&m_unk0x0, &m_unk0x18), d2;
+		double d1 = p_v.Dot(&m_unk0x00, &m_unk0x18), d2;
 		if (d1 + 1 > 0.00001) {
 			if (1 - d1 > 0.00001) {
 				double d = acos(d1);
@@ -365,18 +365,18 @@ MxResult HelicopterSubclass::FUN_100040a0(Vector4& p_v, float p_f)
 				d2 = p_f;
 			}
 			for (MxS32 i = 0; i < 4; i++) {
-				p_v[i] = m_unk0x18[i] * d2 + m_unk0x0[i] * d1;
+				p_v[i] = m_unk0x18[i] * d2 + m_unk0x00[i] * d1;
 			}
 			return SUCCESS;
 		}
-		p_v[0] = -m_unk0x0[1];
-		p_v[1] = m_unk0x0[1];
-		p_v[2] = -m_unk0x0[3];
-		p_v[3] = m_unk0x0[2];
+		p_v[0] = -m_unk0x00[1];
+		p_v[1] = m_unk0x00[1];
+		p_v[2] = -m_unk0x00[3];
+		p_v[3] = m_unk0x00[2];
 		d1 = sin((1 - p_f) * 1.570796326794895);
 		d2 = sin(p_f * 1.570796326794895);
 		for (MxS32 i = 0; i < 3; i++) {
-			p_v[i] = m_unk0x0[i] * d1 + p_v[i] * d2;
+			p_v[i] = m_unk0x00[i] * d1 + p_v[i] * d2;
 		}
 		return SUCCESS;
 	}
diff --git a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
index a7b68529..f950c429 100644
--- a/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
+++ b/LEGO1/lego/legoomni/src/build/legovehiclebuildstate.cpp
@@ -3,7 +3,7 @@
 #include "decomp.h"
 
 DECOMP_SIZE_ASSERT(LegoVehicleBuildState, 0x50); // 1000acd7
-DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0xc);
+DECOMP_SIZE_ASSERT(LegoVehicleBuildState::UnkStruct, 0x0c);
 
 // FUNCTION: LEGO1 0x10017c00
 LegoVehicleBuildState::UnkStruct::UnkStruct()
diff --git a/LEGO1/lego/legoomni/src/common/animstate.cpp b/LEGO1/lego/legoomni/src/common/animstate.cpp
index c20841b7..c7665237 100644
--- a/LEGO1/lego/legoomni/src/common/animstate.cpp
+++ b/LEGO1/lego/legoomni/src/common/animstate.cpp
@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(AnimState, 0x1c);
 // FUNCTION: LEGO1 0x10064ff0
 AnimState::AnimState()
 {
-	m_unk0xc = 0;
+	m_unk0x0c = 0;
 	m_unk0x10 = NULL;
 	m_unk0x14 = 0;
 	m_unk0x18 = NULL;
diff --git a/LEGO1/lego/legoomni/src/common/gifmanager.cpp b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
index cd485b11..821a97d2 100644
--- a/LEGO1/lego/legoomni/src/common/gifmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/gifmanager.cpp
@@ -47,7 +47,7 @@ void GifManager::FUN_10099cc0(GifData* p_data)
 	for (GifList::iterator it = m_list.begin(); it != m_list.end(); it++) {
 #endif
 		if (*it == p_data) {
-			// TODO: This is wrong, but what is at +0xc on the iterator?
+			// TODO: This is wrong, but what is at +0x0c on the iterator?
 			*it = NULL;
 
 			if (p_data->m_texture->Release() == TRUE) {
diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
index 87466e2b..af5e8dac 100644
--- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp
@@ -67,7 +67,7 @@ LegoGameState::LegoGameState()
 	SetROIHandlerFunction();
 
 	this->m_stateCount = 0;
-	this->m_unk0xc = 0;
+	this->m_unk0x0c = 0;
 	this->m_savePath = NULL;
 	this->m_unk0x424 = 0;
 	this->m_prevArea = 0;
@@ -131,7 +131,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
 			fileStream.Write(&maybeVersion, 4);
 			fileStream.Write(&m_unk0x24, 2);
 			fileStream.Write(&m_unk0x10, 2);
-			fileStream.Write(&m_unk0xc, 1);
+			fileStream.Write(&m_unk0x0c, 1);
 
 			for (MxS32 i = 0; i < sizeof(g_colorSaveData) / sizeof(g_colorSaveData[0]); ++i) {
 				if (WriteVariable(&fileStream, variableTable, g_colorSaveData[i].m_targetName) == FAILURE)
diff --git a/LEGO1/lego/legoomni/src/common/legostate.cpp b/LEGO1/lego/legoomni/src/common/legostate.cpp
index 16beb159..c9946492 100644
--- a/LEGO1/lego/legoomni/src/common/legostate.cpp
+++ b/LEGO1/lego/legoomni/src/common/legostate.cpp
@@ -1,29 +1,3 @@
 #include "legostate.h"
 
-DECOMP_SIZE_ASSERT(LegoState, 0x08);
-
-// FUNCTION: LEGO1 0x10005f40
-LegoState::~LegoState()
-{
-}
-
-// FUNCTION: LEGO1 0x10005f90
-MxBool LegoState::VTable0x14()
-{
-	return TRUE;
-}
-
-// FUNCTION: LEGO1 0x10005fa0
-MxBool LegoState::SetFlag()
-{
-	return FALSE;
-}
-
-// FUNCTION: LEGO1 0x10005fb0
-MxResult LegoState::VTable0x1c(LegoFile* p_legoFile)
-{
-	if (p_legoFile->IsWriteMode()) {
-		p_legoFile->FUN_10006030(this->ClassName());
-	}
-	return SUCCESS;
-}
+DECOMP_SIZE_ASSERT(LegoState, 0x08)
diff --git a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
index eb74f64c..e99c3229 100644
--- a/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/ambulancemissionstate.cpp
@@ -8,9 +8,9 @@ AmbulanceMissionState::AmbulanceMissionState()
 	m_unk0x10 = 0;
 	m_unk0x12 = 0;
 	m_unk0x14 = 0;
-	m_unk0x8 = 0;
+	m_unk0x08 = 0;
 	m_unk0x16 = 0;
-	m_unk0xc = 0;
+	m_unk0x0c = 0;
 	m_unk0x18 = 0;
 	m_color1 = 0;
 	m_color2 = 0;
diff --git a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
index 012d9c4a..326415d1 100644
--- a/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
+++ b/LEGO1/lego/legoomni/src/hospital/hospitalstate.cpp
@@ -5,8 +5,8 @@ DECOMP_SIZE_ASSERT(HospitalState, 0x18)
 // FUNCTION: LEGO1 0x10076370
 HospitalState::HospitalState()
 {
-	this->m_unk0xc = 0;
-	this->m_unk0xe = 0;
+	this->m_unk0x0c = 0;
+	this->m_unk0x0e = 0;
 	this->m_unk0x10 = 0;
 	this->m_unk0x12 = 0;
 	this->m_unk0x14 = 0;
diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
index 4ca6dd79..651f06a6 100644
--- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
@@ -133,7 +133,7 @@ MxLong Infocenter::Notify(MxParam& p_param)
 			StopBookAnimation();
 			m_bookAnimationTimer = 0;
 
-			if (m_infocenterState->GetUnknown0x74() == 0xc) {
+			if (m_infocenterState->GetUnknown0x74() == 0x0c) {
 				StartCredits();
 				m_infocenterState->SetUnknown0x74(0xd);
 			}
diff --git a/LEGO1/lego/legoomni/src/infocenter/score.cpp b/LEGO1/lego/legoomni/src/infocenter/score.cpp
index f1db49f2..181553d4 100644
--- a/LEGO1/lego/legoomni/src/infocenter/score.cpp
+++ b/LEGO1/lego/legoomni/src/infocenter/score.cpp
@@ -303,12 +303,12 @@ void Score::FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color)
 	data[0] = 0x11;
 	data[17] = 0x28;
 	data[18] = 0x28;
-	data[1] = 0xf;
+	data[1] = 0x0f;
 	MxU32 size = data[p_x + 14];
 	MxU8* ptr = data[p_x + 4] + data[p_y + 9] + m_surface;
 	MxS32 count = data[p_y + 19];
-	data[2] = 0x8;
-	data[3] = 0x5;
+	data[2] = 0x08;
+	data[3] = 0x05;
 	MxU32 value = data[p_color];
 	for (; count > 0; count--) {
 		memset(ptr++, value, size);
diff --git a/LEGO1/lego/legoomni/src/isle/radio.cpp b/LEGO1/lego/legoomni/src/isle/radio.cpp
index 993a12f0..c0182a1c 100644
--- a/LEGO1/lego/legoomni/src/isle/radio.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radio.cpp
@@ -13,7 +13,7 @@ Radio::Radio()
 	NotificationManager()->Register(this);
 	ControlManager()->Register(this);
 
-	m_unk0xc = TRUE;
+	m_unk0x0c = TRUE;
 	CreateRadioState();
 }
 
@@ -33,8 +33,8 @@ MxLong Radio::Notify(MxParam& p_param)
 // FUNCTION: LEGO1 0x1002cdc0
 void Radio::Initialize(MxBool p_und)
 {
-	if (m_unk0xc != p_und) {
-		m_unk0xc = p_und;
+	if (m_unk0x0c != p_und) {
+		m_unk0x0c = p_und;
 		CreateRadioState();
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/police/policestate.cpp b/LEGO1/lego/legoomni/src/police/policestate.cpp
index 6e026c79..87ce9ff8 100644
--- a/LEGO1/lego/legoomni/src/police/policestate.cpp
+++ b/LEGO1/lego/legoomni/src/police/policestate.cpp
@@ -7,8 +7,8 @@ DECOMP_SIZE_ASSERT(PoliceState, 0x10)
 // FUNCTION: LEGO1 0x1005e7c0
 PoliceState::PoliceState()
 {
-	m_unk0xc = 0;
-	m_unk0x8 = (rand() % 2 == 0) ? 501 : 500;
+	m_unk0x0c = 0;
+	m_unk0x08 = (rand() % 2 == 0) ? 501 : 500;
 }
 
 // FUNCTION: LEGO1 0x1005e990
@@ -19,11 +19,11 @@ MxResult PoliceState::VTable0x1c(LegoFile* p_legoFile)
 	}
 
 	if (p_legoFile->IsReadMode()) {
-		p_legoFile->Read(&m_unk0x8, sizeof(m_unk0x8));
+		p_legoFile->Read(&m_unk0x08, sizeof(m_unk0x08));
 	}
 	else {
-		undefined4 unk0x8 = m_unk0x8;
-		p_legoFile->Write(&unk0x8, sizeof(m_unk0x8));
+		undefined4 unk0x08 = m_unk0x08;
+		p_legoFile->Write(&unk0x08, sizeof(m_unk0x08));
 	}
 
 	return SUCCESS;
diff --git a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
index be04b444..f01d3ae1 100644
--- a/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
@@ -202,8 +202,8 @@ void LegoAnimPresenter::EndAction()
 // FUNCTION: LEGO1 0x100a0b30
 LegoAnimClass::LegoAnimClass()
 {
-	m_unk0x8 = 0;
-	m_unk0xc = 0;
+	m_unk0x08 = 0;
+	m_unk0x0c = 0;
 	m_unk0x10 = 0;
 	m_unk0x14 = 0;
 }
diff --git a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
index f347545d..4ea26beb 100644
--- a/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/video/legometerpresenter.cpp
@@ -41,7 +41,7 @@ LegoMeterPresenter::LegoMeterPresenter()
 	m_unk0x6c = 0;
 	m_unk0x84 = 0;
 	m_type = 1;
-	m_flags &= ~c_bit2;
+	SetBit1(FALSE);
 }
 
 // FUNCTION: LEGO1 0x10043780
diff --git a/LEGO1/lego/sources/misc/legoimage.cpp b/LEGO1/lego/sources/misc/legoimage.cpp
index 34d4978f..da3f04a0 100644
--- a/LEGO1/lego/sources/misc/legoimage.cpp
+++ b/LEGO1/lego/sources/misc/legoimage.cpp
@@ -4,7 +4,7 @@
 #include "legostorage.h"
 #include "memory.h"
 
-DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x3);
+DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x03);
 DECOMP_SIZE_ASSERT(LegoImage, 0x310);
 
 // FUNCTION: LEGO1 0x100994c0
diff --git a/LEGO1/lego/sources/misc/legoimage.h b/LEGO1/lego/sources/misc/legoimage.h
index 7990277e..d77a1439 100644
--- a/LEGO1/lego/sources/misc/legoimage.h
+++ b/LEGO1/lego/sources/misc/legoimage.h
@@ -5,7 +5,7 @@
 
 class LegoStorage;
 
-// SIZE 0x3
+// SIZE 0x03
 class LegoPaletteEntry {
 public:
 	LegoPaletteEntry();
diff --git a/LEGO1/lego/sources/misc/legostorage.cpp b/LEGO1/lego/sources/misc/legostorage.cpp
index 50621f73..d8749dc1 100644
--- a/LEGO1/lego/sources/misc/legostorage.cpp
+++ b/LEGO1/lego/sources/misc/legostorage.cpp
@@ -5,9 +5,9 @@
 #include <memory.h>
 #include <string.h>
 
-DECOMP_SIZE_ASSERT(LegoStorage, 0x8);
+DECOMP_SIZE_ASSERT(LegoStorage, 0x08);
 DECOMP_SIZE_ASSERT(LegoMemory, 0x10);
-DECOMP_SIZE_ASSERT(LegoFile, 0xc);
+DECOMP_SIZE_ASSERT(LegoFile, 0x0c);
 
 // FUNCTION: LEGO1 0x10099080
 LegoMemory::LegoMemory(void* p_buffer) : LegoStorage()
diff --git a/LEGO1/lego/sources/misc/legotexture.cpp b/LEGO1/lego/sources/misc/legotexture.cpp
index 8eb74bfe..1f8844ff 100644
--- a/LEGO1/lego/sources/misc/legotexture.cpp
+++ b/LEGO1/lego/sources/misc/legotexture.cpp
@@ -4,7 +4,7 @@
 #include "legoimage.h"
 #include "legostorage.h"
 
-DECOMP_SIZE_ASSERT(LegoTexture, 0x4);
+DECOMP_SIZE_ASSERT(LegoTexture, 0x04);
 
 // FUNCTION: LEGO1 0x10098fb0
 LegoTexture::LegoTexture()
diff --git a/LEGO1/lego/sources/misc/legotree.h b/LEGO1/lego/sources/misc/legotree.h
index 185c178f..3ee3d4e5 100644
--- a/LEGO1/lego/sources/misc/legotree.h
+++ b/LEGO1/lego/sources/misc/legotree.h
@@ -9,17 +9,17 @@
 class LegoStorage;
 
 // VTABLE: LEGO1 0x100db778
-// SIZE 0x4
+// SIZE 0x04
 class LegoTreeNodeData {
 public:
 	LegoTreeNodeData() {}
 	virtual ~LegoTreeNodeData() {}
 
 	// FUNCTION: LEGO1 0x10099fe0
-	virtual LegoResult Read(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x4
+	virtual LegoResult Read(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x04
 
 	// FUNCTION: LEGO1 0x10099ff0
-	virtual LegoResult Write(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x8
+	virtual LegoResult Write(LegoStorage* p_storage) { return SUCCESS; } // vtable+0x08
 
 	// SYNTHETIC: LEGO1 0x1009a000
 	// LegoTreeNodeData::`scalar deleting destructor'
@@ -44,21 +44,21 @@ class LegoTreeNode {
 	// LegoTreeNode::`scalar deleting destructor'
 
 protected:
-	LegoTreeNodeData* m_data;  // 0x4
-	LegoU32 m_numChildren;     // 0x8
-	LegoTreeNode** m_children; // 0xc
+	LegoTreeNodeData* m_data;  // 0x04
+	LegoU32 m_numChildren;     // 0x08
+	LegoTreeNode** m_children; // 0x0c
 };
 
 // VTABLE: LEGO1 0x100db768
-// SIZE 0x8
+// SIZE 0x08
 class LegoTree {
 public:
 	LegoTree();
 	virtual ~LegoTree();
 	LegoTreeNode* GetRoot() { return m_root; }
 	void SetRoot(LegoTreeNode* p_root) { m_root = p_root; }
-	virtual LegoResult Read(LegoStorage* p_storage);  // vtable+0x4
-	virtual LegoResult Write(LegoStorage* p_storage); // vtable+0x8
+	virtual LegoResult Read(LegoStorage* p_storage);  // vtable+0x04
+	virtual LegoResult Write(LegoStorage* p_storage); // vtable+0x08
 
 	// SYNTHETIC: LEGO1 0x10099de0
 	// LegoTree::`scalar deleting destructor'
@@ -69,9 +69,9 @@ class LegoTree {
 	void Delete(LegoTreeNode* p_node);
 
 	// FUNCTION: LEGO1 0x10099f70
-	virtual LegoTreeNodeData* CreateData() { return new LegoTreeNodeData(); } // vtable+0xc
+	virtual LegoTreeNodeData* CreateData() { return new LegoTreeNodeData(); } // vtable+0x0c
 
-	LegoTreeNode* m_root; // 0x4
+	LegoTreeNode* m_root; // 0x04
 };
 
 #endif // __LEGOTREE_H
diff --git a/LEGO1/lego/sources/roi/legoroi.h b/LEGO1/lego/sources/roi/legoroi.h
index 6ac30b45..a750b949 100644
--- a/LEGO1/lego/sources/roi/legoroi.h
+++ b/LEGO1/lego/sources/roi/legoroi.h
@@ -19,7 +19,7 @@ class LegoROI : public ViewROI {
 public:
 	LegoROI(Tgl::Renderer* p_renderer, ViewLODList* p_lodList, int p_time);
 
-	virtual float IntrinsicImportance() const override; // vtable+0x4
+	virtual float IntrinsicImportance() const override; // vtable+0x04
 	// Note: Actually part of parent class (doesn't exist yet)
 	virtual void UpdateWorldBoundingVolumes() override; // vtable+0x18
 
diff --git a/LEGO1/mxdirectx/mxdirect3d.h b/LEGO1/mxdirectx/mxdirect3d.h
index 2d89ad39..4de9f058 100644
--- a/LEGO1/mxdirectx/mxdirect3d.h
+++ b/LEGO1/mxdirectx/mxdirect3d.h
@@ -62,7 +62,7 @@ class MxDirect3D : public MxDirectDraw {
 	DWORD GetZBufferBitDepth(MxAssignedDevice* p_assignedDevice);
 	BOOL SetDevice(MxDeviceEnumerate& p_deviceEnumerate, MxDriver* p_driver, MxDevice* p_device);
 
-	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; };
+	inline MxAssignedDevice* GetAssignedDevice() { return this->m_assignedDevice; }
 	inline IDirect3D2* GetDirect3D() { return this->m_pDirect3d; }
 	inline IDirect3DDevice2* GetDirect3DDevice() { return this->m_pDirect3dDevice; }
 
diff --git a/LEGO1/omni/include/mxactionnotificationparam.h b/LEGO1/omni/include/mxactionnotificationparam.h
index 5628cf7b..f53ac728 100644
--- a/LEGO1/omni/include/mxactionnotificationparam.h
+++ b/LEGO1/omni/include/mxactionnotificationparam.h
@@ -47,12 +47,12 @@ class MxActionNotificationParam : public MxNotificationParam {
 	virtual MxNotificationParam* Clone() override
 	{
 		return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
-	}; // vtable+0x4
+	} // vtable+0x04
 
 	inline MxDSAction* GetAction() { return m_action; }
 
 protected:
-	MxDSAction* m_action; // 0xc
+	MxDSAction* m_action; // 0x0c
 	MxBool m_realloc;     // 0x10
 };
 
@@ -70,7 +70,7 @@ class MxStartActionNotificationParam : public MxActionNotificationParam {
 	{
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	virtual MxNotificationParam* Clone() override; // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100d8358
@@ -96,7 +96,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 			this->m_action,
 			this->m_realloc
 		);
-	}; // vtable+0x4
+	} // vtable+0x04
 };
 
 // VTABLE: LEGO1 0x100dc208
@@ -109,7 +109,7 @@ class MxType4NotificationParam : public MxActionNotificationParam {
 		m_unk0x14 = p_unk0x14;
 	}
 
-	virtual MxNotificationParam* Clone() override; // vtable+0x4
+	virtual MxNotificationParam* Clone() override; // vtable+0x04
 
 private:
 	MxPresenter* m_unk0x14; // 0x14
diff --git a/LEGO1/omni/include/mxatomidcounter.h b/LEGO1/omni/include/mxatomidcounter.h
index 79a98f34..4d8bfe38 100644
--- a/LEGO1/omni/include/mxatomidcounter.h
+++ b/LEGO1/omni/include/mxatomidcounter.h
@@ -25,8 +25,8 @@ class MxAtomIdCounter {
 
 	void Inc();
 	void Dec();
-	inline MxString* GetKey() { return &m_key; };
-	inline MxU16 GetValue() { return m_value; };
+	inline MxString* GetKey() { return &m_key; }
+	inline MxU16 GetValue() { return m_value; }
 
 private:
 	MxString m_key;
diff --git a/LEGO1/omni/include/mxaudiomanager.h b/LEGO1/omni/include/mxaudiomanager.h
index 94b5c4c9..d2b97d1a 100644
--- a/LEGO1/omni/include/mxaudiomanager.h
+++ b/LEGO1/omni/include/mxaudiomanager.h
@@ -15,7 +15,7 @@ class MxAudioManager : public MxMediaManager {
 	virtual void Destroy() override;            // vtable+18
 
 	// FUNCTION: LEGO1 0x10029910
-	virtual MxS32 GetVolume() { return this->m_volume; }; // vtable+28
+	virtual MxS32 GetVolume() { return this->m_volume; } // vtable+28
 
 	virtual void SetVolume(MxS32 p_volume); // vtable+2c
 
diff --git a/LEGO1/omni/include/mxaudiopresenter.h b/LEGO1/omni/include/mxaudiopresenter.h
index 82e4b48a..bf127d2b 100644
--- a/LEGO1/omni/include/mxaudiopresenter.h
+++ b/LEGO1/omni/include/mxaudiopresenter.h
@@ -24,10 +24,10 @@ class MxAudioPresenter : public MxMediaPresenter {
 	}
 
 	// FUNCTION: LEGO1 0x1000d260
-	virtual MxS32 GetVolume() { return m_volume; }; // vtable+0x5c
+	virtual MxS32 GetVolume() { return m_volume; } // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x1000d270
-	virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; }; // vtable+0x60
+	virtual void SetVolume(MxS32 p_volume) { m_volume = p_volume; } // vtable+0x60
 
 protected:
 	MxS32 m_volume;
diff --git a/LEGO1/omni/include/mxbitmap.h b/LEGO1/omni/include/mxbitmap.h
index fe3e6682..7045c01e 100644
--- a/LEGO1/omni/include/mxbitmap.h
+++ b/LEGO1/omni/include/mxbitmap.h
@@ -44,7 +44,7 @@ class MxBitmap : public MxCore {
 	virtual MxLong Read(const char* p_filename);                                           // vtable+24
 
 	// FUNCTION: LEGO1 0x1004e0d0
-	virtual int VTable0x28(int) { return -1; }; // vtable+28
+	virtual int VTable0x28(int) { return -1; } // vtable+28
 
 	virtual void BitBlt(
 		MxBitmap* p_src,
@@ -134,8 +134,8 @@ class MxBitmap : public MxCore {
 private:
 	MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
 
-	MxBITMAPINFO* m_info;          // 0x8
-	BITMAPINFOHEADER* m_bmiHeader; // 0xc
+	MxBITMAPINFO* m_info;          // 0x08
+	BITMAPINFOHEADER* m_bmiHeader; // 0x0c
 	RGBQUAD* m_paletteData;        // 0x10
 	MxU8* m_data;                  // 0x14
 	MxBool m_isHighColor;          // 0x18
diff --git a/LEGO1/omni/include/mxcollection.h b/LEGO1/omni/include/mxcollection.h
index b0b4da88..58647ed4 100644
--- a/LEGO1/omni/include/mxcollection.h
+++ b/LEGO1/omni/include/mxcollection.h
@@ -20,8 +20,8 @@ class MxCollection : public MxCore {
 	virtual MxS8 Compare(T, T) { return 0; }
 
 protected:
-	MxU32 m_count;                 // 0x8
-	void (*m_customDestructor)(T); // 0xc
+	MxU32 m_count;                 // 0x08
+	void (*m_customDestructor)(T); // 0x0c
 };
 
 #endif // MXCOLLECTION_H
diff --git a/LEGO1/omni/include/mxcompositepresenter.h b/LEGO1/omni/include/mxcompositepresenter.h
index 044d085a..122778d6 100644
--- a/LEGO1/omni/include/mxcompositepresenter.h
+++ b/LEGO1/omni/include/mxcompositepresenter.h
@@ -12,7 +12,7 @@ class MxCompositePresenterList : public list<MxPresenter*> {};
 class MxCompositePresenter : public MxPresenter {
 public:
 	MxCompositePresenter();
-	virtual ~MxCompositePresenter() override; // vtable+0x0
+	virtual ~MxCompositePresenter() override; // vtable+0x00
 
 	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
@@ -44,7 +44,7 @@ class MxCompositePresenter : public MxPresenter {
 		if (m_compositePresenter)
 			return m_compositePresenter->VTable0x64(p_undefined);
 		return TRUE;
-	}; // vtable+0x64
+	} // vtable+0x64
 
 	inline MxCompositePresenterList& GetList() { return m_list; }
 
diff --git a/LEGO1/omni/include/mxcore.h b/LEGO1/omni/include/mxcore.h
index 632391bc..dc167f2b 100644
--- a/LEGO1/omni/include/mxcore.h
+++ b/LEGO1/omni/include/mxcore.h
@@ -9,7 +9,7 @@
 class MxParam;
 
 // VTABLE: LEGO1 0x100dc0f8
-// SIZE 0x8
+// SIZE 0x08
 class MxCore {
 public:
 	MxCore();
@@ -17,7 +17,7 @@ class MxCore {
 	virtual MxLong Notify(MxParam& p_param); // vtable+04
 
 	// FUNCTION: LEGO1 0x10001f70
-	virtual MxResult Tickle() { return SUCCESS; }; // vtable+08
+	virtual MxResult Tickle() { return SUCCESS; } // vtable+08
 
 	// FUNCTION: LEGO1 0x100144c0
 	inline virtual const char* ClassName() const // vtable+0c
diff --git a/LEGO1/omni/include/mxdiskstreamcontroller.h b/LEGO1/omni/include/mxdiskstreamcontroller.h
index 52c0d8b4..c571882a 100644
--- a/LEGO1/omni/include/mxdiskstreamcontroller.h
+++ b/LEGO1/omni/include/mxdiskstreamcontroller.h
@@ -17,7 +17,7 @@ class MxDiskStreamController : public MxStreamController {
 	MxDiskStreamController();
 	virtual ~MxDiskStreamController() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x100c7360
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/omni/include/mxdisplaysurface.h b/LEGO1/omni/include/mxdisplaysurface.h
index 1d26264c..69706126 100644
--- a/LEGO1/omni/include/mxdisplaysurface.h
+++ b/LEGO1/omni/include/mxdisplaysurface.h
@@ -92,6 +92,7 @@ class MxDisplaySurface : public MxCore {
 
 	void ClearScreen();
 	static LPDIRECTDRAWSURFACE CreateCursorSurface();
+	static LPDIRECTDRAWSURFACE FUN_100bbfb0(LPDIRECTDRAWSURFACE p_und);
 
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface1() { return this->m_ddSurface1; }
 	inline LPDIRECTDRAWSURFACE GetDirectDrawSurface2() { return this->m_ddSurface2; }
diff --git a/LEGO1/omni/include/mxdschunk.h b/LEGO1/omni/include/mxdschunk.h
index 52806580..1933df93 100644
--- a/LEGO1/omni/include/mxdschunk.h
+++ b/LEGO1/omni/include/mxdschunk.h
@@ -61,8 +61,8 @@ class MxDSChunk : public MxCore {
 	// MxDSChunk::`scalar deleting destructor'
 
 protected:
-	MxU16 m_flags;    // 0x8
-	MxU32 m_objectId; // 0xc
+	MxU16 m_flags;    // 0x08
+	MxU32 m_objectId; // 0x0c
 	MxLong m_time;    // 0x10
 	MxU32 m_length;   // 0x14
 	MxU8* m_data;     // 0x18
diff --git a/LEGO1/omni/include/mxdsfile.h b/LEGO1/omni/include/mxdsfile.h
index c4de4820..4242fe0d 100644
--- a/LEGO1/omni/include/mxdsfile.h
+++ b/LEGO1/omni/include/mxdsfile.h
@@ -12,7 +12,7 @@
 class MxDSFile : public MxDSSource {
 public:
 	MxDSFile(const char* p_filename, MxULong p_skipReadingChunks);
-	virtual ~MxDSFile(); // vtable+0x0
+	virtual ~MxDSFile(); // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0120
 	inline virtual const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h
index efc1a11d..22a04feb 100644
--- a/LEGO1/omni/include/mxdsmultiaction.h
+++ b/LEGO1/omni/include/mxdsmultiaction.h
@@ -36,7 +36,7 @@ class MxDSMultiAction : public MxDSAction {
 	virtual MxBool HasId(MxU32 p_objectId) override;                     // vtable+34;
 	virtual void SetUnknown90(MxLong p_unk0x90) override;                // vtable+38;
 
-	inline MxDSActionList* GetActionList() const { return m_actions; };
+	inline MxDSActionList* GetActionList() const { return m_actions; }
 
 	// SYNTHETIC: LEGO1 0x100ca040
 	// MxDSMultiAction::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h
index 5fa1d4fb..9ede2f11 100644
--- a/LEGO1/omni/include/mxdsobject.h
+++ b/LEGO1/omni/include/mxdsobject.h
@@ -36,13 +36,13 @@ class MxDSObject : public MxCore {
 	void SetSourceName(const char* p_sourceName);
 
 	// FUNCTION: LEGO1 0x100bf730
-	inline virtual const char* ClassName() const override { return "MxDSObject"; }; // vtable+0c
+	inline virtual const char* ClassName() const override { return "MxDSObject"; } // vtable+0c
 
 	// FUNCTION: LEGO1 0x100bf740
 	inline virtual MxBool IsA(const char* p_name) const override
 	{
 		return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name);
-	}; // vtable+10;
+	} // vtable+10;
 
 	virtual undefined4 VTable0x14();                                                // vtable+14;
 	virtual MxU32 GetSizeOnDisk();                                                  // vtable+18;
@@ -68,8 +68,8 @@ class MxDSObject : public MxCore {
 	// MxDSObject::`scalar deleting destructor'
 
 private:
-	MxU32 m_sizeOnDisk;     // 0x8
-	MxU16 m_type;           // 0xc
+	MxU32 m_sizeOnDisk;     // 0x08
+	MxU16 m_type;           // 0x0c
 	char* m_sourceName;     // 0x10
 	undefined4 m_unk0x14;   // 0x14
 	char* m_objectName;     // 0x18
diff --git a/LEGO1/omni/include/mxentity.h b/LEGO1/omni/include/mxentity.h
index e78d3b2b..df36ea37 100644
--- a/LEGO1/omni/include/mxentity.h
+++ b/LEGO1/omni/include/mxentity.h
@@ -18,7 +18,7 @@ class MxEntity : public MxCore {
 	virtual ~MxEntity() override{};
 
 	// FUNCTION: LEGO1 0x1000c180
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0070
 		return "MxEntity";
@@ -36,7 +36,7 @@ class MxEntity : public MxCore {
 		this->m_mxEntityId = p_id;
 		this->m_atom = p_atom;
 		return SUCCESS;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	inline MxResult Create(MxDSAction& p_dsAction)
 	{
@@ -52,8 +52,8 @@ class MxEntity : public MxCore {
 	// MxEntity::`scalar deleting destructor'
 
 protected:
-	MxS32 m_mxEntityId; // 0x8
-	MxAtomId m_atom;    // 0xc
+	MxS32 m_mxEntityId; // 0x08
+	MxAtomId m_atom;    // 0x0c
 };
 
 #endif // MXENTITY_H
diff --git a/LEGO1/omni/include/mxeventpresenter.h b/LEGO1/omni/include/mxeventpresenter.h
index 52d503df..06599693 100644
--- a/LEGO1/omni/include/mxeventpresenter.h
+++ b/LEGO1/omni/include/mxeventpresenter.h
@@ -12,7 +12,7 @@ class MxEventPresenter : public MxMediaPresenter {
 	virtual ~MxEventPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2c30
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101dcc
 		return "MxEventPresenter";
diff --git a/LEGO1/omni/include/mxflcpresenter.h b/LEGO1/omni/include/mxflcpresenter.h
index c8f9854d..2c4063f9 100644
--- a/LEGO1/omni/include/mxflcpresenter.h
+++ b/LEGO1/omni/include/mxflcpresenter.h
@@ -20,7 +20,7 @@ class MxFlcPresenter : public MxVideoPresenter {
 	}
 
 	// FUNCTION: LEGO1 0x100b33f0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f43c8
 		return "MxFlcPresenter";
diff --git a/LEGO1/omni/include/mxlist.h b/LEGO1/omni/include/mxlist.h
index 99330975..b25c1ce2 100644
--- a/LEGO1/omni/include/mxlist.h
+++ b/LEGO1/omni/include/mxlist.h
@@ -53,8 +53,8 @@ class MxList : protected MxCollection<T> {
 
 	virtual ~MxList() override;
 
-	void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); };
-	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); };
+	void Append(T p_obj) { InsertEntry(p_obj, this->m_last, NULL); }
+	void Prepend(T p_obj) { InsertEntry(p_obj, NULL, this->m_first); }
 	void DeleteAll(MxBool p_destroy = TRUE);
 	MxU32 GetCount() { return this->m_count; }
 
@@ -75,7 +75,7 @@ class MxPtrList : public MxList<T*> {
 public:
 	MxPtrList(MxBool p_ownership) { SetOwnership(p_ownership); }
 
-	static void Destroy(T* p_obj) { delete p_obj; };
+	static void Destroy(T* p_obj) { delete p_obj; }
 
 	void SetOwnership(MxBool p_ownership)
 	{
diff --git a/LEGO1/omni/include/mxloopingflcpresenter.h b/LEGO1/omni/include/mxloopingflcpresenter.h
index 7075332d..e9cfac1a 100644
--- a/LEGO1/omni/include/mxloopingflcpresenter.h
+++ b/LEGO1/omni/include/mxloopingflcpresenter.h
@@ -12,7 +12,7 @@ class MxLoopingFlcPresenter : public MxFlcPresenter {
 	virtual ~MxLoopingFlcPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b4380
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e20
 		return "MxLoopingFlcPresenter";
diff --git a/LEGO1/omni/include/mxloopingmidipresenter.h b/LEGO1/omni/include/mxloopingmidipresenter.h
index e47ef30d..81ccab74 100644
--- a/LEGO1/omni/include/mxloopingmidipresenter.h
+++ b/LEGO1/omni/include/mxloopingmidipresenter.h
@@ -8,7 +8,7 @@
 class MxLoopingMIDIPresenter : public MxMIDIPresenter {
 public:
 	// FUNCTION: LEGO1 0x100b1830
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101de0
 		return "MxLoopingMIDIPresenter";
diff --git a/LEGO1/omni/include/mxloopingsmkpresenter.h b/LEGO1/omni/include/mxloopingsmkpresenter.h
index 9506de84..832b4263 100644
--- a/LEGO1/omni/include/mxloopingsmkpresenter.h
+++ b/LEGO1/omni/include/mxloopingsmkpresenter.h
@@ -9,10 +9,10 @@
 class MxLoopingSmkPresenter : public MxSmkPresenter {
 public:
 	MxLoopingSmkPresenter();
-	virtual ~MxLoopingSmkPresenter() override; // vtable+0x0
+	virtual ~MxLoopingSmkPresenter() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100b4920
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e08
 		return "MxLoopingSmkPresenter";
diff --git a/LEGO1/omni/include/mxmediamanager.h b/LEGO1/omni/include/mxmediamanager.h
index 25853adf..d531e5c7 100644
--- a/LEGO1/omni/include/mxmediamanager.h
+++ b/LEGO1/omni/include/mxmediamanager.h
@@ -27,8 +27,8 @@ class MxMediaManager : public MxCore {
 	// MxMediaManager::`scalar deleting destructor'
 
 protected:
-	MxPresenterList* m_presenters;       // 0x8
-	MxThread* m_thread;                  // 0xc
+	MxPresenterList* m_presenters;       // 0x08
+	MxThread* m_thread;                  // 0x0c
 	MxCriticalSection m_criticalSection; // 0x10
 };
 
diff --git a/LEGO1/omni/include/mxmediapresenter.h b/LEGO1/omni/include/mxmediapresenter.h
index 954a2dcc..f73cf2bf 100644
--- a/LEGO1/omni/include/mxmediapresenter.h
+++ b/LEGO1/omni/include/mxmediapresenter.h
@@ -13,12 +13,12 @@ class MxMediaPresenter : public MxPresenter {
 	inline MxMediaPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c550
-	virtual ~MxMediaPresenter() override { Destroy(TRUE); };
+	virtual ~MxMediaPresenter() override { Destroy(TRUE); }
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000c5c0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f074c
 		return "MxMediaPresenter";
@@ -35,7 +35,7 @@ class MxMediaPresenter : public MxPresenter {
 	virtual void DoneTickle() override;      // vtable+0x2c
 
 	// FUNCTION: LEGO1 0x1000c5b0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*) override; // vtable+0x3c
 	virtual void EndAction() override;                                       // vtable+0x40
diff --git a/LEGO1/omni/include/mxmidipresenter.h b/LEGO1/omni/include/mxmidipresenter.h
index 0bde447c..1abab9d1 100644
--- a/LEGO1/omni/include/mxmidipresenter.h
+++ b/LEGO1/omni/include/mxmidipresenter.h
@@ -12,7 +12,7 @@ class MxMIDIPresenter : public MxMusicPresenter {
 	virtual ~MxMIDIPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c2650
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101df8
 		return "MxMIDIPresenter";
diff --git a/LEGO1/omni/include/mxmusicpresenter.h b/LEGO1/omni/include/mxmusicpresenter.h
index 88be5c7f..7b8948cd 100644
--- a/LEGO1/omni/include/mxmusicpresenter.h
+++ b/LEGO1/omni/include/mxmusicpresenter.h
@@ -11,7 +11,7 @@ class MxMusicPresenter : public MxAudioPresenter {
 	virtual ~MxMusicPresenter() override;
 
 	// FUNCTION: LEGO1 0x100c23a0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e48
 		return "MxMusicPresenter";
diff --git a/LEGO1/omni/include/mxnextactiondatastart.h b/LEGO1/omni/include/mxnextactiondatastart.h
index 3b58a338..de425989 100644
--- a/LEGO1/omni/include/mxnextactiondatastart.h
+++ b/LEGO1/omni/include/mxnextactiondatastart.h
@@ -16,7 +16,7 @@ class MxNextActionDataStart : public MxCore {
 	}
 
 	// FUNCTION: LEGO1 0x100c1900
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x101025a0
 		return "MxNextActionDataStart";
diff --git a/LEGO1/omni/include/mxnotificationmanager.h b/LEGO1/omni/include/mxnotificationmanager.h
index 4ed58f62..829473b8 100644
--- a/LEGO1/omni/include/mxnotificationmanager.h
+++ b/LEGO1/omni/include/mxnotificationmanager.h
@@ -16,8 +16,8 @@ class MxNotification {
 	inline MxNotificationParam* GetParam() { return m_param; }
 
 private:
-	MxCore* m_target;             // 0x0
-	MxNotificationParam* m_param; // 0x4
+	MxCore* m_target;             // 0x00
+	MxNotificationParam* m_param; // 0x04
 };
 
 class MxIdList : public list<MxU32> {};
@@ -27,8 +27,8 @@ class MxNotificationPtrList : public list<MxNotification*> {};
 // VTABLE: LEGO1 0x100dc078
 class MxNotificationManager : public MxCore {
 private:
-	MxNotificationPtrList* m_queue;    // 0x8
-	MxNotificationPtrList* m_sendList; // 0xc
+	MxNotificationPtrList* m_queue;    // 0x08
+	MxNotificationPtrList* m_sendList; // 0x0c
 	MxCriticalSection m_lock;          // 0x10
 	MxS32 m_unk0x2c;                   // 0x2c
 	MxIdList m_listenerIds;            // 0x30
@@ -36,9 +36,9 @@ class MxNotificationManager : public MxCore {
 
 public:
 	MxNotificationManager();
-	virtual ~MxNotificationManager(); // vtable+0x0 (scalar deleting destructor)
+	virtual ~MxNotificationManager(); // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle(); // vtable+0x8
+	virtual MxResult Tickle(); // vtable+0x08
 	// TODO: Where does this method come from?
 	virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
 	void Register(MxCore* p_listener);
diff --git a/LEGO1/omni/include/mxnotificationparam.h b/LEGO1/omni/include/mxnotificationparam.h
index 2ec5cf19..9fe01c18 100644
--- a/LEGO1/omni/include/mxnotificationparam.h
+++ b/LEGO1/omni/include/mxnotificationparam.h
@@ -42,7 +42,7 @@ class MxNotificationParam : public MxParam {
 	}
 
 	// FUNCTION: LEGO1 0x10010390
-	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); }; // vtable+0x4
+	virtual MxNotificationParam* Clone() { return new MxNotificationParam(m_type, m_sender); } // vtable+0x04
 
 	inline NotificationId GetNotification() const { return m_type; }
 	inline MxCore* GetSender() const { return m_sender; }
diff --git a/LEGO1/omni/include/mxobjectfactory.h b/LEGO1/omni/include/mxobjectfactory.h
index 4ae3e348..3f74f1c4 100644
--- a/LEGO1/omni/include/mxobjectfactory.h
+++ b/LEGO1/omni/include/mxobjectfactory.h
@@ -24,7 +24,7 @@ class MxObjectFactory : public MxCore {
 	MxObjectFactory();
 
 	// FUNCTION: LEGO1 0x10008f70
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0730
 		return "MxObjectFactory";
diff --git a/LEGO1/omni/include/mxomni.h b/LEGO1/omni/include/mxomni.h
index 9ba344b7..a2092168 100644
--- a/LEGO1/omni/include/mxomni.h
+++ b/LEGO1/omni/include/mxomni.h
@@ -54,7 +54,7 @@ class MxOmni : public MxCore {
 	virtual void StopTimer();                                                                 // vtable+3c
 
 	// FUNCTION: LEGO1 0x10058a90
-	virtual MxBool IsTimerRunning() { return m_timerRunning; }; // vtable+40
+	virtual MxBool IsTimerRunning() { return m_timerRunning; } // vtable+40
 
 	static void SetInstance(MxOmni* p_instance);
 	static MxBool ActionSourceEquals(MxDSAction* p_action, const char* p_name);
@@ -79,7 +79,7 @@ class MxOmni : public MxCore {
 protected:
 	static MxOmni* g_instance;
 
-	MxString m_mediaPath;                         // 0x8
+	MxString m_mediaPath;                         // 0x08
 	HWND m_windowHandle;                          // 0x18
 	MxObjectFactory* m_objectFactory;             // 0x1C
 	MxVariableTable* m_variableTable;             // 0x20
diff --git a/LEGO1/omni/include/mxpalette.h b/LEGO1/omni/include/mxpalette.h
index 9352950f..4a1eebf0 100644
--- a/LEGO1/omni/include/mxpalette.h
+++ b/LEGO1/omni/include/mxpalette.h
@@ -33,7 +33,7 @@ class MxPalette : public MxCore {
 
 private:
 	LPDIRECTDRAWPALETTE m_palette;
-	PALETTEENTRY m_entries[256]; // 0xc
+	PALETTEENTRY m_entries[256]; // 0x0c
 	MxBool m_overrideSkyColor;   // 0x40c
 	PALETTEENTRY m_skyColor;     // 0x40d
 };
diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h
index 35a28eda..3d9dd355 100644
--- a/LEGO1/omni/include/mxpresenter.h
+++ b/LEGO1/omni/include/mxpresenter.h
@@ -34,7 +34,7 @@ class MxPresenter : public MxCore {
 	virtual MxResult Tickle() override; // vtable+0x08
 
 	// FUNCTION: LEGO1 0x1000bfe0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0740
 		return "MxPresenter";
@@ -60,17 +60,17 @@ class MxPresenter : public MxCore {
 	virtual void StartingTickle() { ProgressTickleState(e_streaming); } // vtable+0x1c
 
 	// FUNCTION: LEGO1 0x1000be80
-	virtual void StreamingTickle() { ProgressTickleState(e_repeating); }; // vtable+0x20
+	virtual void StreamingTickle() { ProgressTickleState(e_repeating); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x1000bea0
-	virtual void RepeatingTickle() { ProgressTickleState(e_unk5); }; // vtable+0x24
+	virtual void RepeatingTickle() { ProgressTickleState(e_unk5); } // vtable+0x24
 
 	// FUNCTION: LEGO1 0x1000bec0
-	virtual void Unk5Tickle() { ProgressTickleState(e_done); }; // vtable+0x28
+	virtual void Unk5Tickle() { ProgressTickleState(e_done); } // vtable+0x28
 
 protected:
 	// FUNCTION: LEGO1 0x1000bee0
-	virtual void DoneTickle() { ProgressTickleState(e_idle); }; // vtable+0x2c
+	virtual void DoneTickle() { ProgressTickleState(e_idle); } // vtable+0x2c
 
 	virtual void ParseExtra(); // vtable+0x30
 
@@ -82,10 +82,10 @@ class MxPresenter : public MxCore {
 
 public:
 	// FUNCTION: LEGO1 0x1000bf70
-	virtual MxResult AddToManager() { return SUCCESS; }; // vtable+0x34
+	virtual MxResult AddToManager() { return SUCCESS; } // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000bf80
-	virtual void Destroy() { Init(); }; // vtable+0x38
+	virtual void Destroy() { Init(); } // vtable+0x38
 
 	virtual MxResult StartAction(MxStreamController*, MxDSAction*); // vtable+0x3c
 	virtual void EndAction();                                       // vtable+0x40
@@ -97,13 +97,13 @@ class MxPresenter : public MxCore {
 	virtual MxBool HasTickleStatePassed(TickleState p_tickleState)
 	{
 		return m_previousTickleStates & (1 << (MxU8) p_tickleState);
-	}; // vtable+0x48
+	} // vtable+0x48
 
 	// FUNCTION: LEGO1 0x1000bfc0
-	virtual MxResult PutData() { return SUCCESS; }; // vtable+0x4c
+	virtual MxResult PutData() { return SUCCESS; } // vtable+0x4c
 
 	// FUNCTION: LEGO1 0x1000bfd0
-	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; }; // vtable+0x50
+	virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) { return FALSE; } // vtable+0x50
 
 	virtual void Enable(MxBool p_enable); // vtable+0x54
 
@@ -127,7 +127,7 @@ class MxPresenter : public MxCore {
 protected:
 	void Init();
 
-	TickleState m_currentTickleState;           // 0x8
+	TickleState m_currentTickleState;           // 0x08
 	MxU32 m_previousTickleStates;               // 0x0c
 	MxPoint32 m_location;                       // 0x10
 	MxS32 m_displayZ;                           // 0x18
diff --git a/LEGO1/omni/include/mxpresenterlist.h b/LEGO1/omni/include/mxpresenterlist.h
index 8b22a18b..dd119621 100644
--- a/LEGO1/omni/include/mxpresenterlist.h
+++ b/LEGO1/omni/include/mxpresenterlist.h
@@ -17,7 +17,7 @@ class MxPresenterList : public MxPtrList<MxPresenter> {
 	virtual MxS8 Compare(MxPresenter* p_a, MxPresenter* p_b) override
 	{
 		return p_a == p_b ? 0 : p_a < p_b ? -1 : 1;
-	}; // vtable+0x14
+	} // vtable+0x14
 
 	// SYNTHETIC: LEGO1 0x1001ceb0
 	// MxPresenterList::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxramstreamcontroller.h b/LEGO1/omni/include/mxramstreamcontroller.h
index 6b56ee49..00e1b06d 100644
--- a/LEGO1/omni/include/mxramstreamcontroller.h
+++ b/LEGO1/omni/include/mxramstreamcontroller.h
@@ -12,7 +12,7 @@ class MxRAMStreamController : public MxStreamController {
 	inline MxRAMStreamController() {}
 
 	// FUNCTION: LEGO1 0x100b9430
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102118
 		return "MxRAMStreamController";
diff --git a/LEGO1/omni/include/mxramstreamprovider.h b/LEGO1/omni/include/mxramstreamprovider.h
index f5ac0897..c994b848 100644
--- a/LEGO1/omni/include/mxramstreamprovider.h
+++ b/LEGO1/omni/include/mxramstreamprovider.h
@@ -11,7 +11,7 @@ class MxRAMStreamProvider : public MxStreamProvider {
 	virtual ~MxRAMStreamProvider() override;
 
 	// FUNCTION: LEGO1 0x100d0970
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102864
 		return "MxRAMStreamProvider";
diff --git a/LEGO1/omni/include/mxrect32.h b/LEGO1/omni/include/mxrect32.h
index b52a0c31..20e1706e 100644
--- a/LEGO1/omni/include/mxrect32.h
+++ b/LEGO1/omni/include/mxrect32.h
@@ -114,8 +114,8 @@ class MxRect32 {
 		return this;
 	}
 
-	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; };
-	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; };
+	inline static MxS32 Min(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_a : p_b; }
+	inline static MxS32 Max(MxS32 p_a, MxS32 p_b) { return p_a <= p_b ? p_b : p_a; }
 
 	MxS32 m_left;   // 0x00
 	MxS32 m_top;    // 0x04
diff --git a/LEGO1/omni/include/mxsmkpresenter.h b/LEGO1/omni/include/mxsmkpresenter.h
index eeb12945..b9dcc341 100644
--- a/LEGO1/omni/include/mxsmkpresenter.h
+++ b/LEGO1/omni/include/mxsmkpresenter.h
@@ -13,7 +13,7 @@ class MxSmkPresenter : public MxVideoPresenter {
 	virtual ~MxSmkPresenter() override;
 
 	// FUNCTION: LEGO1 0x100b3730
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e38
 		return "MxSmkPresenter";
diff --git a/LEGO1/omni/include/mxsoundmanager.h b/LEGO1/omni/include/mxsoundmanager.h
index 5131e1e2..c0bec1bb 100644
--- a/LEGO1/omni/include/mxsoundmanager.h
+++ b/LEGO1/omni/include/mxsoundmanager.h
@@ -12,7 +12,7 @@
 class MxSoundManager : public MxAudioManager {
 public:
 	MxSoundManager();
-	virtual ~MxSoundManager() override; // vtable+0x0
+	virtual ~MxSoundManager() override; // vtable+0x00
 
 	virtual void Destroy() override;                                     // vtable+0x18
 	virtual void SetVolume(MxS32 p_volume) override;                     // vtable+0x2c
diff --git a/LEGO1/omni/include/mxsoundpresenter.h b/LEGO1/omni/include/mxsoundpresenter.h
index 1949617f..4d1ab300 100644
--- a/LEGO1/omni/include/mxsoundpresenter.h
+++ b/LEGO1/omni/include/mxsoundpresenter.h
@@ -9,25 +9,25 @@
 class MxSoundPresenter : public MxAudioPresenter {
 public:
 	// FUNCTION: LEGO1 0x1000d430
-	virtual ~MxSoundPresenter() override { Destroy(TRUE); };
+	virtual ~MxSoundPresenter() override { Destroy(TRUE); }
 
 	// FUNCTION: LEGO1 0x1000d4a0
 	inline virtual const char* ClassName() const // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f07a0
 		return "MxSoundPresenter";
-	};
+	}
 
 	// FUNCTION: LEGO1 0x1000d4b0
 	inline virtual MxBool IsA(const char* p_name) const // vtable+0x10
 	{
 		return !strcmp(p_name, MxSoundPresenter::ClassName()) || MxAudioPresenter::IsA(p_name);
-	};
+	}
 
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d490
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	// SYNTHETIC: LEGO1 0x1000d5c0
 	// MxSoundPresenter::`scalar deleting destructor'
diff --git a/LEGO1/omni/include/mxstillpresenter.h b/LEGO1/omni/include/mxstillpresenter.h
index 0fa48bf3..a559b7e5 100644
--- a/LEGO1/omni/include/mxstillpresenter.h
+++ b/LEGO1/omni/include/mxstillpresenter.h
@@ -9,11 +9,12 @@
 class MxStillPresenter : public MxVideoPresenter {
 public:
 	MxStillPresenter() { m_bitmapInfo = NULL; }
+
 	// FUNCTION: LEGO1 0x10043550
-	virtual ~MxStillPresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100435c0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f0184
 		return "MxStillPresenter";
@@ -31,7 +32,7 @@ class MxStillPresenter : public MxVideoPresenter {
 	virtual void ParseExtra() override;      // vtable+0x30
 
 	// FUNCTION: LEGO1 0x100435b0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void Enable(MxBool p_enable) override;            // vtable+0x54
 	virtual void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
diff --git a/LEGO1/omni/include/mxstreamchunk.h b/LEGO1/omni/include/mxstreamchunk.h
index 5b9ecb64..baa5edda 100644
--- a/LEGO1/omni/include/mxstreamchunk.h
+++ b/LEGO1/omni/include/mxstreamchunk.h
@@ -15,7 +15,7 @@ class MxStreamChunk : public MxDSChunk {
 	virtual ~MxStreamChunk() override;
 
 	// FUNCTION: LEGO1 0x100b1fe0
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10101e5c
 		return "MxStreamChunk";
diff --git a/LEGO1/omni/include/mxstreamcontroller.h b/LEGO1/omni/include/mxstreamcontroller.h
index 57caae8e..a23c2537 100644
--- a/LEGO1/omni/include/mxstreamcontroller.h
+++ b/LEGO1/omni/include/mxstreamcontroller.h
@@ -19,10 +19,10 @@ class MxDSStreamingAction;
 class MxStreamController : public MxCore {
 public:
 	MxStreamController();
-	virtual ~MxStreamController() override; // vtable+0x0
+	virtual ~MxStreamController() override; // vtable+0x00
 
 	// FUNCTION: LEGO1 0x100c0f10
-	inline virtual const char* ClassName() const override // vtable+0xc
+	inline virtual const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x10102130
 		return "MxStreamController";
@@ -53,14 +53,14 @@ class MxStreamController : public MxCore {
 	MxResult InsertActionToList54(MxDSAction* p_action);
 	MxNextActionDataStart* FindNextActionDataStartFromStreamingAction(MxDSStreamingAction* p_action);
 
-	inline MxAtomId& GetAtom() { return m_atom; };
-	inline MxStreamProvider* GetProvider() { return m_provider; };
-	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; };
-	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; };
-	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; };
+	inline MxAtomId& GetAtom() { return m_atom; }
+	inline MxStreamProvider* GetProvider() { return m_provider; }
+	inline MxStreamListMxDSAction& GetUnk0x3c() { return m_unk0x3c; }
+	inline MxStreamListMxDSAction& GetUnk0x54() { return m_unk0x54; }
+	inline MxStreamListMxDSSubscriber& GetSubscriberList() { return m_subscriberList; }
 
 protected:
-	MxCriticalSection m_criticalSection;                // 0x8
+	MxCriticalSection m_criticalSection;                // 0x08
 	MxAtomId m_atom;                                    // 0x24
 	MxStreamProvider* m_provider;                       // 0x28
 	undefined4* m_unk0x2c;                              // 0x2c
diff --git a/LEGO1/omni/include/mxstreamer.h b/LEGO1/omni/include/mxstreamer.h
index e0d07b19..86c8956e 100644
--- a/LEGO1/omni/include/mxstreamer.h
+++ b/LEGO1/omni/include/mxstreamer.h
@@ -76,12 +76,12 @@ class MxStreamer : public MxCore {
 	};
 
 	MxStreamer();
-	virtual ~MxStreamer() override; // vtable+0x0
+	virtual ~MxStreamer() override; // vtable+0x00
 
 	MxStreamController* Open(const char* p_name, MxU16 p_openMode);
 	MxLong Close(const char* p_name);
 
-	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
+	virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
 	// FUNCTION: LEGO1 0x100b9000
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -109,7 +109,7 @@ class MxStreamer : public MxCore {
 	inline const MxStreamerSubClass3& GetSubclass2() { return m_subclass2; }
 
 private:
-	list<MxStreamController*> m_openStreams; // 0x8
+	list<MxStreamController*> m_openStreams; // 0x08
 	MxStreamerSubClass2 m_subclass1;         // 0x14
 	MxStreamerSubClass3 m_subclass2;         // 0x20
 };
diff --git a/LEGO1/omni/include/mxstreamlist.h b/LEGO1/omni/include/mxstreamlist.h
index cbe53eae..08cee5bc 100644
--- a/LEGO1/omni/include/mxstreamlist.h
+++ b/LEGO1/omni/include/mxstreamlist.h
@@ -20,7 +20,7 @@ class MxStreamList : public list<T> {
 	}
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 public:
 	MxDSAction* Find(MxDSAction* p_action, MxBool p_delete);
@@ -38,14 +38,14 @@ class MxStreamListMxDSAction : public MxStreamList<MxDSAction*> {
 	}
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxNextActionDataStart : public MxStreamList<MxNextActionDataStart*> {
 public:
 	MxNextActionDataStart* Find(MxU32 p_id, MxS16 p_value);
 	MxNextActionDataStart* FindAndErase(MxU32 p_id, MxS16 p_value);
 };
 
-// SIZE 0xc
+// SIZE 0x0c
 class MxStreamListMxDSSubscriber : public MxStreamList<MxDSSubscriber*> {
 public:
 	MxDSSubscriber* Find(MxDSObject* p_object);
diff --git a/LEGO1/omni/include/mxticklemanager.h b/LEGO1/omni/include/mxticklemanager.h
index 6ebd655b..dba9b029 100644
--- a/LEGO1/omni/include/mxticklemanager.h
+++ b/LEGO1/omni/include/mxticklemanager.h
@@ -24,10 +24,10 @@ class MxTickleClient {
 	inline void SetFlags(MxU16 p_flags) { m_flags = p_flags; }
 
 private:
-	MxCore* m_client;        // 0x0
-	MxTime m_interval;       // 0x4
-	MxTime m_lastUpdateTime; // 0x8
-	MxU16 m_flags;           // 0xc
+	MxCore* m_client;        // 0x00
+	MxTime m_interval;       // 0x04
+	MxTime m_lastUpdateTime; // 0x08
+	MxU16 m_flags;           // 0x0c
 };
 
 typedef list<MxTickleClient*> MxTickleClientPtrList;
@@ -36,9 +36,9 @@ typedef list<MxTickleClient*> MxTickleClientPtrList;
 class MxTickleManager : public MxCore {
 public:
 	inline MxTickleManager() {}
-	virtual ~MxTickleManager(); // vtable+0x0 (scalar deleting destructor)
+	virtual ~MxTickleManager(); // vtable+0x00 (scalar deleting destructor)
 
-	virtual MxResult Tickle();                                                 // vtable+0x8
+	virtual MxResult Tickle();                                                 // vtable+0x08
 	virtual void RegisterClient(MxCore* p_client, MxTime p_interval);          // vtable+0x14
 	virtual void UnregisterClient(MxCore* p_client);                           // vtable+0x18
 	virtual void SetClientTickleInterval(MxCore* p_client, MxTime p_interval); // vtable+0x1c
@@ -48,7 +48,7 @@ class MxTickleManager : public MxCore {
 	// MxTickleManager::`scalar deleting destructor'
 
 private:
-	MxTickleClientPtrList m_clients; // 0x8
+	MxTickleClientPtrList m_clients; // 0x08
 };
 
 #define TICKLE_MANAGER_NOT_FOUND 0x80000000
diff --git a/LEGO1/omni/include/mxtype18notificationparam.h b/LEGO1/omni/include/mxtype18notificationparam.h
index bce896e3..589fd2bb 100644
--- a/LEGO1/omni/include/mxtype18notificationparam.h
+++ b/LEGO1/omni/include/mxtype18notificationparam.h
@@ -8,7 +8,7 @@
 // SIZE 0x10
 class MxType18NotificationParam : public MxNotificationParam {
 protected:
-	undefined4 m_unk0xc; // 0xc
+	undefined4 m_unk0x0c; // 0x0c
 };
 
 #endif // MXTYPE18NOTIFICATIONPARAM_H
diff --git a/LEGO1/omni/include/mxtype19notificationparam.h b/LEGO1/omni/include/mxtype19notificationparam.h
index ddd47998..51a6a713 100644
--- a/LEGO1/omni/include/mxtype19notificationparam.h
+++ b/LEGO1/omni/include/mxtype19notificationparam.h
@@ -8,8 +8,8 @@
 // SIZE 0x10
 class MxType19NotificationParam : public MxNotificationParam {
 protected:
-	MxU16 m_unk0xc; // 0xc
-	MxU8 m_unk0xe;  // 0xe
+	MxU16 m_unk0x0c; // 0x0c
+	MxU8 m_unk0x0e;  // 0x0e
 };
 
 #endif // MXTYPE19NOTIFICATIONPARAM_H
diff --git a/LEGO1/omni/include/mxvariable.h b/LEGO1/omni/include/mxvariable.h
index e09d449c..9b0a3816 100644
--- a/LEGO1/omni/include/mxvariable.h
+++ b/LEGO1/omni/include/mxvariable.h
@@ -22,13 +22,13 @@ class MxVariable {
 	}
 
 	// FUNCTION: LEGO1 0x1003bea0
-	virtual MxString* GetValue() { return &m_value; };
+	virtual MxString* GetValue() { return &m_value; }
 
 	// FUNCTION: LEGO1 0x1003beb0
-	virtual void SetValue(const char* p_value) { m_value = p_value; };
+	virtual void SetValue(const char* p_value) { m_value = p_value; }
 
 	// FUNCTION: LEGO1 0x1003bec0
-	virtual void Destroy() { delete this; };
+	virtual void Destroy() { delete this; }
 
 	inline const MxString* GetKey() const { return &m_key; }
 
diff --git a/LEGO1/omni/include/mxvideomanager.h b/LEGO1/omni/include/mxvideomanager.h
index c4e26aa2..b2719529 100644
--- a/LEGO1/omni/include/mxvideomanager.h
+++ b/LEGO1/omni/include/mxvideomanager.h
@@ -16,7 +16,7 @@ class MxVideoManager : public MxMediaManager {
 	MxVideoManager();
 	virtual ~MxVideoManager() override;
 
-	virtual MxResult Tickle() override; // vtable+0x8
+	virtual MxResult Tickle() override; // vtable+0x08
 	virtual void Destroy() override;    // vtable+0x18
 	virtual MxResult VTable0x28(
 		MxVideoParam& p_videoParam,
diff --git a/LEGO1/omni/include/mxvideopresenter.h b/LEGO1/omni/include/mxvideopresenter.h
index 480607b0..2fc3b1f4 100644
--- a/LEGO1/omni/include/mxvideopresenter.h
+++ b/LEGO1/omni/include/mxvideopresenter.h
@@ -10,18 +10,10 @@
 // SIZE 0x64
 class MxVideoPresenter : public MxMediaPresenter {
 public:
-	enum {
-		c_bit1 = 0x01,
-		c_bit2 = 0x02,
-		c_bit3 = 0x04,
-		c_bit4 = 0x08,
-		c_bit5 = 0x10,
-	};
-
 	MxVideoPresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000c740
-	virtual ~MxVideoPresenter() override { Destroy(TRUE); }; // vtable+0x0
+	virtual ~MxVideoPresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000c820
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -44,7 +36,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000c7a0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void EndAction() override;                   // vtable+0x40
 	virtual MxResult PutData() override;                 // vtable+0x4c
@@ -69,19 +61,19 @@ class MxVideoPresenter : public MxMediaPresenter {
 	virtual undefined VTable0x74(); // vtable+0x74
 
 	// FUNCTION: LEGO1 0x1000c7b0
-	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
+	virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; } // vtable+0x78
 
 	// FUNCTION: LEGO1 0x1000c7c0
-	virtual MxBool VTable0x7c() { return m_bitmap != NULL || m_alpha != NULL; }; // vtable+0x7c
+	virtual MxBool VTable0x7c() { return m_bitmap != NULL || m_alpha != NULL; } // vtable+0x7c
 
 	// FUNCTION: LEGO1 0x1000c7e0
-	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80
+	virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); } // vtable+0x80
 
 	// FUNCTION: LEGO1 0x1000c800
-	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); }; // vtable+0x84
+	virtual MxS32 GetHeight() { return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeightAbs(); } // vtable+0x84
 
 	// VTABLE: LEGO1 0x100dc2bc
-	// SIZE 0xc
+	// SIZE 0x0c
 	struct AlphaMask {
 		MxU8* m_bitmask;
 		MxU16 m_width;
@@ -101,6 +93,18 @@ class MxVideoPresenter : public MxMediaPresenter {
 	inline MxBitmap* GetBitmap() { return m_bitmap; }
 	inline AlphaMask* GetAlphaMask() { return m_alpha; }
 
+	inline void SetBit0(BOOL p_e) { m_flags.m_bit0 = p_e; }
+	inline void SetBit1(BOOL p_e) { m_flags.m_bit1 = p_e; }
+	inline void SetBit2(BOOL p_e) { m_flags.m_bit2 = p_e; }
+	inline void SetBit3(BOOL p_e) { m_flags.m_bit3 = p_e; }
+	inline void SetBit4(BOOL p_e) { m_flags.m_bit4 = p_e; }
+
+	inline BYTE GetBit0() { return m_flags.m_bit0; }
+	inline BYTE GetBit1() { return m_flags.m_bit1; }
+	inline BYTE GetBit2() { return m_flags.m_bit2; }
+	inline BYTE GetBit3() { return m_flags.m_bit3; }
+	inline BYTE GetBit4() { return m_flags.m_bit4; }
+
 	// SYNTHETIC: LEGO1 0x1000c910
 	// MxVideoPresenter::`scalar deleting destructor'
 
@@ -114,7 +118,7 @@ class MxVideoPresenter : public MxMediaPresenter {
 	AlphaMask* m_alpha;            // 0x54
 	LPDIRECTDRAWSURFACE m_unk0x58; // 0x58
 	MxS16 m_unk0x5c;               // 0x5c
-	MxU8 m_flags;                  // 0x5e
+	FlagBitfield m_flags;          // 0x5e
 	MxLong m_unk0x60;              // 0x60
 };
 
diff --git a/LEGO1/omni/include/mxwavepresenter.h b/LEGO1/omni/include/mxwavepresenter.h
index 289fa879..8976b458 100644
--- a/LEGO1/omni/include/mxwavepresenter.h
+++ b/LEGO1/omni/include/mxwavepresenter.h
@@ -13,7 +13,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	MxWavePresenter() { Init(); }
 
 	// FUNCTION: LEGO1 0x1000d640
-	virtual ~MxWavePresenter() override { Destroy(TRUE); }; // vtable+0x00
+	virtual ~MxWavePresenter() override { Destroy(TRUE); } // vtable+0x00
 
 	// FUNCTION: LEGO1 0x1000d6c0
 	inline virtual const char* ClassName() const override // vtable+0x0c
@@ -36,7 +36,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	virtual MxResult AddToManager() override; // vtable+0x34
 
 	// FUNCTION: LEGO1 0x1000d6a0
-	virtual void Destroy() override { Destroy(FALSE); }; // vtable+0x38
+	virtual void Destroy() override { Destroy(FALSE); } // vtable+0x38
 
 	virtual void EndAction() override;                       // vtable+0x40
 	virtual MxResult PutData() override;                     // vtable+0x4c
@@ -47,7 +47,7 @@ class MxWavePresenter : public MxSoundPresenter {
 	virtual void Resume();                                   // vtable+0x68
 
 	// FUNCTION: LEGO1 0x1000d6b0
-	virtual MxBool IsPaused() { return m_paused; }; // vtable+0x6c
+	virtual MxBool IsPaused() { return m_paused; } // vtable+0x6c
 
 	// SIZE 0x18
 	struct WaveFormat {
diff --git a/LEGO1/omni/src/common/mxticklemanager.cpp b/LEGO1/omni/src/common/mxticklemanager.cpp
index 29f8428c..667902c8 100644
--- a/LEGO1/omni/src/common/mxticklemanager.cpp
+++ b/LEGO1/omni/src/common/mxticklemanager.cpp
@@ -5,7 +5,7 @@
 #include "mxtimer.h"
 #include "mxtypes.h"
 
-#define TICKLE_MANAGER_FLAG_DESTROY 0x1
+#define TICKLE_MANAGER_FLAG_DESTROY 0x01
 
 DECOMP_SIZE_ASSERT(MxTickleClient, 0x10);
 DECOMP_SIZE_ASSERT(MxTickleManager, 0x14);
diff --git a/LEGO1/omni/src/notify/mxnotificationmanager.cpp b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
index 37eab387..9e4858df 100644
--- a/LEGO1/omni/src/notify/mxnotificationmanager.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationmanager.cpp
@@ -8,7 +8,7 @@
 #include "mxticklemanager.h"
 #include "mxtypes.h"
 
-DECOMP_SIZE_ASSERT(MxNotification, 0x8);
+DECOMP_SIZE_ASSERT(MxNotification, 0x08);
 DECOMP_SIZE_ASSERT(MxNotificationManager, 0x40);
 
 // FUNCTION: LEGO1 0x100ac220
diff --git a/LEGO1/omni/src/notify/mxnotificationparam.cpp b/LEGO1/omni/src/notify/mxnotificationparam.cpp
index cb15a2df..cf5bf8b9 100644
--- a/LEGO1/omni/src/notify/mxnotificationparam.cpp
+++ b/LEGO1/omni/src/notify/mxnotificationparam.cpp
@@ -2,4 +2,4 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(MxNotificationParam, 0xc);
+DECOMP_SIZE_ASSERT(MxNotificationParam, 0x0c);
diff --git a/LEGO1/omni/src/stream/mxdschunk.cpp b/LEGO1/omni/src/stream/mxdschunk.cpp
index 61d794cc..fede0762 100644
--- a/LEGO1/omni/src/stream/mxdschunk.cpp
+++ b/LEGO1/omni/src/stream/mxdschunk.cpp
@@ -22,5 +22,5 @@ MxDSChunk::~MxDSChunk()
 // FUNCTION: LEGO1 0x100be1e0
 MxU32 MxDSChunk::GetHeaderSize()
 {
-	return 0xe;
+	return 0x0e;
 }
diff --git a/LEGO1/omni/src/stream/mxdsfile.cpp b/LEGO1/omni/src/stream/mxdsfile.cpp
index 3e03ad6e..33b85929 100644
--- a/LEGO1/omni/src/stream/mxdsfile.cpp
+++ b/LEGO1/omni/src/stream/mxdsfile.cpp
@@ -62,7 +62,7 @@ MxLong MxDSFile::ReadChunks()
 		return -1;
 	}
 
-	m_io.Read(&m_header, 0xc);
+	m_io.Read(&m_header, 0x0c);
 	if ((m_header.m_majorVersion == SI_MAJOR_VERSION) && (m_header.m_minorVersion == SI_MINOR_VERSION)) {
 		childChunk.ckid = FOURCC('M', 'x', 'O', 'f');
 		if (m_io.Descend(&childChunk, &topChunk, 0) != 0) {
diff --git a/LEGO1/omni/src/stream/mxstreamlist.cpp b/LEGO1/omni/src/stream/mxstreamlist.cpp
index 46e9841b..531d0446 100644
--- a/LEGO1/omni/src/stream/mxstreamlist.cpp
+++ b/LEGO1/omni/src/stream/mxstreamlist.cpp
@@ -1,9 +1,9 @@
 #include "mxstreamlist.h"
 
 // Wrappers around STL list that are used by the MxStream* classes.
-DECOMP_SIZE_ASSERT(MxStreamListMxDSAction, 0xc);
-DECOMP_SIZE_ASSERT(MxStreamListMxNextActionDataStart, 0xc);
-DECOMP_SIZE_ASSERT(MxStreamListMxDSSubscriber, 0xc);
+DECOMP_SIZE_ASSERT(MxStreamListMxDSAction, 0x0c);
+DECOMP_SIZE_ASSERT(MxStreamListMxNextActionDataStart, 0x0c);
+DECOMP_SIZE_ASSERT(MxStreamListMxDSSubscriber, 0x0c);
 
 // FUNCTION: LEGO1 0x100b8450
 MxDSSubscriber* MxStreamListMxDSSubscriber::Find(MxDSObject* p_object)
diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index 3a43ff3f..e2965826 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -679,6 +679,13 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
 	return surface;
 }
 
+// STUB: LEGO1 0x100bbfb0
+LPDIRECTDRAWSURFACE MxDisplaySurface::FUN_100bbfb0(LPDIRECTDRAWSURFACE p_und)
+{
+	// TODO
+	return NULL;
+}
+
 // FUNCTION: LEGO1 0x100bc070
 LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
 {
diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp
index 2fc22265..ff82aa60 100644
--- a/LEGO1/omni/src/video/mxflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxflcpresenter.cpp
@@ -12,9 +12,9 @@ DECOMP_SIZE_ASSERT(MxFlcPresenter, 0x68);
 // FUNCTION: LEGO1 0x100b3310
 MxFlcPresenter::MxFlcPresenter()
 {
-	this->m_flcHeader = NULL;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	m_flcHeader = NULL;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b3420
diff --git a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
index 59540cb3..cc36792d 100644
--- a/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingflcpresenter.cpp
@@ -20,8 +20,8 @@ MxLoopingFlcPresenter::~MxLoopingFlcPresenter()
 void MxLoopingFlcPresenter::Init()
 {
 	this->m_elapsedDuration = 0;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b4430
diff --git a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
index 51ed74c8..86b93544 100644
--- a/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxloopingsmkpresenter.cpp
@@ -20,9 +20,9 @@ MxLoopingSmkPresenter::~MxLoopingSmkPresenter()
 // FUNCTION: LEGO1 0x100b49b0
 void MxLoopingSmkPresenter::Init()
 {
-	this->m_elapsedDuration = 0;
-	this->m_flags &= ~c_bit2;
-	this->m_flags &= ~c_bit3;
+	m_elapsedDuration = 0;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b49d0
diff --git a/LEGO1/omni/src/video/mxsmkpresenter.cpp b/LEGO1/omni/src/video/mxsmkpresenter.cpp
index b8001623..1779fe82 100644
--- a/LEGO1/omni/src/video/mxsmkpresenter.cpp
+++ b/LEGO1/omni/src/video/mxsmkpresenter.cpp
@@ -23,8 +23,8 @@ void MxSmkPresenter::Init()
 {
 	m_currentFrame = 0;
 	memset(&m_mxSmack, 0, sizeof(m_mxSmack));
-	m_flags &= ~c_bit2;
-	m_flags &= ~c_bit3;
+	SetBit1(FALSE);
+	SetBit2(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b3900
diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp
index 4b81d6f1..83b1a87e 100644
--- a/LEGO1/omni/src/video/mxstillpresenter.cpp
+++ b/LEGO1/omni/src/video/mxstillpresenter.cpp
@@ -75,12 +75,12 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 	MxRect32 rect(x, y, width + x, height + y);
 	MVideoManager()->InvalidateRect(rect);
 
-	if (m_flags & c_bit2) {
+	if (GetBit1()) {
 		undefined4 und = 0;
 		m_unk0x58 = MxOmni::GetInstance()->GetVideoManager()->GetDisplaySurface()->VTable0x44(
 			m_bitmap,
 			&und,
-			(m_flags & c_bit4) / 8,
+			GetBit3(),
 			m_action->GetFlags() & MxDSAction::c_bit4
 		);
 
@@ -91,9 +91,9 @@ void MxStillPresenter::LoadFrame(MxStreamChunk* p_chunk)
 		m_bitmap = NULL;
 
 		if (m_unk0x58 && und)
-			m_flags |= c_bit3;
+			SetBit2(TRUE);
 		else
-			m_flags &= ~c_bit3;
+			SetBit2(FALSE);
 	}
 }
 
@@ -186,7 +186,7 @@ void MxStillPresenter::ParseExtra()
 	MxPresenter::ParseExtra();
 
 	if (m_action->GetFlags() & MxDSAction::c_bit5)
-		m_flags |= c_bit4;
+		SetBit3(TRUE);
 
 	MxU32 len = m_action->GetExtraLength();
 
@@ -207,15 +207,52 @@ void MxStillPresenter::ParseExtra()
 	}
 
 	if (KeyValueStringParse(output, g_strBmpIsmap, buf)) {
-		m_flags |= c_bit5;
-		m_flags &= ~c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit4(TRUE);
+		SetBit1(FALSE);
+		SetBit2(FALSE);
 	}
 }
 
-// STUB: LEGO1 0x100ba2c0
+// FUNCTION: LEGO1 0x100ba2c0
 MxStillPresenter* MxStillPresenter::Clone()
 {
-	// TODO
-	return NULL;
+	MxResult result = FAILURE;
+	MxStillPresenter* presenter = new MxStillPresenter;
+
+	if (presenter) {
+		if (presenter->AddToManager() == SUCCESS) {
+			MxDSAction* action = presenter->GetAction()->Clone();
+
+			if (action && presenter->StartAction(NULL, action) == SUCCESS) {
+				presenter->SetBit0(GetBit0());
+				presenter->SetBit1(GetBit1());
+				presenter->SetBit2(GetBit2());
+				presenter->SetBit3(GetBit3());
+				presenter->SetBit4(GetBit4());
+
+				if (m_bitmap) {
+					presenter->m_bitmap = new MxBitmap;
+
+					if (!presenter->m_bitmap || presenter->m_bitmap->ImportBitmap(m_bitmap) != SUCCESS)
+						goto done;
+				}
+
+				if (m_unk0x58)
+					presenter->m_unk0x58 = MxDisplaySurface::FUN_100bbfb0(m_unk0x58);
+
+				if (m_alpha)
+					presenter->m_alpha = new MxVideoPresenter::AlphaMask(*m_alpha);
+
+				result = SUCCESS;
+			}
+		}
+	}
+
+done:
+	if (result != SUCCESS) {
+		delete presenter;
+		presenter = NULL;
+	}
+
+	return presenter;
 }
diff --git a/LEGO1/omni/src/video/mxvideopresenter.cpp b/LEGO1/omni/src/video/mxvideopresenter.cpp
index ebc08487..546b7ea4 100644
--- a/LEGO1/omni/src/video/mxvideopresenter.cpp
+++ b/LEGO1/omni/src/video/mxvideopresenter.cpp
@@ -6,7 +6,7 @@
 #include "mxvideomanager.h"
 
 DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
-DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
+DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0x0c);
 
 // FUNCTION: LEGO1 0x100b24f0
 MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
@@ -117,16 +117,16 @@ void MxVideoPresenter::Init()
 	m_unk0x5c = 1;
 	m_unk0x58 = NULL;
 	m_unk0x60 = -1;
-	m_flags &= ~c_bit1;
+	SetBit0(FALSE);
 
 	if (MVideoManager() != NULL) {
 		MVideoManager();
-		m_flags |= c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit1(TRUE);
+		SetBit2(FALSE);
 	}
 
-	m_flags &= ~c_bit4;
-	m_flags &= ~c_bit5;
+	SetBit3(FALSE);
+	SetBit4(FALSE);
 }
 
 // FUNCTION: LEGO1 0x100b27b0
@@ -138,8 +138,8 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
 	if (m_unk0x58) {
 		m_unk0x58->Release();
 		m_unk0x58 = NULL;
-		m_flags &= ~c_bit2;
-		m_flags &= ~c_bit3;
+		SetBit1(FALSE);
+		SetBit2(FALSE);
 	}
 
 	if (MVideoManager() && (m_alpha || m_bitmap)) {
@@ -230,8 +230,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
 		pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
 	}
 
-	// DECOMP: m_flags is 1 byte, so no enum here
-	if (m_flags & 0x10)
+	if (GetBit4())
 		return (MxBool) *pixel;
 
 	if ((GetAction()->GetFlags() & MxDSAction::c_bit4) && *pixel == 0)
@@ -429,13 +428,13 @@ void MxVideoPresenter::StreamingTickle()
 			LoadFrame(m_currentChunk);
 			m_subscriber->DestroyChunk(m_currentChunk);
 			m_currentChunk = NULL;
-			m_flags |= c_bit1;
+			SetBit0(TRUE);
 
 			if (m_currentTickleState != e_streaming)
 				break;
 		}
 
-		if (m_flags & c_bit1)
+		if (GetBit0())
 			m_unk0x5c = 5;
 	}
 }
@@ -467,13 +466,13 @@ void MxVideoPresenter::RepeatingTickle()
 
 				LoadFrame(m_currentChunk);
 				m_currentChunk = NULL;
-				m_flags |= c_bit1;
+				SetBit0(TRUE);
 
 				if (m_currentTickleState != e_repeating)
 					break;
 			}
 
-			if (m_flags & c_bit1)
+			if (GetBit0())
 				m_unk0x5c = 5;
 		}
 	}
diff --git a/LEGO1/realtime/matrix.cpp b/LEGO1/realtime/matrix.cpp
index 806e6659..c1de1535 100644
--- a/LEGO1/realtime/matrix.cpp
+++ b/LEGO1/realtime/matrix.cpp
@@ -2,4 +2,4 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(Matrix4, 0x8);
+DECOMP_SIZE_ASSERT(Matrix4, 0x08);
diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h
index 9a301a01..edca5395 100644
--- a/LEGO1/realtime/matrix.h
+++ b/LEGO1/realtime/matrix.h
@@ -10,7 +10,7 @@ struct UnknownMatrixType {
 };
 
 // VTABLE: LEGO1 0x100d4350
-// SIZE 0x8
+// SIZE 0x08
 class Matrix4 {
 public:
 	inline Matrix4(float (*p_data)[4]) { SetData(p_data); }
@@ -25,28 +25,28 @@ class Matrix4 {
 	virtual void Equals(const Matrix4& p_matrix)
 	{
 		memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4);
-	}; // vtable+0x00
+	} // vtable+0x00
 
 	// FUNCTION: LEGO1 0x10002360
 	virtual void SetData(float (*p_data)[4]) { m_data = p_data; } // vtable+0x0c
 
 	// FUNCTION: LEGO1 0x10002370
-	virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; }; // vtable+0x08
+	virtual void SetData(UnknownMatrixType& p_matrix) { m_data = p_matrix.m_data; } // vtable+0x08
 
 	// FUNCTION: LEGO1 0x10002380
-	virtual float (*GetData())[4] { return m_data; }; // vtable+0x14
+	virtual float (*GetData())[4] { return m_data; } // vtable+0x14
 
 	// FUNCTION: LEGO1 0x10002390
-	virtual float (*GetData() const)[4] { return m_data; }; // vtable+0x10
+	virtual float (*GetData() const)[4] { return m_data; } // vtable+0x10
 
 	// FUNCTION: LEGO1 0x100023a0
 	virtual float* Element(int p_row, int p_col) { return &m_data[p_row][p_col]; } // vtable+0x1c
 
 	// FUNCTION: LEGO1 0x100023c0
-	virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; }; // vtable+0x18
+	virtual const float* Element(int p_row, int p_col) const { return &m_data[p_row][p_col]; } // vtable+0x18
 
 	// FUNCTION: LEGO1 0x100023e0
-	virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); }; // vtable+0x20
+	virtual void Clear() { memset(m_data, 0, 16 * sizeof(float)); } // vtable+0x20
 
 	// FUNCTION: LEGO1 0x100023f0
 	virtual void SetIdentity()
@@ -98,7 +98,7 @@ class Matrix4 {
 				cur++;
 			}
 		}
-	}; // vtable+0x3c
+	} // vtable+0x3c
 
 	// FUNCTION: LEGO1 0x10002530
 	virtual void Product(const Matrix4& p_a, const Matrix4& p_b) { Product(p_a.m_data, p_b.m_data); } // vtable+0x38
diff --git a/LEGO1/realtime/orientableroi.h b/LEGO1/realtime/orientableroi.h
index adbd493d..f218cdf4 100644
--- a/LEGO1/realtime/orientableroi.h
+++ b/LEGO1/realtime/orientableroi.h
@@ -16,8 +16,8 @@ class OrientableROI : public ROI {
 
 	OrientableROI();
 
-	virtual const float* GetWorldVelocity() const override;                // vtable+0x8
-	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0xc
+	virtual const float* GetWorldVelocity() const override;                // vtable+0x08
+	virtual const BoundingBox& GetWorldBoundingBox() const override;       // vtable+0x0c
 	virtual const BoundingSphere& GetWorldBoundingSphere() const override; // vtable+0x10
 	// FUNCTION: LEGO1 0x100a5db0
 	virtual void VTable0x14() { VTable0x1c(); }                 // vtable+0x14
diff --git a/LEGO1/realtime/roi.h b/LEGO1/realtime/roi.h
index b5cbefa5..6f367c48 100644
--- a/LEGO1/realtime/roi.h
+++ b/LEGO1/realtime/roi.h
@@ -49,9 +49,9 @@ class LODObject {
 public:
 	// LODObject();
 	virtual ~LODObject() {}
-	virtual float Cost(float pixels_covered) const = 0; // vtable+0x4
-	virtual float AveragePolyArea() const = 0;          // vtable+0x8
-	virtual int NVerts() const = 0;                     // vtable+0xc
+	virtual float Cost(float pixels_covered) const = 0; // vtable+0x04
+	virtual float AveragePolyArea() const = 0;          // vtable+0x08
+	virtual int NVerts() const = 0;                     // vtable+0x0c
 };
 
 /*
@@ -81,7 +81,7 @@ class ROI {
 	{
 		m_comp = 0;
 		m_lods = 0;
-		m_unk0xc = 1;
+		m_unk0x0c = 1;
 	}
 	virtual ~ROI()
 	{
@@ -89,9 +89,9 @@ class ROI {
 		assert(!m_comp);
 		assert(!m_lods);
 	}
-	virtual float IntrinsicImportance() const = 0;                    // vtable+0x4
-	virtual const float* GetWorldVelocity() const = 0;                // vtable+0x8
-	virtual const BoundingBox& GetWorldBoundingBox() const = 0;       // vtable+0xc
+	virtual float IntrinsicImportance() const = 0;                    // vtable+0x04
+	virtual const float* GetWorldVelocity() const = 0;                // vtable+0x08
+	virtual const BoundingBox& GetWorldBoundingBox() const = 0;       // vtable+0x0c
 	virtual const BoundingSphere& GetWorldBoundingSphere() const = 0; // vtable+0x10
 
 	const LODListBase* GetLODs() const { return m_lods; }
@@ -103,15 +103,15 @@ class ROI {
 	int GetLODCount() const { return m_lods ? m_lods->Size() : 0; }
 	const CompoundObject* GetComp() const { return m_comp; }
 
-	inline undefined GetUnk0x0c() { return m_unk0xc; }
+	inline undefined GetUnk0x0c() { return m_unk0x0c; }
 
 	// SYNTHETIC: LEGO1 0x100a5d60
 	// ROI::`scalar deleting destructor'
 
 protected:
-	CompoundObject* m_comp; // 0x4
-	LODListBase* m_lods;    // 0x8
-	undefined m_unk0xc;     // 0xc
+	CompoundObject* m_comp; // 0x04
+	LODListBase* m_lods;    // 0x08
+	undefined m_unk0x0c;    // 0x0c
 };
 
 // SYNTHETIC: LEGO1 0x100a5d50
diff --git a/LEGO1/realtime/vector.cpp b/LEGO1/realtime/vector.cpp
index 57c93e66..ad09b0b0 100644
--- a/LEGO1/realtime/vector.cpp
+++ b/LEGO1/realtime/vector.cpp
@@ -2,6 +2,6 @@
 
 #include "decomp.h"
 
-DECOMP_SIZE_ASSERT(Vector2, 0x8);
-DECOMP_SIZE_ASSERT(Vector3, 0x8);
-DECOMP_SIZE_ASSERT(Vector4, 0x8);
+DECOMP_SIZE_ASSERT(Vector2, 0x08);
+DECOMP_SIZE_ASSERT(Vector3, 0x08);
+DECOMP_SIZE_ASSERT(Vector4, 0x08);
diff --git a/LEGO1/realtime/vector.h b/LEGO1/realtime/vector.h
index eb03d29d..91403ee8 100644
--- a/LEGO1/realtime/vector.h
+++ b/LEGO1/realtime/vector.h
@@ -263,7 +263,7 @@ class Vector3 : public Vector2 {
 };
 
 // VTABLE: LEGO1 0x100d45a0
-// SIZE 0x8
+// SIZE 0x08
 class Vector4 : public Vector3 {
 public:
 	inline Vector4(float* p_data) : Vector3(p_data) {}
diff --git a/LEGO1/tgl/d3drm/camera.cpp b/LEGO1/tgl/d3drm/camera.cpp
index 9e000ba8..c7bc06f9 100644
--- a/LEGO1/tgl/d3drm/camera.cpp
+++ b/LEGO1/tgl/d3drm/camera.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Camera, 0x4);
-DECOMP_SIZE_ASSERT(CameraImpl, 0x8);
+DECOMP_SIZE_ASSERT(Camera, 0x04);
+DECOMP_SIZE_ASSERT(CameraImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a36f0
 void* CameraImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/impl.h b/LEGO1/tgl/d3drm/impl.h
index 614b5f60..002ee7e9 100644
--- a/LEGO1/tgl/d3drm/impl.h
+++ b/LEGO1/tgl/d3drm/impl.h
@@ -40,7 +40,7 @@ class UnkImpl;
 class RendererImpl : public Renderer {
 public:
 	RendererImpl() : m_data(0) {}
-	~RendererImpl() { Destroy(); };
+	~RendererImpl() { Destroy(); }
 
 	virtual void* ImplementationDataPtr() override;
 
diff --git a/LEGO1/tgl/d3drm/light.cpp b/LEGO1/tgl/d3drm/light.cpp
index dfc23b44..0fe66bfb 100644
--- a/LEGO1/tgl/d3drm/light.cpp
+++ b/LEGO1/tgl/d3drm/light.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Light, 0x4);
-DECOMP_SIZE_ASSERT(LightImpl, 0x8);
+DECOMP_SIZE_ASSERT(Light, 0x04);
+DECOMP_SIZE_ASSERT(LightImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3770
 void* LightImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/mesh.cpp b/LEGO1/tgl/d3drm/mesh.cpp
index f044d512..ceaf7079 100644
--- a/LEGO1/tgl/d3drm/mesh.cpp
+++ b/LEGO1/tgl/d3drm/mesh.cpp
@@ -4,8 +4,8 @@ using namespace TglImpl;
 
 DECOMP_SIZE_ASSERT(D3DRMVERTEX, 0x24);
 
-DECOMP_SIZE_ASSERT(Mesh, 0x4);
-DECOMP_SIZE_ASSERT(MeshImpl, 0x8);
+DECOMP_SIZE_ASSERT(Mesh, 0x04);
+DECOMP_SIZE_ASSERT(MeshImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3ed0
 void* MeshImpl::ImplementationDataPtr()
diff --git a/LEGO1/tgl/d3drm/unk.cpp b/LEGO1/tgl/d3drm/unk.cpp
index debc1484..038b0e9d 100644
--- a/LEGO1/tgl/d3drm/unk.cpp
+++ b/LEGO1/tgl/d3drm/unk.cpp
@@ -2,8 +2,8 @@
 
 using namespace TglImpl;
 
-DECOMP_SIZE_ASSERT(Unk, 0x4);
-DECOMP_SIZE_ASSERT(UnkImpl, 0x8);
+DECOMP_SIZE_ASSERT(Unk, 0x04);
+DECOMP_SIZE_ASSERT(UnkImpl, 0x08);
 
 // FUNCTION: LEGO1 0x100a3830
 void* UnkImpl::ImplementationDataPtr()