diff --git a/modules/achievements/module.json b/modules/achievements/module.json
index 94203a53..30147329 100644
--- a/modules/achievements/module.json
+++ b/modules/achievements/module.json
@@ -3,7 +3,7 @@
   "description": "Unlock and track user achievements. (Coming late-2024)",
   "icon": "medal",
   "tags": [
-    "game"
+    "competitive"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/analytics/module.json b/modules/analytics/module.json
index b1e72a23..43db7b48 100644
--- a/modules/analytics/module.json
+++ b/modules/analytics/module.json
@@ -3,7 +3,7 @@
   "description": "Track and visualize user behavior data. (Coming mid-2024)",
   "icon": "chart-line",
   "tags": [
-    "game"
+    "analytics"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/chat/module.json b/modules/chat/module.json
index 81bdfc83..d12f5373 100644
--- a/modules/chat/module.json
+++ b/modules/chat/module.json
@@ -3,7 +3,7 @@
   "description": "In-game player-to-player messaging. (Coming late-2024)",
   "icon": "messages",
   "tags": [
-    "game"
+    "social"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/currency/module.json b/modules/currency/module.json
index 1ff86320..952509de 100644
--- a/modules/currency/module.json
+++ b/modules/currency/module.json
@@ -6,7 +6,8 @@
 		"economy"
 	],
 	"authors": [
-		"ABCxFF"
+		"ABCxFF",
+    "NathanFlurry"
 	],
 	"status": "preview",
 	"dependencies": {
diff --git a/modules/email/module.json b/modules/email/module.json
index 14396f34..afb18dc6 100644
--- a/modules/email/module.json
+++ b/modules/email/module.json
@@ -3,7 +3,8 @@
 	"description": "Send emails using multiple providers.",
 	"icon": "envelope",
 	"tags": [
-		"email"
+		"email",
+    "utility"
 	],
 	"authors": [
 		"rivet-gg",
diff --git a/modules/game_saves/module.json b/modules/game_saves/module.json
index 51ed3c13..81d62066 100644
--- a/modules/game_saves/module.json
+++ b/modules/game_saves/module.json
@@ -3,7 +3,7 @@
   "description": "Store and manage player progress data or world state. (Coming mid-2024)",
   "icon": "floppy-disk",
   "tags": [
-    "game"
+    "utility"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/groups/module.json b/modules/groups/module.json
index afbd74eb..1f081c88 100644
--- a/modules/groups/module.json
+++ b/modules/groups/module.json
@@ -3,7 +3,7 @@
   "description": "Group users in groups/clans/guilds. (Coming late-2024)",
   "icon": "user-group",
   "tags": [
-    "game"
+    "social"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/leaderboards/module.json b/modules/leaderboards/module.json
index 94485045..21dac049 100644
--- a/modules/leaderboards/module.json
+++ b/modules/leaderboards/module.json
@@ -3,7 +3,7 @@
   "description": "Track and display top player rankings. (Coming mid-2024)",
   "icon": "ranking-star",
   "tags": [
-    "game"
+    "competitive"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/matchmaker/module.json b/modules/matchmaker/module.json
index 042c1264..31f42df3 100644
--- a/modules/matchmaker/module.json
+++ b/modules/matchmaker/module.json
@@ -3,7 +3,7 @@
   "description": "Ticket-based matchmaking that balances skill, latency, and more. (Coming mid-2024)",
   "icon": "chess-knight",
   "tags": [
-    "game"
+    "multiplayer"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/parties/module.json b/modules/parties/module.json
index a0cc2c59..47f10d36 100644
--- a/modules/parties/module.json
+++ b/modules/parties/module.json
@@ -3,7 +3,7 @@
   "description": "Real-time player groups. Integrates with matchmaking. (Coming mid-2024)",
   "icon": "party-horn",
   "tags": [
-    "game"
+    "multiplayer"
   ],
   "authors": [],
   "status": "coming_soon",
diff --git a/modules/rate_limit/module.json b/modules/rate_limit/module.json
index 5542b31e..265144f9 100644
--- a/modules/rate_limit/module.json
+++ b/modules/rate_limit/module.json
@@ -4,7 +4,8 @@
 	"icon": "gauge-circle-minus",
 	"tags": [
 		"core",
-		"utility"
+		"utility",
+    "security"
 	],
 	"authors": [
 		"rivet-gg",
diff --git a/modules/rivet/module.json b/modules/rivet/module.json
index 3badcd2e..adae96f1 100644
--- a/modules/rivet/module.json
+++ b/modules/rivet/module.json
@@ -1,7 +1,7 @@
 {
 	"status": "stable",
-	"name": "Rivet API",
-	"description": "Helper for calling the Rivet API.",
+	"name": "Rivet",
+	"description": "Open-source game servers & backend for multiplayer games.",
 	"icon": "r",
 	"tags": [
 		"core",
diff --git a/modules/tokens/module.json b/modules/tokens/module.json
index 6c9853dc..ed84abfd 100644
--- a/modules/tokens/module.json
+++ b/modules/tokens/module.json
@@ -4,7 +4,8 @@
 	"icon": "lock",
 	"tags": [
 		"core",
-		"utility"
+		"utility",
+    "security"
 	],
 	"authors": [
 		"rivet-gg",
diff --git a/modules/uploads/module.json b/modules/uploads/module.json
index 76fc886a..82fee918 100644
--- a/modules/uploads/module.json
+++ b/modules/uploads/module.json
@@ -34,6 +34,8 @@
 			"public": false
 		},
 		"fetch_public_file_urls": {
+			"name": "Fetch Public File URLs",
+			"description": "Returns public presigned URLs for specified files in an upload",
 			"public": false
 		}
 	},
@@ -85,4 +87,4 @@
 		}
 	},
 	"dependencies": {}
-}
\ No newline at end of file
+}
diff --git a/modules/user_passwords/module.json b/modules/user_passwords/module.json
index 885684e1..ac2c34f9 100644
--- a/modules/user_passwords/module.json
+++ b/modules/user_passwords/module.json
@@ -42,4 +42,4 @@
             "name": "Password is Invalid"
         }
     }
-}
\ No newline at end of file
+}