diff --git a/client/gameplay_scenes/world_characters.cpp b/client/gameplay_scenes/world_characters.cpp
index 4d40c4c..c790bb6 100644
--- a/client/gameplay_scenes/world_characters.cpp
+++ b/client/gameplay_scenes/world_characters.cpp
@@ -69,7 +69,7 @@ void World::hCharacterCreate(CharacterPacket* const argPacket) {
 	//fill the character's info
 	character->SetOrigin(argPacket->origin);
 	character->SetMotion(argPacket->motion);
-	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT}); //TODO: (1) send the bounds from the server
+	character->SetBounds({CHARACTER_BOUNDS_X, CHARACTER_BOUNDS_Y, CHARACTER_BOUNDS_WIDTH, CHARACTER_BOUNDS_HEIGHT}); //TODO: (2) send the bounds from the server
 	character->SetHandle(argPacket->handle);
 	character->SetAvatar(argPacket->avatar);
 	character->SetOwner(argPacket->accountIndex);
diff --git a/client/gameplay_scenes/world_logic.cpp b/client/gameplay_scenes/world_logic.cpp
index b766140..1085e84 100644
--- a/client/gameplay_scenes/world_logic.cpp
+++ b/client/gameplay_scenes/world_logic.cpp
@@ -60,7 +60,7 @@ World::World(int* const argClientIndex,	int* const argAccountIndex):
 	shutDownButton.SetText("Shut Down");
 
 	//load the tilesheet
-	//TODO: (1) Tile size and tile sheet should be loaded elsewhere
+	//TODO: (2) Tile size and tile sheet should be loaded elsewhere
 	tileSheet.Load(config["dir.tilesets"] + "overworld.bmp", 32, 32);
 
 	//Send the character data
@@ -221,7 +221,7 @@ void World::KeyDown(SDL_KeyboardEvent const& key) {
 	//hotkeys
 	switch(key.keysym.sym) {
 		case SDLK_ESCAPE:
-			//TODO: (1) the escape key should actually control menus and stuff
+			//TODO: (3) the escape key should actually control menus and stuff
 			SendLogoutRequest();
 		return;
 	}
diff --git a/client/menu_scenes/lobby_menu.cpp b/client/menu_scenes/lobby_menu.cpp
index d4dcc81..358d5ca 100644
--- a/client/menu_scenes/lobby_menu.cpp
+++ b/client/menu_scenes/lobby_menu.cpp
@@ -107,8 +107,8 @@ void LobbyMenu::Render(SDL_Surface* const screen) {
 	join.DrawTo(screen);
 	back.DrawTo(screen);
 
-	//TODO: (1) draw headers for the server list
-	//TODO: (1) ping/delay displayed in the server list
+	//TODO: (3) draw headers for the server list
+	//TODO: (3) 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/server/characters/character_manager_api.cpp b/server/characters/character_manager_api.cpp
index d9792d7..378e848 100644
--- a/server/characters/character_manager_api.cpp
+++ b/server/characters/character_manager_api.cpp
@@ -75,7 +75,7 @@ static int getLoadedCount(lua_State* L) {
 }
 
 static int forEach(lua_State* L) {
-	//TODO: (1) find a way to update the clients when a script alters a character's data
+	//TODO: (9) forEach()
 }
 
 static const luaL_Reg characterManagerLib[] = {
diff --git a/server/server_character_methods.cpp b/server/server_character_methods.cpp
index 69246de..57b36e7 100644
--- a/server/server_character_methods.cpp
+++ b/server/server_character_methods.cpp
@@ -205,7 +205,7 @@ void ServerApplication::hCharacterMovement(CharacterPacket* const argPacket) {
 
 	//check if allowed
 	if (characterData->GetOwner() != argPacket->accountIndex && !accountData->GetModerator() && !accountData->GetAdministrator()) {
-		//TODO: (2) send to the client?
+		//TODO: (3) send to the client?
 		std::cerr << "Failed to set character motion due to lack of permissions targeting uid(" << argPacket->characterIndex << ")" << std::endl;
 		return;
 	}
diff --git a/server/server_methods.cpp b/server/server_methods.cpp
index e1eb5c3..d71c2ad 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: (2) Periodic mass server saves
+	//TODO: (3) Periodic mass server saves
 }
diff --git a/server/triggers/trigger_manager.hpp b/server/triggers/trigger_manager.hpp
index 505d506..2a1c9d7 100644
--- a/server/triggers/trigger_manager.hpp
+++ b/server/triggers/trigger_manager.hpp
@@ -32,7 +32,6 @@
 #include <map>
 #include <string>
 
-//TODO: (1) rename this system to the "trigger" system
 class TriggerManager {
 public:
 	TriggerManager();
diff --git a/server/triggers/trigger_manager_api.cpp b/server/triggers/trigger_manager_api.cpp
index f54df9c..6530266 100644
--- a/server/triggers/trigger_manager_api.cpp
+++ b/server/triggers/trigger_manager_api.cpp
@@ -23,7 +23,7 @@
 
 #include "trigger_manager.hpp"
 
-//TODO: figure out a way to iterate through elements of managers from lua
+//TODO: (1) figure out a way to iterate through elements of managers from lua
 
 static int create(lua_State* L) {
 	TriggerManager* mgr = static_cast<TriggerManager*>(lua_touserdata(L, 1));