diff --git a/crates/logic/src/battle/logic_simulation.rs b/crates/logic/src/battle/logic_simulation.rs
index b5a7271..ac32ee9 100644
--- a/crates/logic/src/battle/logic_simulation.rs
+++ b/crates/logic/src/battle/logic_simulation.rs
@@ -13,6 +13,9 @@ pub const MANA_RATE_SCALE: i32 = 100;
 pub const GLOBAL_MAX_MANA: &str = "MAX_MANA";
 pub const GLOBAL_MANA_REGEN: &str = "MANA_REGEN_MS";
 pub const GLOBAL_MANA_REGEN_END: &str = "MANA_REGEN_MS_END";
+pub const GLOBAL_MANA_REGEN_OVERTIME: &str = "MANA_REGEN_MS_OVERTIME";
+pub const MAX_MOVE_STEP: i64 = 250;
+pub const COLLISION_PUSH_LIMIT: i64 = 150;
 pub const GLOBAL_MANA_SPEED_UP_SECONDS: &str = "MANA_SPEED_UP_WHEN_REMAINING_SECONDS";
 pub const GLOBAL_KING_ACTIVATE_TIME_MS: &str = "KING_ACTIVATE_TIME_MS";
 pub const KING_ACTIVATION_STEP: i32 = 50;
@@ -181,12 +184,23 @@ struct CollisionBody {
 impl LogicBattle {
     fn regenerate_mana(&mut self, tick: i32) {
         let max_mana = crate::LogicGlobals::number(GLOBAL_MAX_MANA).max(1);
-        let seconds_left = (self.match_length_seconds() - tick / BATTLE_TICKS_PER_SECOND).max(0);
+        let elapsed = tick / BATTLE_TICKS_PER_SECOND;
+        if elapsed >= self.match_length_seconds() {
+            self.is_on_overtime = true;
+        }
         let speed_up = crate::LogicGlobals::number(GLOBAL_MANA_SPEED_UP_SECONDS);
-        let regen = if seconds_left <= speed_up {
-            crate::LogicGlobals::number(GLOBAL_MANA_REGEN_END)
+        let regen = if self.is_on_overtime {
+            let seconds_left =
+                (self.match_length_seconds() + self.overtime_length_seconds() - elapsed).max(0);
+            let _ = seconds_left;
+            crate::LogicGlobals::number(GLOBAL_MANA_REGEN_OVERTIME)
         } else {
-            crate::LogicGlobals::number(GLOBAL_MANA_REGEN)
+            let seconds_left = (self.match_length_seconds() - elapsed).max(0);
+            if seconds_left <= speed_up {
+                crate::LogicGlobals::number(GLOBAL_MANA_REGEN_END)
+            } else {
+                crate::LogicGlobals::number(GLOBAL_MANA_REGEN)
+            }
         };
         let step = regen.saturating_mul(MANA_RATE_SCALE) / max_mana;
         if step < 1 {
@@ -440,6 +454,7 @@ impl LogicBattle {
                 continue;
             }
             let step = (stats.speed as i64)
+                .min(MAX_MOVE_STEP)
                 .min(straight - stand_off as i64)
                 .min(leg);
             let base = self.objects.objects[index].body.base_mut();
@@ -516,7 +531,7 @@ impl LogicBattle {
                 continue;
             }
             let mut shove = (push.0 / push.2 as i64, push.1 / push.2 as i64);
-            let allowance = (stats.speed / 2).max(1) as i64;
+            let allowance = COLLISION_PUSH_LIMIT;
             let travelled =
                 crate::logic_sqrt(distance_squared((0, 0), (shove.0 as i32, shove.1 as i32)))
                     as i64;