diff --git a/cvarinfo.txt b/cvarinfo.txt
index 8bee4deb..5b60c81a 100644
--- a/cvarinfo.txt
+++ b/cvarinfo.txt
@@ -10,6 +10,8 @@ server noarchive bool UaS_AI_Stealth = false;
 user bool UaS_AimSwayEnabled = false;
 server int UaS_AllyPreferred = 0;
 server int UaS_AllySpawnRate = 0;
+nosave bool UaS_Bandage_WoundShake = true;
+nosave float UaS_Bandage_HUDScale = 1.00;
 user bool UaS_DeathFade = true;
 server int UaS_Debug = 0;
 user bool UaS_FlashlightParticles = true;
@@ -29,6 +31,11 @@ user color UaS_LLM_LaserColor = "12 FF 00";
 user int UaS_LLM_LaserMode = 2;
 user int UaS_LLM_LightMode = 1;
 server float UaS_LootingFactor = 0.25;
+nosave bool UaS_Medical_Debug = false;
+nosave bool UaS_Medical_VisualWounds = true;
+user bool UaS_Medical_InvertCycle = false;
+user bool UaS_Medical_SwitchFiremode = false;
+user bool UaS_Medical_SwitchZoom = false;
 server bool UaS_OldSling = false;
 server bool UaS_ScarcityDisableDrops = false;
 server bool UaS_ScarcityEnabled = false;
@@ -39,15 +46,7 @@ server float UaS_ScarcityOverspawn = 0.5;
 server int UaS_ScarcityRate = 50;
 user int UaS_SlingDelay = 35;
 server bool UaS_StabilizerSpawns = true;
-nosave float UaS_TraumaKit_HUDScale = 1.00;
-nosave bool UaS_Medical_Debug = false;
-nosave bool UaS_Bandage_WoundShake = true;
-user bool UaS_Medical_SwitchZoom = false;
-user bool UaS_Medical_InvertCycle = false;
-user bool UaS_Medical_SwitchFiremode = false;
+server bool UaS_VisWepsEnabled = false;
 nosave float UaS_Wheel_Alpha = 0.75;
 nosave float UaS_Wheel_Scale = 1.00;
-nosave float UaS_Bandage_HUDScale = 1.00;
-nosave bool UaS_Medical_VisualWounds = true;
-server bool UaS_VisWepsEnabled = false;
 server noarchive bool UaS_YOLO = false;
diff --git a/manual/contents.md b/manual/contents.md
index 77bbd364..4281a2de 100644
--- a/manual/contents.md
+++ b/manual/contents.md
@@ -10,6 +10,7 @@
 * [Weapon Jamming](../jamming/readme.md)
 * [Laser / Flashlight](../laserlight/readme.md)
 * [Markers](../markers/readme.md)
+* [Medical](../medical/readme.md)
 * [Scarcity](../scarcity/readme.md)
 * [Stabilizer](../stabilizer/readme.md)
 * [YOLO](../yolo/readme.md)
diff --git a/menudef.txt b/menudef.txt
index 2ba4089b..72185bea 100644
--- a/menudef.txt
+++ b/menudef.txt
@@ -290,7 +290,7 @@ AddOptionMenu "UaS_ConfigureModules" {
 }
 
 AddOptionMenu "UaS_Controls" {
-	Control "Use Bandage", "hd_band"
+	Control "Use Bandage", "use hd_band"
 	Control "Use Trauma Kit", "use UaS_TraumaKit"
 	Control "Trauma Kit: Switch to Anesthetic", "netevent UaS_TraumaKit_SwitchTo 0"
 	Control "Trauma Kit: Switch to Saline", "netevent UaS_TraumaKit_SwitchTo 1"
diff --git a/zscript.zsc b/zscript.zsc
index 6c4b6ae7..4e86ec41 100644
--- a/zscript.zsc
+++ b/zscript.zsc
@@ -39,9 +39,9 @@ version "4.10"
 #include "food/module/food_drinks.zsc"
 #include "food/module/food_basics.zsc"
 #include "fragfactor/module/fragfactor.zsc"
-#include "hunger/module/hunger_service.zsc"
 #include "hunger/module/hunger_tracker.zsc"
 #include "hunger/module/hunger_spawner.zsc"
+#include "hunger/module/hunger_service.zsc"
 #include "hunger/module/hunger_bootstrap.zsc"
 #include "hunger/module/consumable/consumable.zsc"
 #include "hunger/module/consumable/consumable_package.zsc"
@@ -66,29 +66,29 @@ version "4.10"
 #include "markers/module/markers_glowstick.zsc"
 #include "markers/module/markers_generic.zsc"
 #include "markers/module/markers_flare.zsc"
-#include "medical/module/medical_handler.zsc"
-#include "medical/module/medical_spawner.zsc"
-#include "medical/module/medical_wound.zsc"
-#include "medical/module/medical_debug.zsc"
-#include "medical/module/medical_wheel.zsc"
-#include "medical/module/medical_tool.zsc"
-#include "medical/module/selfbandage/selfbandage.zsc"
-#include "medical/module/selfbandage/selfbandage_hud.zsc"
-#include "medical/module/selfbandage/selfbandage_bandage.zsc"
 #include "medical/module/traumakit/traumakit.zsc"
-#include "medical/module/traumakit/traumakit_handler.zsc"
-#include "medical/module/traumakit/traumakit_2f.zsc"
-#include "medical/module/traumakit/traumakit_biofoam.zsc"
-#include "medical/module/traumakit/traumakit_forceps.zsc"
-#include "medical/module/traumakit/traumakit_helptext.zsc"
-#include "medical/module/traumakit/traumakit_hud.zsc"
+#include "medical/module/traumakit/traumakit_sutures.zsc"
+#include "medical/module/traumakit/traumakit_supplies.zsc"
+#include "medical/module/traumakit/traumakit_stapler.zsc"
+#include "medical/module/traumakit/traumakit_scalpel.zsc"
+#include "medical/module/traumakit/traumakit_saline.zsc"
 #include "medical/module/traumakit/traumakit_pain.zsc"
 #include "medical/module/traumakit/traumakit_painkiller.zsc"
-#include "medical/module/traumakit/traumakit_saline.zsc"
-#include "medical/module/traumakit/traumakit_scalpel.zsc"
-#include "medical/module/traumakit/traumakit_stapler.zsc"
-#include "medical/module/traumakit/traumakit_supplies.zsc"
-#include "medical/module/traumakit/traumakit_sutures.zsc"
+#include "medical/module/traumakit/traumakit_hud.zsc"
+#include "medical/module/traumakit/traumakit_helptext.zsc"
+#include "medical/module/traumakit/traumakit_handler.zsc"
+#include "medical/module/traumakit/traumakit_forceps.zsc"
+#include "medical/module/traumakit/traumakit_biofoam.zsc"
+#include "medical/module/traumakit/traumakit_2f.zsc"
+#include "medical/module/selfbandage/selfbandage.zsc"
+#include "medical/module/selfbandage/selfbandage_hud.zsc"
+#include "medical/module/selfbandage/selfbandage_bandage.zsc"
+#include "medical/module/medical_wound.zsc"
+#include "medical/module/medical_wheel.zsc"
+#include "medical/module/medical_tool.zsc"
+#include "medical/module/medical_spawner.zsc"
+#include "medical/module/medical_handler.zsc"
+#include "medical/module/medical_debug.zsc"
 #include "respirator/module/resp.zsc"
 #include "respirator/module/resp_service.zsc"
 #include "respirator/module/resp_functions.zsc"