diff --git a/src/main.cpp b/src/main.cpp
index 3edf79bd2..505f82fc7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -339,6 +339,12 @@ TODO: Merge bahamada's audio stuff (clean patch available)
 
 TODO: Merge key configuration menu (no clean patch available)
 
+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:
 ------------------------