diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp
index 337610ae..4d2da65f 100644
--- a/Adventures in Lestoria/AdventuresInLestoria.cpp	
+++ b/Adventures in Lestoria/AdventuresInLestoria.cpp	
@@ -422,7 +422,7 @@ void AiL::HandleUserInput(float fElapsedTime){
 	if(KEY_MENU.Released()){
 		Menu::OpenMenu(MenuType::PAUSE);
 	}
-	if(player->GetVelocity()==vf2d{0,0}&&player->CanMove()){
+	if(player->GetVelocity().mag()<"Player.Move Allowed Velocity Lower Limit"_F&&player->CanMove()){
 		auto GetPlayerStaircaseDirection=[&](){
 			for(LayerTag&layer:MAP_DATA[GetCurrentLevel()].LayerData){
 				int truncatedPlayerX=int(player->GetX())/game->GetCurrentMapData().tilewidth;
diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp
index 28912630..a689862d 100644
--- a/Adventures in Lestoria/Player.cpp	
+++ b/Adventures in Lestoria/Player.cpp	
@@ -806,6 +806,10 @@ void Player::CancelCast(){
 	if(wasCasting){
 		DAMAGENUMBER_LIST.push_back(std::make_shared<DamageNumber>(GetPos(),0,true,INTERRUPT));
 	}
+	if(state==State::CASTING){
+		state=State::NORMAL;
+		castPrepAbility->waitForRelease=true;
+	}
 }
 
 void Player::Moved(){
diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt
index 1212f30d..77d45e14 100644
--- a/Adventures in Lestoria/TODO.txt	
+++ b/Adventures in Lestoria/TODO.txt	
@@ -21,4 +21,6 @@ Add hotkeys to loadout slots when selecting them from the menu
 When Blacksmith is unlocked, camp notification is reset
 Allow Block to interrupt casts (Bandages)
 
-Pressing any skill overrides an item's cast....?
\ No newline at end of file
+Pressing any skill overrides an item's cast....?
+
+Fix Story setpieces (outer tiles)
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index 6b88ead2..83cbdee0 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 5
 #define VERSION_PATCH 1
-#define VERSION_BUILD 8187
+#define VERSION_BUILD 8193
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Adventures in Lestoria/Warrior.cpp b/Adventures in Lestoria/Warrior.cpp
index 57625592..76c33989 100644
--- a/Adventures in Lestoria/Warrior.cpp	
+++ b/Adventures in Lestoria/Warrior.cpp	
@@ -106,7 +106,7 @@ void Warrior::InitializeClassAbilities(){
     #pragma region Warrior Right-click Ability (Block)
         Warrior::rightClickAbility.action=
             [](Player*p,vf2d pos={}){
-                if(p->GetState()==State::NORMAL){
+                if(p->GetState()==State::NORMAL||p->GetState()==State::CASTING){
                     rightClickAbility.cooldown=rightClickAbility.COOLDOWN_TIME;
                     p->SetState(State::BLOCK);
                     p->blockTimer="Warrior.Right Click Ability.Duration"_F;
diff --git a/Adventures in Lestoria/assets/config/Player.txt b/Adventures in Lestoria/assets/config/Player.txt
index 2c9424c7..87d4f3b1 100644
--- a/Adventures in Lestoria/assets/config/Player.txt	
+++ b/Adventures in Lestoria/assets/config/Player.txt	
@@ -23,6 +23,9 @@ Player
 	# How much speed the player loses while no momentum is being added.
 	Friction = 400
 
+	# How low the velocity has to be before the player has control again from being bumped around.
+	Move Allowed Velocity Lower Limit = 30.0
+
 	# How many of any one type of item we can bring to the battlefield max per slot.
 	Item Loadout Limit = 10
 
diff --git a/Adventures in Lestoria/assets/config/classes/Warrior.txt b/Adventures in Lestoria/assets/config/classes/Warrior.txt
index 9a018ec7..5c220c5e 100644
--- a/Adventures in Lestoria/assets/config/classes/Warrior.txt	
+++ b/Adventures in Lestoria/assets/config/classes/Warrior.txt	
@@ -18,7 +18,7 @@ Warrior
         Range = 150
         Cooldown = 0.35
         # Whether or not this ability cancels casts.
-        CancelCast = 0
+        CancelCast = 1
 
         SwordSwingTime = 0.2
     }
@@ -30,7 +30,7 @@ Warrior
         Cooldown = 15
         Mana Cost = 0
         # Whether or not this ability cancels casts.
-        CancelCast = 0
+        CancelCast = 1
 
         Description = Blocks incoming damage for a brief period of time.
 
@@ -55,7 +55,7 @@ Warrior
         Cooldown = 12
         Mana Cost = 35
         # Whether or not this ability cancels casts.
-        CancelCast = 0
+        CancelCast = 1
 
         Description = A Battlecry that boosts the Warrior's Damage and Defense capabilities for some time.
 
@@ -103,7 +103,7 @@ Warrior
         Cooldown = 15
         Mana Cost = 50
         # Whether or not this ability cancels casts.
-        CancelCast = 0
+        CancelCast = 1
 
         Description = Leaps and then dives into the ground, knocking back and destroying everything nearby in the process.
 
@@ -144,7 +144,7 @@ Warrior
         Cooldown = 40
         Mana Cost = 60
         # Whether or not this ability cancels casts.
-        CancelCast = 0
+        CancelCast = 1
 
         Description = A large sonic wave projectile is released from the Warrior's sword.
 
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 26397842..43634986 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ