diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp
index 4b6c74ca..db61a997 100644
--- a/Adventures in Lestoria/AdventuresInLestoria.cpp	
+++ b/Adventures in Lestoria/AdventuresInLestoria.cpp	
@@ -3558,7 +3558,7 @@ void AiL::GetAnyKeyRelease(Key key){
 				if(InputGroup::menuNamesToInputGroups.count(Menu::menus[NEW_INPUT]->S(A::KEYBIND))){
 					InputGroup::menuNamesToInputGroups[Menu::menus[NEW_INPUT]->S(A::KEYBIND)]->SetNewPrimaryKeybind(Input{KEY,key});
 					Menu::alreadyClicked=true;
-					for(auto&[menuType,menu]:Menu::menus){
+					for(auto[menuType,menu]:Menu::menus){
 						menu->helpDisplay.Initialize(menu->inputGroups);
 					}
 					Menu::CloseMenu();
diff --git a/Adventures in Lestoria/InputHelper.cpp b/Adventures in Lestoria/InputHelper.cpp
index 8081deeb..3b6d1dd1 100644
--- a/Adventures in Lestoria/InputHelper.cpp	
+++ b/Adventures in Lestoria/InputHelper.cpp	
@@ -48,7 +48,6 @@ INCLUDE_WINDOW_SIZE
 InputHelper::InputHelper(){}
 
 void InputHelper::Initialize(MenuInputGroups&inputGroups){
-	this->inputGroups.clear();
 	groupData=inputGroups;
 }
 
diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp
index 4fe00880..6e9b3646 100644
--- a/Adventures in Lestoria/Key.cpp	
+++ b/Adventures in Lestoria/Key.cpp	
@@ -787,7 +787,7 @@ void InputGroup::RemovePrimaryKeybind(InputType type){
 }
 void InputGroup::AddPrimaryKeybind(Input key){
 	keys.insert(key);
-	keyOrder.insert(keyOrder.begin(),{key.GetType(),key.key});
+	keyOrder.insert(keyOrder.begin(),key);
 }
 void InputGroup::SetNewPrimaryKeybind(Input key){
 	RemovePrimaryKeybind(key.GetType());
diff --git a/Adventures in Lestoria/Merchant.cpp b/Adventures in Lestoria/Merchant.cpp
index 8988e4a9..a7982c36 100644
--- a/Adventures in Lestoria/Merchant.cpp	
+++ b/Adventures in Lestoria/Merchant.cpp	
@@ -225,7 +225,7 @@ void Merchant::SellItem(std::weak_ptr<Item>item,uint32_t amt){
 	game->GetPlayer()->SetMoney(game->GetPlayer()->GetMoney()+totalCost);
 
 	//If we still have some in our inventory, we'll add them back in.
-	if(Inventory::GetItemCount(itemName)>0){
+	if(foundLoadoutSlot!=-1&&Inventory::GetItemCount(itemName)>0){
 		game->SetLoadoutItem(foundLoadoutSlot,itemName);
 	}
 
diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt
index 9fbfa697..171cfab2 100644
--- a/Adventures in Lestoria/TODO.txt	
+++ b/Adventures in Lestoria/TODO.txt	
@@ -33,5 +33,8 @@ feature to lock accesoires to protect them from selling would be nice
 Gorbit99's viewport PGEX
 Original Nico Sprite
 
-Inventory scroll bar doesn't reset its size
-Address selling of items that are in equipment slots and loadout slots.
\ No newline at end of file
+Story I-I should not unlock Stage I-II.
+Initial Gold Crafting costs does not get subtracted properly.
+Menu controls are not properly saved in system settings (only for emscripten?)
+
+The keyboard display controls for the merchant are messed up?
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index ed398d6b..9dc1c08d 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 4
 #define VERSION_PATCH 2
-#define VERSION_BUILD 7871
+#define VERSION_BUILD 7872
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 74d0582f..837006d7 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ