diff --git a/GameEngine/Database.php b/GameEngine/Database.php
index 53f887e5..5e285ffd 100755
--- a/GameEngine/Database.php
+++ b/GameEngine/Database.php
@@ -4115,6 +4115,9 @@ class MYSQLi_DB implements IDbConnection {
 		}
 		$settlerarray = $this->getMovement(5, $id, 0);
 		if(!empty($settlerarray)) {
+		    if (!isset($movingunits['u' . ($vtribe * 10)])) {
+		        $movingunits['u' . ($vtribe * 10)] = 0;
+		    }
 			$movingunits['u' . ($vtribe * 10)] += 3 * count($settlerarray);
 		}
 		return $movingunits;
@@ -4558,9 +4561,9 @@ class MYSQLi_DB implements IDbConnection {
 				}
 			}
 		}
-		// trapped settlers/chiefs calculation required
+		// TODO: trapped settlers/chiefs calculation required
 
-		$settlerslots = $maxslots * 3 - $settlers - $chiefs * 3;
+		$settlerslots = $maxslots * 3 - $settlers * 3;
 		$chiefslots = $maxslots - $chiefs - floor(($settlers + 2) / 3);
 
 		if(!$technology->getTech(($session->tribe - 1) * 10 + 9)) {
diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index 23cda935..3f3d82a2 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -294,7 +294,7 @@ class Technology {
                 if (!isset($ownunit['hero'])) {
                     $ownunit['hero'] = 0;
                 }
-                $ownunit['hero'] += $movement['hero'];
+                $ownunit['hero'] += (isset($movement['hero']) ? $movement['hero'] : 0);
             }
         }
         return $ownunit;
diff --git a/todo.txt b/todo.txt
index d9c8bfcf..86a03d86 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,3 @@
-- cannot train settlers in palace if chieftan is in the village (2 villages founded, palace lvl 20, so 3rd should be possible)
 - can we have / accept invitations from multiple alliances? if so, will first invitation rewrite the next? or when accepting, will all other invitations be deleted?
 - when you put 2 builds into a loop (queue) and add 3rd to be built with master builder, the last one doesn't take resources and will be finished for free with PLUS immediate finish action
 - inviting player into alliance who already is in an alliance should not work
@@ -49,4 +48,5 @@
   to hold all members in their Embassy, allow to evict last X members / members who were last online / members with least population
   (+ add check for members who have WW or artifacts in their villages) from the alliance and select a leader with closest Embassy level
   to hold the rest
-- add new PLUS-only alliance setting for reassigning a leader directly without quitting the alliance
\ No newline at end of file
+- add new PLUS-only alliance setting for reassigning a leader directly without quitting the alliance
+- allow for a game mechanic where if a chieftan exists in a village attacked by another player with a chieftan, there's a chance (random, or based on cultural points of those 2 players?) that the home chieftan would prevent village from conversion (also possibly decrease cultural points on attacks, if this is not done yet)
\ No newline at end of file