diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 8bd238e..282a464 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 0920592..e6e9242 100644
--- a/main.cpp
+++ b/main.cpp
@@ -155,7 +155,7 @@ public:
 	int OVERWORLD_POWER_GRADE_CURSOR=0;
 	int OVERWORLD_POWER_SELECTION_OFFSET[4]={0,0,0,0};
 	int OVERWORLD_GRADE_SELECTION_OFFSET=0;
-	int OVERWORLD_POWER_SELECTION_MEMBER=0;
+	int OVERWORLD_POWER_SELECTION_MEMBER=-1;
 	Battle::Move*OVERWORLD_SELECTED_POWER;
 	int OVERWORLD_TARGET_SELECTION=0;
 	bool HEALING_OVERWORLD_MEMBERS=false; //When set to true, members will be healed as dialog boxes are closed using the HEALING_OVERWORLD_MEMBER variable.
@@ -1240,6 +1240,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 					if (OVERWORLD_ITEM_BEING_USED) { //Equipping an item.
 						int prevPartyInvenSize=PARTY_INVENTORY.size();
 						if (PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.equip!=EquipSlot::NONE) {
+							DisplayMessageBox(PARTY_MEMBER_OBJ[OVERWORLD_TARGET_SELECTION]->name+" equipped the "+PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->name+".");
 							PARTY_MEMBER_STATS[PARTY_MEMBER_ID[OVERWORLD_TARGET_SELECTION]]->EquipItem(ITEM_SELECTION_CURSOR);
 							GAME_STATE=GameState::OVERWORLD_ITEMS_MENU;
 							PARTY_MEMBER_OBJ[OVERWORLD_TARGET_SELECTION]->highlighted=true;
@@ -1317,8 +1318,8 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 						PARTY_MEMBER_STATS[PARTY_MEMBER_ID[OVERWORLD_POWER_SELECTION_MEMBER]]->SubtractPP(move->PPCost);
 						DisplayMessageBox(PARTY_MEMBER_OBJ[OVERWORLD_POWER_SELECTION_MEMBER]->name+" begins to cast "+move->GetPowerName()+".\n");
 						GAME_STATE=GameState::OVERWORLD_GRADE_MENU;
-						PARTY_MEMBER_OBJ[OVERWORLD_TARGET_SELECTION]->highlighted=false;
 					}
+					PARTY_MEMBER_OBJ[OVERWORLD_TARGET_SELECTION]->highlighted=false;
 				}
 			}break;
 			case GameState::OVERWORLD_ITEMS_MENU:{
@@ -1332,6 +1333,8 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 						if (PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.equip!=EquipSlot::NONE||PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.consumable==Consumable::FRIENDLY||PARTY_INVENTORY[ITEM_SELECTION_CURSOR]->stats.consumable==Consumable::FRIENDLY_PERMANENT) {
 							GAME_STATE=GameState::OVERWORLD_TARGET_MENU;
 							OVERWORLD_ITEM_BEING_USED=true;
+							OVERWORLD_TARGET_SELECTION=0;
+							PARTY_MEMBER_OBJ[OVERWORLD_TARGET_SELECTION]->highlighted=true;
 						} else {
 							DisplayMessageBox("Cannot use that here.");
 						}
@@ -1698,7 +1701,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 			}
 		}
 
-		if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE==BattleState::ITEM_SELECT||GAME_STATE==GameState::OVERWORLD_ITEMS_MENU) {
+		if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE==BattleState::ITEM_SELECT||GAME_STATE==GameState::OVERWORLD_ITEMS_MENU&&!messageBoxVisible) {
 			DrawDialogBox({4,4},{(int)(WIDTH-8),(int)(HEIGHT/2)},Pixel(70, 33, 105,220),Pixel(62, 54, 69,220),Pixel(185, 148, 255,220));
 			DrawDialogBox({(int)(WIDTH*(3.0F/8)),HEIGHT/2+4},{(int)(WIDTH*(5.0F/8)-4),(int)(HEIGHT/4)},Pixel(70, 33, 105,220),Pixel(62, 54, 69,220),Pixel(185, 148, 255,220));
 			DrawDecal({static_cast<float>(8+(ITEM_SELECTION_CURSOR)%2*(WIDTH-8)/2),static_cast<float>(12*((ITEM_SELECTION_CURSOR-ITEM_SELECTION_OFFSET)/2)+8)},SPRITES["cursor.png"]);