diff --git a/client/menu_scenes/lobby_menu.cpp b/client/menu_scenes/lobby_menu.cpp
index 619eea4..d4dcc81 100644
--- a/client/menu_scenes/lobby_menu.cpp
+++ b/client/menu_scenes/lobby_menu.cpp
@@ -108,6 +108,7 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 	back.DrawTo(screen);
 
 	//TODO: (1) draw headers for the server list
+	//TODO: (1) ping/delay displayed in the server list
 	for (int i = 0; i < serverInfo.size(); i++) {
 		//draw the selected server's highlight
 		if (selection == &serverInfo[i]) {
diff --git a/common/network/packet_types/client_packet.hpp b/common/network/packet_types/client_packet.hpp
index 2d684b1..0195f58 100644
--- a/common/network/packet_types/client_packet.hpp
+++ b/common/network/packet_types/client_packet.hpp
@@ -28,7 +28,7 @@ struct ClientPacket : SerialPacketBase {
 	int clientIndex;
 	int accountIndex;
 	char username[PACKET_STRING_SIZE];
-	//TODO: (9) password, auth token
+	//TODO: (3) password, auth token
 };
 
 void serializeClient(void* buffer, ClientPacket* packet);
diff --git a/rsc/scripts/map_saver.lua b/rsc/scripts/map_saver.lua
index 0715807..c5b528b 100644
--- a/rsc/scripts/map_saver.lua
+++ b/rsc/scripts/map_saver.lua
@@ -11,5 +11,5 @@ function mapSaver.Save(r)
 	io.write("map_saver:Save(", Region.GetX(r), ", ", Region.GetY(r), ")\n")
 end
 
---TODO: (9) create a flexible saving & loading system
+--TODO: (3) create a flexible saving & loading system
 return mapSaver
\ No newline at end of file
diff --git a/rsc/scripts/setup_server.sql b/rsc/scripts/setup_server.sql
index ddb1826..a4e3e5b 100644
--- a/rsc/scripts/setup_server.sql
+++ b/rsc/scripts/setup_server.sql
@@ -1,8 +1,8 @@
---TODO: (9) An archive table of all dead characters
+--TODO: (3) An archive table of all dead characters
 
 CREATE TABLE IF NOT EXISTS Accounts (
 	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	username	varchar(100) UNIQUE, --TODO: (9) Swap username for email address
+	username	varchar(100) UNIQUE, --TODO: (3) Swap username for email address
 
 	--server-client security
 --	passhash	varchar(100),
diff --git a/server/server_methods.cpp b/server/server_methods.cpp
index 7d1d632..e1eb5c3 100644
--- a/server/server_methods.cpp
+++ b/server/server_methods.cpp
@@ -85,5 +85,5 @@ void ServerApplication::hAdminShutdownRequest(ClientPacket* const argPacket) {
 }
 
 void ServerApplication::SaveServerState() {
-	//TODO: (9) ServerApplication::SaveServerState()
+	//TODO: (2) Periodic mass server saves
 }
diff --git a/server/waypoints/waypoint_manager.hpp b/server/waypoints/waypoint_manager.hpp
index 91bc3d0..b1d9bdf 100644
--- a/server/waypoints/waypoint_manager.hpp
+++ b/server/waypoints/waypoint_manager.hpp
@@ -32,6 +32,7 @@
 #include <map>
 #include <string>
 
+//TODO: (1) rename this system to the "trigger" system
 class WaypointManager {
 public:
 	WaypointManager();
diff --git a/todo.txt b/todo.txt
index 7f22396..7916115 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,21 +1,18 @@
 TODO: upgrade to lua 5.3
 TODO: Split config.cfg in two, one for the server and the client
 
-TODO: In need of script APIs (list)
-	* Characters
-
 TODO: Account passwords (list)
 	* backbone account server OR
 	* social network login OR
 	* ...
 	* salts & hashes
+	* login screen prompting for username & password
 
 TODO: Features
 	* Make sure login errors are sent to the client
 	* Add the "home" parameter to the server's config file
-	* Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc.
+	* Waypoints, with positions and trigger zones (collision areas) for doors, monster spawns, etc. (trigger system)
 	* Fix shoddy movement
-	* Periodic mass server saves
 	* Remove the big "Shut Down" button (currently broken...)
 	* Make a way for the server owner to control the server directly
 	* The TileSheet class should implement the surface itself
@@ -24,6 +21,4 @@ TODO: Features
 	* Fix the const-ness of accessors
 	* Add a screenshot of the game to README.md
 	* joystick/gamepad support
-	* add the tilesheet to the map system
-	* ping/delay displayed in the lobby
-	* login screen prompting for username & password
\ No newline at end of file
+	* add the tilesheet to the map system
\ No newline at end of file