diff --git a/modules/tmx.network.debug.vi b/modules/tmx.network.debug.vi
index 30856466f3695aa2e1bacad0cc4b2db9fe28a499..5faa45419823affac338204da2370e5eeb063855 100644
Binary files a/modules/tmx.network.debug.vi and b/modules/tmx.network.debug.vi differ
diff --git a/modules/tmx.sysinfo.JSONPrettyPrint.vi b/modules/tmx.sysinfo.JSONPrettyPrint.vi
new file mode 100644
index 0000000000000000000000000000000000000000..6b634b93d6b95ebe8c1f6e4f1481c09e189e050d
Binary files /dev/null and b/modules/tmx.sysinfo.JSONPrettyPrint.vi differ
diff --git a/modules/tmx.sysinfo.collect.vi b/modules/tmx.sysinfo.collect.vi
index 7100be5d087ac41aa78d3323469a965f4a03dd53..5685f702c430dd6cc7bd3a92f9f11e0a285424e1 100644
Binary files a/modules/tmx.sysinfo.collect.vi and b/modules/tmx.sysinfo.collect.vi differ
diff --git a/test/debug query - stress test.vi b/test/debug query - stress test.vi
new file mode 100644
index 0000000000000000000000000000000000000000..5ce75aeb7d57444422d2c09f6c0f51947fd8a019
Binary files /dev/null and b/test/debug query - stress test.vi differ
diff --git a/test/debug query.vi b/test/debug query.vi
deleted file mode 100644
index 1d48b92b38a18d620e928b2f9d867dd07238802a..0000000000000000000000000000000000000000
Binary files a/test/debug query.vi and /dev/null differ
diff --git a/test/tmx.debug-tool.vi b/test/tmx.debug-tool.vi
new file mode 100644
index 0000000000000000000000000000000000000000..bf235b4ea1d84f3863a78411bd4c632a06626f49
Binary files /dev/null and b/test/tmx.debug-tool.vi differ
diff --git a/tumux.iak b/tumux.iak
index c6051610ac2d665601916de0ee2c91e91d13e0a7..f56427b108d1a06b47680db7da3e704eec09217c 100644
Binary files a/tumux.iak and b/tumux.iak differ
diff --git a/tumux.lvlps b/tumux.lvlps
index 751b6011a901a2a65f47e2f7b36f9e57877f591d..10742101229d62ee29558955e723d150b0e690b2 100644
--- a/tumux.lvlps
+++ b/tumux.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "181,1942,1084,2369"
+ProjectExplorer.ClassicPosition[String] = "147,2033,1050,2460"
 
 [AB_Cache_{0756750E-B4E8-4BF3-82A3-64077D79CBC8}]
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{0756"
@@ -65,14 +65,6 @@ Cache_Path[Path] Line0002 = "EFBD-E0A6-49D5-A022-49D24CDC5963}.txt"
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{BC9A"
 Cache_Path[Path] Line0002 = "7945-DC7A-4D6B-8655-F354D97C98E4}.txt"
 
-[AB_Cache_{63F9FFCD-74A3-47B5-B484-606B8C1D1F1C}]
-Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{63F9"
-Cache_Path[Path] Line0002 = "FFCD-74A3-47B5-B484-606B8C1D1F1C}.txt"
-
-[AB_Cache_{DB425AA6-305F-4816-BF69-93795C010C7D}]
-Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{DB42"
-Cache_Path[Path] Line0002 = "5AA6-305F-4816-BF69-93795C010C7D}.txt"
-
 [AB_Cache_{86B3B92D-CED4-404C-B6DE-D76A94737DEE}]
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{86B3"
 Cache_Path[Path] Line0002 = "B92D-CED4-404C-B6DE-D76A94737DEE}.txt"
@@ -97,3 +89,11 @@ Cache_Path[Path] Line0002 = "94C9-1148-4A78-BDFD-5A18658B721E}.txt"
 Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{893C"
 Cache_Path[Path] Line0002 = "FFD2-5075-4F94-8896-79733B4D1CD5}.txt"
 
+[AB_Cache_{63F9FFCD-74A3-47B5-B484-606B8C1D1F1C}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{63F9"
+Cache_Path[Path] Line0002 = "FFCD-74A3-47B5-B484-606B8C1D1F1C}.txt"
+
+[AB_Cache_{DB425AA6-305F-4816-BF69-93795C010C7D}]
+Cache_Path[Path] Line0001 = "/C/Users/dgeerts/AppData/Local/Temp/AB_Cache_{DB42"
+Cache_Path[Path] Line0002 = "5AA6-305F-4816-BF69-93795C010C7D}.txt"
+
diff --git a/tumux.lvproj b/tumux.lvproj
index b19f37266d629f36f12d08c4375817285b0c530e..07c7970971d6a7d6138142fd27deb306fa8c0d8c 100644
Binary files a/tumux.lvproj and b/tumux.lvproj differ
diff --git a/tumux.vi b/tumux.vi
index 17866c2e592a5c46e23f7676e46770fff2201761..9038d03e5089cbd1735d223c84da43aefa6f3ac3 100644
Binary files a/tumux.vi and b/tumux.vi differ