diff --git a/README b/README
index 5b0f6cac..c9ab9155 100644
--- a/README
+++ b/README
@@ -49,6 +49,9 @@ martinambrus changes:
 37. new config option to show Support messages in Admin's mailbox
 38. new feature: allowing messages to be sent as Support from in-game when user is Admin + it's allowed in config
 39. not allowing installation if old data are still in database to prevent multiple worlds generation and game misbehavior
+40. fixed quest 1 to reload the page and allow for immediate completion of the woodcutter
+41. NPC links added to units in Hero Mansion
+42. fixed random attacks attacker tribe (Natars) when building Wonder of the World 
 
 
 Shadowss changes:
diff --git a/Templates/Notice/4.tpl b/Templates/Notice/4.tpl
index 8f216c34..18f2c51a 100644
--- a/Templates/Notice/4.tpl
+++ b/Templates/Notice/4.tpl
@@ -63,7 +63,7 @@ if($database->isVillageOases($dataarray[29])){
 <tr>
 <td>&nbsp;</td>
 <?php
-$tribe = $dataarray[2] || 0;
+$tribe = ($dataarray[2] ? $dataarray[2] : 5);
 $start = ($tribe-1)*10+1;
 for($i=$start;$i<=($start+9);$i++) {
 	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
diff --git a/todo.txt b/todo.txt
index 7e52017e..7a6460ee 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,4 @@
-- check aliance invitation accepting - apparently it doesn't work too well on first try?
 - normalize forum tables - varchar is used for numeric values and is joined with int field
-- should random attacks from Natars when building Wonder of the World be unit-less?
 - send forum replies in a forum where a user is active also to that user's mailbox
 - make an option for admin to be raidable (in profile?)
 - finish parts in Admin that are unfinished (mostly delete -X- buttons and Alliance settings)