diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index 4a5a55bc..fa761f9a 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -894,27 +894,9 @@ void menuitemmapload(char *name, char *text)
 {
     if(!lastmenu) return;
     string caction;
-	string title;
-	if(text[0]!='\0') formatstring(title)("%s", text);
-	else formatstring(title)("%s", name);
-    if(strcmp(name,text)==0)
-	{
-		formatstring(caction)("map %s", name);
-	}
-    else
-	{
-		defformatstring(jac)("ac_%s", text);
-		if(strcmp(jac,name)==0)
-		{
-			formatstring(caction)("map %s", name);
-		}
-		else
-		{
-			copystring(caction, text);
-		}
-	}
-    defformatstring(fullp2m)("packages/maps/%s.cgz", name);
-    lastmenu->items.add(new mitemmapload(lastmenu, newstring(name), newstring(title), newstring(caction), NULL, NULL, NULL));
+	if(!text || text[0]=='\0') formatstring(caction)("map %s", name);
+	else formatstring(caction)("%s", text);
+    lastmenu->items.add(new mitemmapload(lastmenu, newstring(name), newstring(name), newstring(caction), NULL, NULL, NULL));
 }
 
 void menuitemtextinput(char *text, char *value, char *action, char *hoveraction, char *maxchars)
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 84fc376e..036c1561 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -107,7 +107,7 @@ void quicknadethrow(bool on)
         if(player1->weapons[GUN_GRENADE]->mag > 0)
         {
             if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
-            if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold ) attack(true);
+            if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold) attack(true); // TODO: use a flag for all weapons to shoot (only action?) once they've successfully reloaded or been switched to. Would need to get purged at appropriate time too.
         }
     }
     else