diff --git a/source/rr/src/gamedef.cpp b/source/rr/src/gamedef.cpp
index a05ba4fae..15352437a 100644
--- a/source/rr/src/gamedef.cpp
+++ b/source/rr/src/gamedef.cpp
@@ -907,6 +907,7 @@ int32_t C_AllocQuote(int32_t qnum)
 
 void C_InitQuotes(void)
 {
+#if 0	// if we want to keep this it must be done differently. This does not play nice with text substitution.
 	auto openkeys = Bindings.GetKeysForCommand("+open");
 	if (openkeys.Size())
 	{
@@ -915,6 +916,7 @@ void C_InitQuotes(void)
 		quoteMgr.Substitute(QUOTE_DEAD, "OPEN", OpenGameFunc);
 		quoteMgr.Substitute(QUOTE_DEAD, "USE", OpenGameFunc);
 	}
+#endif
 
     g_numObituaries = 48;
     for (bssize_t i = g_numObituaries - 1; i >= 0; i--)
diff --git a/wadsrc/static/demolition/language.csv b/wadsrc/static/demolition/language.csv
index 44564d3bc..e6fd7bc96 100644
--- a/wadsrc/static/demolition/language.csv
+++ b/wadsrc/static/demolition/language.csv
@@ -417,6 +417,7 @@ Name,PLYRMNU_NAME,,,,Jméno,,,Nomo,Nombre,,Nimi,Nom,Név,Nome,名前,이름,Naam
 Team,PLYRMNU_TEAM,,,,Tým,,,Teamo,Equipo,,Joukkue,Equipe,Csapat,Squadra,チーム,팀,Team,Drużyna,Equipe,Equipa,,Команда,Тим
 Color,PLYRMNU_PLAYERCOLOR,,,Colour,Barva,Farbe,,Koloro,,,Väri,Couleur,Szín,Colore,色,색상,Kleur,Kolor,Cor,,,Цвет,Боја
 Multiplayer taunts,PLRMNU_TAUNTS,,,,,Mehrspieler-Spott,,,,,,,,,,,,,,,,,
+Gender,PLYRMNU_PLAYERGENDER,,,,Pohlaví,Geschlecht,,Genro,Género,,Sukupuoli,Genre,Nem,Sesso,性別,성별,Geslacht,Płeć,Gênero,,,Пол,Пол
 Male,OPTVAL_MALE,,,,Muž,Männlich,,Vira (Li),Masculino,,Miespuolinen,Masculin,,Maschio,男,남성,Man,Mężczyzna,Masculino,,,Мужской,Мушко
 Female,OPTVAL_FEMALE,,,,Žena,Weiblich,,Ina (Ŝi),Femenino,,Naispuolinen,Féminin,,Femmina,女,여성,Vrouw,Kobieta,Feminino,,,Женский,Женско
 Neutral,OPTVAL_NEUTRAL,,,,Neutrální,Neutral,,Neŭtrala (Ri),Neutro,,Sukupuoleton,Neutre,,Neutrale,中間,중성,Neutraal,Neutralne,Neutro,,,Нейтральный,Неутрално
@@ -479,7 +480,7 @@ Generic,DSPLYMNU_GENERIC,,,,,Generisch,,,,,,,,,,,,,,,,,
 Show Map Name,DSPLYMNU_SHOWMAPNAME,,,,,"Levelnamen anzeigen
 ",,,,,,,,,,,,,,,,,
 FOV,DSPLYMNU_FOV,,,,,Gesichtsfeld,,,,,,,,,,,,,,,,,
-Crosshair,DSPLYMNU_CROSSHAIRON,,,,Křížek,Fadenkreuz,,Reteto,Retícula,,Tähtäin,Viseur,,Mirino,クロスヘア,조준점,Draadkruis,Celownik,Mira,,,Прицел,Нишан
+Crosshair,DSPLYMNU_CROSSHAIR,,,,Křížek,Fadenkreuz,,Reteto,Retícula,,Tähtäin,Viseur,,Mirino,クロスヘア,조준점,Draadkruis,Celownik,Mira,,,Прицел,Нишан
 HUD Options,OPTMNU_HUD,,,,Nastavení HUD,HUD Einstellungen,,Agordoj de HUD,Opciones del HUD,,Tilanäytön asetukset,Options de l'ATH,HUD beállítások,Opzioni HUD,HUD オプション,HUD 설정,HUD opties,Opcje Paska HUD,Opções de HUD,,,HUD,HUD
 Polymost Options,OPTMNU_POLYMOST,,,,,Polymost Einstellungen,,,,,,,,,,,,,,,,,
 Texture Filter mode,GLTEXMNU_TEXFILTER,,,,Režim filtrování textur,Texturfiltermodus,,Reĝimo por Teksturfiltrado,Modo de filtro de texturas,,Pintakuviointien suodatustapa,Mode de Filtrage Texture,,Modalità filtro texture,テクスチャーフィルター モード,텍스쳐 필터 모드,Textuur Filter mode,Tryb Filtrowania Tekstur,Modo de filtragem de textura,,,Фильтрация текстур,Текстурни филтер мод
diff --git a/wadsrc/static/demolition/menudef.txt b/wadsrc/static/demolition/menudef.txt
index 9e6eee177..64acbf1a4 100644
--- a/wadsrc/static/demolition/menudef.txt
+++ b/wadsrc/static/demolition/menudef.txt
@@ -962,7 +962,7 @@ OptionMenu "JoystickConfigMenu" //protected
 
 OptionValue "PlayerColors"
 {
-	0, OPTVAL_AUTO"
+	0, "$OPTVAL_AUTO"
 	1, "$TXT_COLOR_BLUE"
 	2, "TXT_COLOR_RED"
 	3, "TXT_COLOR_GREEN"
@@ -998,7 +998,7 @@ OptionMenu "NewPlayerMenu" //protected
 	TextField "$PLYRMNU_NAME", playername
 	Option "$PLYRMNU_TEAM", "playerteam", "PlayerTeam"
 	Option "$PLYRMNU_PLAYERCOLOR", "playercolor", "PlayerColors"
-	Option "$PLYRMNU_PLAYERGENDER", "playergender", "Gender""
+	Option "$PLYRMNU_PLAYERGENDER", "playergender", "Gender"
 	Submenu "$PLRMNU_TAUNTS", "TauntsMenu"
 	Class "NewPlayerMenu"
 }
@@ -1007,15 +1007,15 @@ OptionMenu "TauntsMenu" //protected
 {
 	Title "$PLRMNU_TAUNTS"
 	TextField "1", "combatmacro0"
-	TextField "2", "combatmacro0"
-	TextField "3", "combatmacro0"
-	TextField "4", "combatmacro0"
-	TextField "5", "combatmacro0"
-	TextField "6", "combatmacro0"
-	TextField "7", "combatmacro0"
-	TextField "8", "combatmacro0"
-	TextField "9", "combatmacro0"
-	TextField "10", "combatmacro0"
+	TextField "2", "combatmacro1"
+	TextField "3", "combatmacro2"
+	TextField "4", "combatmacro3"
+	TextField "5", "combatmacro4"
+	TextField "6", "combatmacro5"
+	TextField "7", "combatmacro6"
+	TextField "8", "combatmacro7"
+	TextField "9", "combatmacro8"
+	TextField "10", "combatmacro9"
 }
 
 //-------------------------------------------------------------------------------------------
@@ -1068,12 +1068,12 @@ OptionMenu GameplayOptions //protected
 OptionValue "FilterModes"
 {
 	0, "$OPTVAL_NONE"
-	1, "$OPTVAL_NONENEARESTMIPMAP"
-	5, "$OPTVAL_NONELINEARMIPMAP"
+	2, "$OPTVAL_NONENEARESTMIPMAP"
+	4, "$OPTVAL_NONELINEARMIPMAP"
 	6, "$OPTVAL_NONETRILINEAR"
-	2, "$OPTVAL_LINEAR_2"
-	3, "$OPTVAL_BILINEAR"
-	4, "$OPTVAL_TRILINEAR"
+	3, "$OPTVAL_LINEAR_2"
+	1, "$OPTVAL_BILINEAR"
+	5, "$OPTVAL_TRILINEAR"
 }
 
 OptionValue "Anisotropy"
@@ -1097,6 +1097,11 @@ OptionMenu "VideoOptions" //protected
 	Slider "$DSPLYMNU_CONTRAST",				"vid_contrast",	   				0.1, 3.0, 0.1
 	Slider "$DSPLYMNU_SATURATION",				"vid_saturation",  				-3.0, 3.0, 0.25, 2
 
+	StaticText ""
+	Option "$DSPLYMNU_VOXELS",					"r_voxels",					"OnOff"
+	StaticText ""
+	Slider "$DSPLYMNU_FOV",						"r_fov",					60, 130, 10, 1
+
 	StaticText ""
 	Option "$GLTEXMNU_TEXFILTER",		hw_texfilter,				"FilterModes"
 	Option "$GLTEXMNU_ANISOTROPIC",		hw_anisotropy,				"Anisotropy"
@@ -1121,18 +1126,20 @@ OptionMenu "HUDOptions" //protected
 	Title "$OPTMNU_HUD"
 
 	Slider "$DSPLYMNU_SCREENSIZE",				"hud_size", 				3.0, 12.0, 1.0, 0
-	Slider "$DSPLYMNU_SBSCALE",					"hud_scale",				0.3, 1.0, 0.1, 2
+	ifgame(duke, nam, ww2gi, redneck, redneckrides, fury) // Fixme: The scaling really needs to be taken out of the game code.
+	{
+		Slider "$DSPLYMNU_SBSCALE",					"hud_scale",				0.3, 1.0, 0.1, 2
+	}
 	Option "$DSPLYMNU_LEVELSTATS",				"hud_stats",				"OnOff"
-	Slider "$DSPLYMNU_TEXTSCALE",				"hud_textscale",			0.3, 1.0, 0.1, 2
+	ifgame(duke, nam, ww2gi, redneck, redneckrides, fury)
+	{
+		Slider "$DSPLYMNU_TEXTSCALE",				"hud_textscale",			0.3, 1.0, 0.1, 2
+	}
 	StaticText ""
 	Option "$DSPLYMNU_MESSAGES",				"hud_messages",				"HudMessages"
 	StaticText ""
 	Option "$DSPLYMNU_CROSSHAIR",				"cl_crosshair",	OnOff
 	Slider "$DSPLYMNU_CROSSHAIRSCALE",			"cl_crosshairscale",		50, 100, 10, 1
-	StaticText ""
-	Option "$DSPLYMNU_VOXELS",					"r_voxels",					"OnOff"
-	StaticText ""
-	Option "$DSPLYMNU_FOV",						"r_fov",					60, 130, 10, 1
 }
 
 
@@ -1192,7 +1199,7 @@ OptionMenu "JoinGameMenu"
 {
 	TextField "$NETMNU_SERVER", "m_server"
 	TextField "$NETMNU_PORT", "m_netport"
-	SaveCommand "$NETMNU_CONNECT", "MultiConnect"
+	SafeCommand "$NETMNU_CONNECT", "MultiConnect"
 }
 
 OptionValue "MultiGameType"
@@ -1204,16 +1211,27 @@ OptionValue "MultiGameType"
 	4, "$NETMNU_GAMETYPE5"
 }
 
+OptionValue "MultiEpisode"
+{
+	0, "1"
+	0, "2"
+	0, "3"
+	0, "4"
+	0, "5"
+	0, "6"
+	0, "7"
+}
+
 OptionMenu "MultiOptionsMenu"
 {
 	title "$NETMNU_OPTIONS"
-	Option "$NETMNU_GAMETYPE", "m_coop"
-	Option "$NETMNU_EPISODE", "m_episode_number"
-	Option "$NETMNU_LEVEL", "m_level_number"
+	Option "$NETMNU_GAMETYPE", "m_coop", "MultiGameType"
+	Option "$NETMNU_EPISODE", "m_episode_number", "MultiEpisode"
+	Option "$NETMNU_LEVEL", "m_level_number", "MultiEpisode"
 	Submenu "$MNU_USERMAP", "MultiUserMap" // todo: fileselect item
-	Option "$NETMNU_MONSTERS", "m_monsters"
-	Option "$NETMNU_MARKERS", "m_marker"
-	Option "$NETMNU_MAPEXITS", "m_noexit"
-	Option "$NETMNU_FFIRE", "m_ffire"
+	Option "$NETMNU_MONSTERS", "m_monsters", "OnOff"
+	Option "$NETMNU_MARKERS", "m_marker", "OnOff"
+	Option "$NETMNU_MAPEXITS", "m_noexit", "OnOff"
+	Option "$NETMNU_FFIRE", "m_ffire", "OnOff"
 	SafeCommand "$NETMNU_ACCEPT", "MultiAccept"
 }