diff --git a/src/movement/caching.rs b/src/movement/caching.rs
index c7de078..d025f55 100644
--- a/src/movement/caching.rs
+++ b/src/movement/caching.rs
@@ -63,8 +63,8 @@ pub fn generate_storage_path(room: &Room, room_cache: &mut CachedRoom) -> Compre
         let mut matrix = LocalCostMatrix::new();
         let terrain = game::map::get_room_terrain(room.name()).unwrap();
 
-        for x in 0..50 {
-            for y in 0..50 {
+        for x in 0..=49 {
+            for y in 0..=49 {
                 let pos = RoomXY::new(RoomCoordinate::new(x).unwrap(), RoomCoordinate::new(y).unwrap());
                 let terrain = terrain.get(x, y);
 
@@ -75,9 +75,9 @@ pub fn generate_storage_path(room: &Room, room_cache: &mut CachedRoom) -> Compre
                 }
 
                 // Add a border around the room.
-                if x == 0 || y == 0 || x == 49 || y == 49 {
-                    matrix.set(pos, 255);
-                }
+                //if x == 0 || y == 0 || x == 49 || y == 49 {
+                //    matrix.set(pos, 255);
+                //}
             }
         }
 
diff --git a/src/room/spawning/creep_sizing.rs b/src/room/spawning/creep_sizing.rs
index 7c9ccfb..e562516 100644
--- a/src/room/spawning/creep_sizing.rs
+++ b/src/room/spawning/creep_sizing.rs
@@ -146,6 +146,11 @@ pub fn hauler_body(room: &Room, cache: &CachedRoom, scan_check: bool) -> Vec<Par
         energy_for_haulers *= 2;
     }
 
+    if !under_storage_gate(cache, 3.0) {
+        // energy_for_haulers * 2 * 1.5 (check above)
+        energy_for_haulers = (energy_for_haulers as f64 * 1.5).round() as u32;
+    }
+
     let tile_usage = 100;
     let mut current_energy_usage = 0;
 
diff --git a/src/room/spawning/mod.rs b/src/room/spawning/mod.rs
index a4c2c02..6752bc6 100644
--- a/src/room/spawning/mod.rs
+++ b/src/room/spawning/mod.rs
@@ -825,14 +825,18 @@ pub fn upgrader(
     }
 
     let mut priority = 4.0;
-    priority += ((1.0 - current_work_parts / target_work_parts as f32) as f64) * 7.0;
+    priority += ((1.0 - current_work_parts / target_work_parts as f32) as f64) * 8.0;
 
     if !under_storage_gate(cache, 1.5) {
         priority *= 2.0;
     }
 
+    if !under_storage_gate(cache, 2.5) {
+        priority *= 2.0;
+    }
+
     if !under_storage_gate(cache, 5.0) {
-        priority *= 10.0;
+        priority *= 5.0;
     }
 
     Some(spawn_manager.create_room_spawn_request(
diff --git a/src/traits/creep.rs b/src/traits/creep.rs
index a97230e..0c11bde 100644
--- a/src/traits/creep.rs
+++ b/src/traits/creep.rs
@@ -172,8 +172,9 @@ impl CreepExtensions for screeps::Creep {
             && self.pos().y().u8() != 0
             && self.pos().y().u8() != 49;
 
-        if !move_options.ignore_cache && !move_options.fixing_stuck_creeps && not_on_exit {
-            /*if let Some(storage) = &cache.structures.storage {
+        if !move_options.ignore_cache && !move_options.fixing_stuck_creeps //&& not_on_exit
+        {
+            if let Some(storage) = &cache.structures.storage {
                 if storage.pos() == target_pos && self.move_to_storage(cache) {
                     if self.is_stuck(cache) {
                         self.bsay("ST-STUCK", false);
@@ -187,7 +188,7 @@ impl CreepExtensions for screeps::Creep {
                     //self.bsay(&format!("MV-STOR {}",).to_string(), false);
                     return;
                 }
-            }*/
+            }
 
             let heap_cache = heap().cachable_positions.lock().unwrap();