diff --git a/BeefSpace.toml b/BeefSpace.toml
index 456d100..27306f0 100644
--- a/BeefSpace.toml
+++ b/BeefSpace.toml
@@ -1,10 +1,36 @@
 FileVersion = 1
-Projects = {GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}, ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}, ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}, GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}, bon = {Path = "GlitchyEngine/vendor/bon"}, box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}, "Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}, ScriptCore = {Path = "ScriptCore"}, NetHostBeef = {Path = "GlitchyEngine/vendor/NetHostBeef/NetHostBeef"}, "GlitchyEngine.Test" = {Path = "GlitchyEngine.Test"}, Xml-Beef = {Path = "GlitchyEngine/vendor/Xml-Beef"}, "GlitchyEngine.Benchmark" = {Path = "GlitchyEngine.Benchmark"}}
 Locked = ["ImGui"]
-WorkspaceFolders = {GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore", "GlitchyEngine.Test", "GlitchyEngine.Benchmark"], "GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq", "NetHostBeef", "Xml-Beef"], Beef = ["Beefy2D", "corlib"]}
 
 [Workspace]
 StartupProject = "GlitchyEditor"
 
+[Projects]
+GlitchyEngine = {Path = "GlitchyEngine"}
+GlitchLog = {Path = "GlitchLog"}
+DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}
+LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}
+FreeType = {Path = "GlitchyEngine/vendor/freetype"}
+cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}
+GlitchyEditor = {Path = "GlitchyEditor"}
+msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}
+ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}
+ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}
+ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}
+ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}
+GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}
+bon = {Path = "GlitchyEngine/vendor/bon"}
+box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}
+"Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}
+ScriptCore = {Path = "ScriptCore"}
+NetHostBeef = {Path = "GlitchyEngine/vendor/NetHostBeef/NetHostBeef"}
+"GlitchyEngine.Test" = {Path = "GlitchyEngine.Test"}
+Xml-Beef = {Path = "GlitchyEngine/vendor/Xml-Beef"}
+"GlitchyEngine.Benchmark" = {Path = "GlitchyEngine.Benchmark"}
+
+[WorkspaceFolders]
+GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore", "GlitchyEngine.Test", "GlitchyEngine.Benchmark"]
+"GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq", "NetHostBeef", "Xml-Beef"]
+Beef = ["Beefy2D", "corlib"]
+
 [Configs.Debug.Win64]
 AllocStackTraceDepth = 12
diff --git a/GlitchyEditor/BeefProj.toml b/GlitchyEditor/BeefProj.toml
index 1dc824a..e400c7b 100644
--- a/GlitchyEditor/BeefProj.toml
+++ b/GlitchyEditor/BeefProj.toml
@@ -1,5 +1,4 @@
 FileVersion = 1
-Dependencies = {corlib = "*", GlitchLog = "*", GlitchyEngine = "*", Xml-Beef = "*"}
 
 [Project]
 Name = "GlitchyEditor"
@@ -7,6 +6,12 @@ TargetType = "BeefGUIApplication"
 StartupObject = "GlitchyEngine.Program"
 ProcessorMacros = ["GE_EDITOR_IMGUI_DEMO"]
 
+[Dependencies]
+corlib = "*"
+GlitchLog = "*"
+GlitchyEngine = "*"
+Xml-Beef = "*"
+
 [Platform.Windows]
 IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
 
@@ -14,6 +19,10 @@ IconFile = "$(ProjectDir)/Resources/Textures/GlitchyEngineIcon.ico"
 PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
 DebugCommandArguments = "\"D:\\Development\\Git\\SingleStateToOrbit\""
 
+[[Configs.Debug.Win64.DistinctOptions]]
+Filter = "System.Collections.List<>"
+ReflectAlwaysInclude = "IncludeAll"
+
 [Configs.Release.Win64]
 PostBuildCmds = ["CopyFilesIfNewer(\"$(WorkspaceDir)/bin/vswhere.exe\", \"$(TargetDir)\")"]
 
diff --git a/GlitchyEngine/src/Content/Asset.bf b/GlitchyEngine/src/Content/Asset.bf
index 8ac6bf2..7d7679e 100644
--- a/GlitchyEngine/src/Content/Asset.bf
+++ b/GlitchyEngine/src/Content/Asset.bf
@@ -45,12 +45,12 @@ abstract class Asset : RefCounter
 		Content.ManageAsset(this);
 	}
 
-	protected ~this()
-	{
+	//protected ~this()
+	//{
 		// TODO: crash when _contentManager is deleted first...
 		// TODO: unregister from content manager
 		//_contentManager?.UnmanageAsset(this);
-	}
+	//}
 
 	static void AssetSerialize(BonWriter writer, ValueView value, BonEnvironment environment, SerializeValueState state)
 	{
diff --git a/GlitchyEngine/src/Core/RefCounter.bf b/GlitchyEngine/src/Core/RefCounter.bf
index 6361fd4..3e1d244 100644
--- a/GlitchyEngine/src/Core/RefCounter.bf
+++ b/GlitchyEngine/src/Core/RefCounter.bf
@@ -9,10 +9,6 @@ namespace GlitchyEngine.Core
 	 */
 	public class RefCounter : RefCounted, IDisposable
 	{
-		protected ~this()
-		{
-		}
-
 		public void Dispose()
 		{
 			ReleaseRef();
diff --git a/GlitchyEngine/src/World/Scene.bf b/GlitchyEngine/src/World/Scene.bf
index 51e0e28..3f805a2 100644
--- a/GlitchyEngine/src/World/Scene.bf
+++ b/GlitchyEngine/src/World/Scene.bf
@@ -122,10 +122,10 @@ namespace GlitchyEngine.World
 				}
 			});
 
-			/*if (_font == null)
+			if (_font == null)
 				_font = new Font(@"C:\Windows\Fonts\arial.ttf", 24);
 			else
-				_font..AddRef();*/
+				_font..AddRef();
 
 			//_font = new Font(@"C:\Windows\Fonts\Cascadia Code.ttf", 24);
 		}
diff --git a/GlitchyEngine/vendor/bon b/GlitchyEngine/vendor/bon
index 0c80e36..22337c6 160000
--- a/GlitchyEngine/vendor/bon
+++ b/GlitchyEngine/vendor/bon
@@ -1 +1 @@
-Subproject commit 0c80e365cd20d8d56649e01632a317bcbad6f61c
+Subproject commit 22337c602f4d53d66d9f31d6e6e3308a3b887c11