diff --git a/src/main.cpp b/src/main.cpp
index 783faa4e2..75322847b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -330,7 +330,7 @@ Map:
 
 TODO: Mineral and ground material properties
       - This way mineral ground toughness can be calculated with just
-	    some formula, as well as tool strengths
+	    some formula, as well as tool strengths. Sounds too.
 	  - There are TODOs in appropriate files: material.h, content_mapnode.h
 
 TODO: Flowing water to actually contain flow direction information
@@ -338,6 +338,9 @@ TODO: Flowing water to actually contain flow direction information
 
 TODO: Consider smoothening cave floors after generating them
 
+TODO: Fix make_tree, make_* to use seed-position-consistent pseudorandom
+	  - delta also
+
 Misc. stuff:
 ------------
 TODO: Make sure server handles removing grass when a block is placed (etc)
@@ -350,19 +353,14 @@ TODO: Think about using same bits for material for fences and doors, for
 TODO: Move mineral to param2, increment map serialization version, add
       conversion
 
-TODO: Restart irrlicht completely when coming back to main menu from game.
+SUGG: Restart irrlicht completely when coming back to main menu from game.
 	- This gets rid of everything that is stored in irrlicht's caches.
+	- This might be needed for texture pack selection in menu
 
 TODO: Merge bahamada's audio stuff (clean patch available)
 
 TODO: Move content_features to mapnode_content_features.{h,cpp} or so
 
-TODO: Add some kind of content range validation to mapnode serialization
-
-TODO: Make sure menu text position is fixed
-
-TODO: Fix sector over limits error
-
 Making it more portable:
 ------------------------