diff --git a/common/map/region_pager.cpp b/common/map/region_pager.cpp
index 8b2517a..f0275be 100644
--- a/common/map/region_pager.cpp
+++ b/common/map/region_pager.cpp
@@ -51,8 +51,6 @@ Region* RegionPagerBase::GetRegion(int x, int y) {
 	y = snapToBase(regionHeight, y);
 
 	//get the region by various means
-
-	//TODO: revert this try/catch point
 	Region* ptr = nullptr;
 	ptr = FindRegion(x, y);
 	if (ptr) return ptr;
diff --git a/server/server_application.cpp b/server/server_application.cpp
index 0ce7bd3..b170355 100644
--- a/server/server_application.cpp
+++ b/server/server_application.cpp
@@ -38,7 +38,7 @@ int runSQLScript(sqlite3* db, std::string fname) {
 	string script;
 	getline(is, script, '\0');
 	is.close();
-	//TODO: flesh out this error if needed
+	//NOTE: flesh out this error if needed
 	if (sqlite3_exec(db, script.c_str(), nullptr, nullptr, nullptr) != SQLITE_OK) {
 		return -2;
 	}
@@ -201,6 +201,7 @@ void ServerApplication::HandleBroadcastRequest(NetworkPacket packet) {
 	//TODO: version info
 	snprintf(packet.serverInfo.name, PACKET_STRING_SIZE, "%s", config["server.name"].c_str());
 	//TODO: player count
+	//TODO: map format
 	char buffer[PACKET_BUFFER_SIZE];
 	serialize(&packet, buffer);
 	network.Send(&packet.meta.srcAddress, buffer, PACKET_BUFFER_SIZE);
@@ -331,6 +332,7 @@ void ServerApplication::HandlePlayerNew(NetworkPacket packet) {
 
 void ServerApplication::HandlePlayerDelete(NetworkPacket packet) {
 	//TODO: remove this?
+	//TODO: authenticate who is deleting this player
 	if (playerMap.find(packet.playerInfo.playerIndex) == playerMap.end()) {
 		throw(std::runtime_error("Cannot delete a non-existant player"));
 	}