diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index eac82b6d..33bd1bf8 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -1466,7 +1466,7 @@ window.BurgsAndStates = (function () {
     for (const i of cells.i) {
       if (cells.burg[i]) continue; // do not overwrite burgs
       // Do not process any locked provinces or states
-      if (pack.provinces[cells.province[i]].lock || pack.states[cells.state[i]].lock) return;
+      if (pack.provinces[cells.province[i]].lock || pack.states[cells.state[i]].lock) continue;
       // Find neighbors, but ignore any cells from locked states or provinces
       const neibs = cells.c[i].filter(
         c =>
diff --git a/modules/cultures-generator.js b/modules/cultures-generator.js
index 94c5f99b..e09d4cdd 100644
--- a/modules/cultures-generator.js
+++ b/modules/cultures-generator.js
@@ -525,11 +525,6 @@ window.Cultures = (function () {
 
     const neutral = (cells.i.length / 5000) * 3000 * neutralInput.value; // limit cost for culture growth
     const cost = [];
-    const cellsCost = {};
-    cells.culture.forEach(function (cultureId, index) {
-      // Make the cost of cells with an existing culture so high, they won't get picked
-      cellsCost[index] = cultureId > 0 ? neutral : 0;
-    });
     while (queue.length) {
       const next = queue.dequeue(),
         n = next.e,
@@ -537,7 +532,8 @@ window.Cultures = (function () {
         c = next.c;
       const type = pack.cultures[c].type;
       cells.c[n].forEach(function (e) {
-        const cellCost = cellsCost[e];
+        if (pack.cultures[cells.culture[e]]?.lock) return;
+
         const biome = cells.biome[e];
         const biomeCost = getBiomeCost(c, biome, type);
         const biomeChangeCost = biome === cells.biome[n] ? 0 : 20; // penalty on biome change
@@ -545,7 +541,7 @@ window.Cultures = (function () {
         const riverCost = getRiverCost(cells.r[e], e, type);
         const typeCost = getTypeCost(cells.t[e], type);
         const totalCost =
-          p + cellCost + (biomeCost + biomeChangeCost + heightCost + riverCost + typeCost) / pack.cultures[c].expansionism;
+          p + (biomeCost + biomeChangeCost + heightCost + riverCost + typeCost) / pack.cultures[c].expansionism;
 
         if (totalCost > neutral) return;
 
diff --git a/modules/dynamic/editors/cultures-editor.js b/modules/dynamic/editors/cultures-editor.js
index 1a71b576..8cc01007 100644
--- a/modules/dynamic/editors/cultures-editor.js
+++ b/modules/dynamic/editors/cultures-editor.js
@@ -940,12 +940,6 @@ function updateLockStatus() {
   const c = pack.cultures[cultureId];
   c.lock = !c.lock;
 
-  if (c.lock) {
-    classList.remove("icon-lock-open");
-    classList.add("icon-lock");
-  }
-  else {
-    classList.remove("icon-lock");
-    classList.add("icon-lock-open");
-  }
+  classList.toggle("icon-lock-open");
+  classList.toggle("icon-lock");
 }
diff --git a/modules/dynamic/editors/religions-editor.js b/modules/dynamic/editors/religions-editor.js
index b9d125f7..da6c290d 100644
--- a/modules/dynamic/editors/religions-editor.js
+++ b/modules/dynamic/editors/religions-editor.js
@@ -770,12 +770,6 @@ function updateLockStatus() {
   const r = pack.religions[religionId];
   r.lock = !r.lock;
 
-  if (r.lock) {
-    classList.remove("icon-lock-open");
-    classList.add("icon-lock");
-  }
-  else {
-    classList.remove("icon-lock");
-    classList.add("icon-lock-open");
-  }
+  classList.toggle("icon-lock-open");
+  classList.toggle("icon-lock");
 }
diff --git a/modules/dynamic/editors/states-editor.js b/modules/dynamic/editors/states-editor.js
index f6d9be1c..85705b9d 100644
--- a/modules/dynamic/editors/states-editor.js
+++ b/modules/dynamic/editors/states-editor.js
@@ -1369,12 +1369,6 @@ function updateLockStatus(stateId, classList) {
   const s = pack.states[stateId];
   s.lock = !s.lock;
 
-  if (s.lock) {
-    classList.remove("icon-lock-open");
-    classList.add("icon-lock");
-  }
-  else {
-    classList.remove("icon-lock");
-    classList.add("icon-lock-open");
-  }
+  classList.toggle("icon-lock-open");
+  classList.toggle("icon-lock");
 }
diff --git a/modules/religions-generator.js b/modules/religions-generator.js
index 06758add..d2ea9c0e 100644
--- a/modules/religions-generator.js
+++ b/modules/religions-generator.js
@@ -459,10 +459,13 @@ window.Religions = (function () {
       const folk = isFolkBased && religions.find(r => r.i !== religion.i && r.culture === culture && r.type === "Folk");
       if (folk && religion.expansion === "culture" && folk.name.slice(0, 3) !== "Old") folk.name = "Old " + folk.name;
 
+      // have a counter here to adjust the search range and make sure we can find a religion
+      let runs = 1;
       do {
         // Run the search until we have at least one source religion that is not the current religion.
-        religion.origins = folk ? [folk.i] : getReligionsInRadius({x, y, r: 150 / count, max: 2})
+        religion.origins = folk ? [folk.i] : getReligionsInRadius({x, y, r: (150 * runs) / count, max: 2})
           .filter(r => r !== religion.i);
+        runs++;
       } while (!religion.origins.length)
       religionsTree.add([x, y]);
     });
@@ -524,10 +527,13 @@ window.Religions = (function () {
         return;
 
       const [x, y] = cells.p[religion.center];
+      // have a counter here to adjust the search range and make sure we can find a religion
+      let runs = 1;
       do {
         // Run the search until we have at least one source religion that is not the current religion.
-        religion.origins = getReligionsInRadius({x, y, r: 300 / count, max: rand(0, 4)})
+        religion.origins = getReligionsInRadius({x, y, r: (300 * runs) / count, max: rand(0, 4)})
           .filter(r => r !== religion.i);
+        runs++;
       } while (!religion.origins.length)
       religionsTree.add([x, y]);
     });
@@ -701,11 +707,6 @@ window.Religions = (function () {
 
     const neutral = (cells.i.length / 5000) * 200 * gauss(1, 0.3, 0.2, 2, 2) * neutralInput.value; // limit cost for organized religions growth
     const popCost = d3.max(cells.pop) / 3; // enougth population to spered religion without penalty
-    const cellsCost = {};
-    restoredCells.forEach(index => {
-      // Make the cost of cells with an existing culture so high, they won't get picked
-      cellsCost[index] = neutral;
-    });
 
     while (queue.length) {
       const next = queue.dequeue(),
@@ -719,6 +720,7 @@ window.Religions = (function () {
       cells.c[n].forEach(function (e) {
         if (expansion === "culture" && c !== cells.culture[e]) return;
         if (expansion === "state" && s !== cells.state[e]) return;
+        if (restoredCells.includes(e)) return;
 
         const cultureCost = c !== cells.culture[e] ? 10 : 0;
         const stateCost = s !== cells.state[e] ? 10 : 0;
@@ -728,7 +730,6 @@ window.Religions = (function () {
         const waterCost = cells.h[e] < 20 ? (cells.road[e] ? 50 : 1000) : 0;
         const totalCost =
           p +
-          (cellsCost[e] || 0) +
           (cultureCost + stateCost + biomeCost + populationCost + heightCost + waterCost) / religions[r].expansionism;
         if (totalCost > neutral) return;
 
@@ -758,11 +759,6 @@ window.Religions = (function () {
       });
 
     const neutral = (cells.i.length / 5000) * 500 * neutralInput.value; // limit cost for heresies growth
-    const cellsCost = {};
-    restoredCells.forEach(index => {
-      // Make the cost of cells with an existing culture so high, they won't get picked
-      cellsCost[index] = neutral;
-    });
 
     while (queue.length) {
       const next = queue.dequeue(),
@@ -772,13 +768,14 @@ window.Religions = (function () {
         b = next.b;
 
       cells.c[n].forEach(function (e) {
+        if (restoredCells.includes(e)) return;
+
         const religionCost = cells.religion[e] === b ? 0 : 2000;
         const biomeCost = cells.road[e] ? 0 : biomesData.cost[cells.biome[e]];
         const heightCost = Math.max(cells.h[e], 20) - 20;
         const waterCost = cells.h[e] < 20 ? (cells.road[e] ? 50 : 1000) : 0;
         const totalCost =
-          p + (cellsCost[e] || 0) +
-          (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, 0.1);
+          p + (religionCost + biomeCost + heightCost + waterCost) / Math.max(religions[r].expansionism, 0.1);
 
         if (totalCost > neutral) return;
 
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
index 692a4fa0..f3c7660f 100644
--- a/modules/ui/provinces-editor.js
+++ b/modules/ui/provinces-editor.js
@@ -1093,12 +1093,6 @@ function updateLockStatus(provinceId, classList) {
   const p = pack.provinces[provinceId];
   p.lock = !p.lock;
 
-  if (p.lock) {
-    classList.remove("icon-lock-open");
-    classList.add("icon-lock");
-  }
-  else {
-    classList.remove("icon-lock");
-    classList.add("icon-lock-open");
-  }
+  classList.toggle("icon-lock-open");
+  classList.toggle("icon-lock");
 }