diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp
index e6cf53a89..d50b56b67 100644
--- a/src/menu/menu.cpp
+++ b/src/menu/menu.cpp
@@ -866,12 +866,6 @@ static void M_Dim()
 		amount = gameinfo.dimamount;
 	}
 
-	if (gameinfo.gametype == GAME_Hexen && gamestate == GS_DEMOSCREEN)
-	{ // On the Hexen title screen, the default dimming is not
-	  // enough to make the menus readable.
-		amount = MIN<float>(1.f, amount*2.f);
-	}
-
 	screen->Dim(dimmer, amount, 0, 0, screen->GetWidth(), screen->GetHeight());
 }
 
diff --git a/src/menu/playermenu.cpp b/src/menu/playermenu.cpp
index 973a49fdf..add7ed363 100644
--- a/src/menu/playermenu.cpp
+++ b/src/menu/playermenu.cpp
@@ -53,12 +53,12 @@ EXTERN_CVAR(Bool, cl_run)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(r);
 	PARAM_INT(g);
 	PARAM_INT(b);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		char command[24];
 		players[consoleplayer].userinfo.ColorChanged(MAKERGB(r, g, b));
@@ -78,12 +78,12 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, PlayerNameChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_STRING(s);
 	const char *pp = s;
 	FString command("name \"");
 
-	if (self == CurrentMenu || self == CurrentMenu->mParentMenu)
+	if (DMenu::InMenu)
 	{
 		// Escape any backslashes or quotation marks before sending the name to the console.
 		for (auto p = pp; *p != '\0'; ++p)
@@ -108,9 +108,9 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, PlayerNameChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorSetChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.ColorSetChanged(sel);
 		char command[24];
@@ -128,10 +128,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ColorSetChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, ClassChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
 	PARAM_POINTER(cls, FPlayerClass);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.PlayerClassNumChanged(gameinfo.norandomplayerclass ? sel : sel - 1);
 		cvar_set("playerclass", sel == 0 && !gameinfo.norandomplayerclass ? "Random" : GetPrintableDisplayName(cls->Type).GetChars());
@@ -148,9 +148,9 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, ClassChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, SkinChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(sel);
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		players[consoleplayer].userinfo.SkinNumChanged(sel);
 		cvar_set("skin", Skins[sel].Name);
@@ -166,10 +166,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, SkinChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, AutoaimChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_FLOAT(val);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		autoaim = float(val);
 	}
@@ -184,10 +184,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, AutoaimChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, TeamChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(val);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		team = val == 0 ? TEAM_NONE : val - 1;
 	}
@@ -202,10 +202,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, TeamChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, GenderChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		switch(v)
 		{
@@ -226,10 +226,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, GenderChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, SwitchOnPickupChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		neverswitchonpickup = !!v;
 	}
@@ -244,10 +244,10 @@ DEFINE_ACTION_FUNCTION(DPlayerMenu, SwitchOnPickupChanged)
 
 DEFINE_ACTION_FUNCTION(DPlayerMenu, AlwaysRunChanged)
 {
-	PARAM_SELF_PROLOGUE(DMenu);
+	PARAM_PROLOGUE;
 	PARAM_INT(v);
 	// only allow if the menu is active to prevent abuse.
-	if (self == CurrentMenu)
+	if (DMenu::InMenu)
 	{
 		cl_run = !!v;
 	}
diff --git a/src/scripting/backend/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp
index b95e02f4d..d01a4557b 100644
--- a/src/scripting/backend/dynarrays.cpp
+++ b/src/scripting/backend/dynarrays.cpp
@@ -783,6 +783,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Find, ArrayFind<FDynArray_Obj COMMA
 
 int ObjArrayPush(FDynArray_Obj *self, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	return self->Push(obj);
 }
@@ -811,6 +812,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FDynArray_Obj, Delete, ArrayDelete<FDynArray_Obj>)
 
 void ObjArrayInsert(FDynArray_Obj *self,int index, DObject *obj)
 {
+    if (self == nullptr) NullParam("\"self\"");
 	GC::WriteBarrier(obj);
 	self->Insert(index, obj);
 }
diff --git a/src/utility/m_swap.h b/src/utility/m_swap.h
index a3e03bea2..de9b7780a 100644
--- a/src/utility/m_swap.h
+++ b/src/utility/m_swap.h
@@ -119,12 +119,12 @@ inline unsigned short BigShort(unsigned short x)
 	return x;
 }
 
-inline unsigned int BigLong(unsigned int &x)
+inline unsigned int BigLong(unsigned int x)
 {
 	return x;
 }
 
-inline int BigLong(int &x)
+inline int BigLong(int x)
 {
 	return x;
 }
diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp
index ee43eab0c..9af8bc4cf 100644
--- a/src/win32/i_main.cpp
+++ b/src/win32/i_main.cpp
@@ -1111,7 +1111,7 @@ void DoomSpecificInfo (char *buffer, size_t bufflen)
 	int i;
 
 	buffer += mysnprintf (buffer, buffend - buffer, GAMENAME " version %s (%s)", GetVersionString(), GetGitHash());
-	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLine());
+	buffer += mysnprintf (buffer, buffend - buffer, "\r\nCommand line: %s\r\n", GetCommandLineA());
 
 	for (i = 0; (arg = Wads.GetWadName (i)) != NULL; ++i)
 	{
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 61e2f0465..40c3b130c 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -2694,12 +2694,14 @@ OptionMenu "ReverbSave" protected
 OptionString "LanguageOptions"
 {
 	"auto", "Auto"
+	"default", "English (US)"
 	"eng", "English (UK)"
-	"enu", "English (US)"
-	"fr", "Français (FR)"
-	"ita", "Italiano (ITA)"
-	"ptb", "Português do Brasil (PTB)"
-	"rus", "Русский (RU)"
+	"de", "Deutsch"
+	"es", "Español (España)"
+	"esm", "Español (Latino)"
+	"fr", "Français"
+	"it", "Italiano"
+	"ru", "Русский"
 }
 
 /*=======================================
diff --git a/wadsrc/static/zscript/ui/menu/playermenu.zs b/wadsrc/static/zscript/ui/menu/playermenu.zs
index b08019a3b..68d287c33 100644
--- a/wadsrc/static/zscript/ui/menu/playermenu.zs
+++ b/wadsrc/static/zscript/ui/menu/playermenu.zs
@@ -42,16 +42,16 @@ class PlayerMenu : ListMenu
 	Array<int> mPlayerSkins;
 	
 	// All write function for the player config are native to prevent abuse.
-	protected native void AutoaimChanged(float val);
-	protected native void TeamChanged(int val);
-	protected native void AlwaysRunChanged(int val);
-	protected native void GenderChanged(int val);
-	protected native void SwitchOnPickupChanged(int val);
-	protected native void ColorChanged(int red, int green, int blue);
-	protected native void ColorSetChanged(int red);
-	protected native void PlayerNameChanged(String name);
-	protected native void SkinChanged (int val);
-	protected native void ClassChanged(int sel, PlayerClass cls);
+	protected static native void AutoaimChanged(float val);
+	protected static native void TeamChanged(int val);
+	protected static native void AlwaysRunChanged(int val);
+	protected static native void GenderChanged(int val);
+	protected static native void SwitchOnPickupChanged(int val);
+	protected static native void ColorChanged(int red, int green, int blue);
+	protected static native void ColorSetChanged(int red);
+	protected static native void PlayerNameChanged(String name);
+	protected static native void SkinChanged (int val);
+	protected static native void ClassChanged(int sel, PlayerClass cls);
 	
 	//=============================================================================
 	//
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp
index f6a85de06..99b151f12 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C0.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp
index 4f9cee771..c7dc0efa6 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C1.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp
index 0e1ca2431..7f5ccd717 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C2.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp
index fc935dac9..e3a5aa1cd 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C4.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp
index 27eab31ac..b4f896f4d 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C8.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp
index 5b484d579..ba4cbb93a 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00C9.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp
index ee4f669e9..c24063ee3 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CA.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp
index 98f428501..624aa66b7 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CB.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp
index 6560c2ba7..f7dd1ee49 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CC.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp
index 4bafd8b2e..87403a4f6 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CD.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp
index ff19a7c40..2dcedf4fd 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CE.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp
index e2534ddfa..99264f429 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00CF.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp
index 38784b44d..618200805 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D1.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp
index 80788d6f9..ce2887a7b 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D2.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp
index 9aebc7b42..306720842 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D3.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp
index ef2dacfc5..6b9794005 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D4.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp
index 8af056f02..a339479da 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D6.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp
index 0c6ad26e9..646c9c1ea 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00D9.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp
index c24bc273c..b3290b18f 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DA.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp
index b69367766..43156b207 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DB.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp
index da7971a2f..78e2ad274 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DC.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp
index 0b9179a65..9999087d4 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/00DD.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp
index 24e905559..d60a1ab34 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0150.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp
index 9fad34405..59b3a145d 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0170.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp
index 99a9692b8..1dcf6883c 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0178.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp
index 98f428501..624aa66b7 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0401.lmp differ
diff --git a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp
index 5ddbda41d..3c5bf84fe 100644
Binary files a/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp and b/wadsrc_extra/static/filter/game-strife/fonts/defsmallfont/0419.lmp differ