diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index abb8859..f663832 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index ac74cf4..439f250 100644
--- a/main.cpp
+++ b/main.cpp
@@ -354,7 +354,6 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 						messageBoxLoad=true;
 						messageBoxVisible=true;
 						HEALING_OVERWORLD_SINGLE_MEMBER=false;
-						GAME_STATE=GameState::OVERWORLD_GRADE_MENU;
 						castingMember->selectedMove=nullptr;
 					}
 				}
@@ -1232,6 +1231,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 					Battle::Move*move=BATTLE_MOVELIST_DISPLAY[OVERWORLD_POWER_SELECTION_CURSOR[OVERWORLD_POWER_SELECTION_MEMBER]][OVERWORLD_POWER_GRADE_CURSOR];
 					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;
 				}
 			}break;
 			case GameState::EDITOR:{
@@ -1504,7 +1504,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 		}
 
 
-		if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE!=BattleState::MOVE_CAMERA&&BATTLE_STATE!=BattleState::MOVE_CAMERA_BACK||OverworldMenuOpen()) {
+		if (BATTLE_ENCOUNTER!=nullptr&&BATTLE_STATE!=BattleState::MOVE_CAMERA&&BATTLE_STATE!=BattleState::MOVE_CAMERA_BACK||OverworldMenuOpen()&&GAME_STATE!=GameState::OVERWORLD_TARGET_MENU) {
 			SetDrawTarget(layer::INTERFACE);
 			vi2d screenShakeOffset = {0,0};
 			if (BATTLE_ENCOUNTER!=nullptr) {
@@ -3082,6 +3082,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 								PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->_SetDirectPP(PARTY_MEMBER_STATS[PARTY_MEMBER_ID[i]]->GetTargetPP());
 							}
 							BATTLE_STATE=BattleState::ENEMY_SPOILS;
+							BATTLE_ROLLING_COUNTER_WAITTIME=0;
 						}
 
 						CURRENT_TURN=-99;