diff --git a/commands/commands.go b/commands/commands.go
index e2bcfab..2f37bb8 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -49,7 +49,7 @@ func help(update tgbotapi.Update, bot *tgbotapi.BotAPI) {
 		"<code>/help </code><i>Sends this help message</i>" + "\n" +
 		"<code>/gp </code><i>List Gaypoints for user or group</i>" + "\n" +
 		"<code>/remindme 2m,5h,7d &lt;message&gt; </code> <i>Send a reminder message in 2 minutes, 5 hours, 7 days</i>" + "\n\n" +
-		"<b>Admin Commands:</b>" + "\n\n" +
+		"<b>Admin Commands:</b>" + "\n" +
 		"<code>/addgp &lt;amount&gt; </code>   <i>Add Gaypoints to User</i>" + "\n" +
 		"<code>/subtractgp &lt;amount&gt; </code>   <i>Add Gaypoints to User</i>" + "\n"
 
diff --git a/commands/gaypoints/gaypoints.go b/commands/gaypoints/gaypoints.go
index 53de4ab..2441d4e 100644
--- a/commands/gaypoints/gaypoints.go
+++ b/commands/gaypoints/gaypoints.go
@@ -42,13 +42,13 @@ func GetGP(update tgbotapi.Update, bot *tgbotapi.BotAPI) {
 	gps := sqlGetAllGP(update.Message.Chat.ID)
 
 	var messagetext string
-	for userid, points := range gps {
-		currentUser := botIO.GetUserByID(update.Message.Chat.ID, userid, bot)
+	for _, gaypointInfo := range gps {
+		currentUser := botIO.GetUserByID(update.Message.Chat.ID, gaypointInfo.userID, bot)
 		currentName := currentUser.User.FirstName
 		if currentUser.User.UserName != "" {
 			currentName = currentUser.User.UserName
 		}
-		text := `<a href="` + `tg://user?id=` + strconv.FormatInt(userid, 10) + `">` + currentName + `</a>` + ` currently has ` + `<b>` + strconv.FormatInt(points, 10) + `</b>` + ` gaypoints` + "\n"
+		text := `<a href="` + `tg://user?id=` + strconv.FormatInt(gaypointInfo.userID, 10) + `">` + currentName + `</a>` + ` currently has ` + `<b>` + strconv.FormatInt(gaypointInfo.gaypoints, 10) + `</b>` + ` gaypoints` + "\n"
 
 		messagetext = messagetext + text
 	}
diff --git a/commands/gaypoints/sql.go b/commands/gaypoints/sql.go
index 27c306d..f570ec9 100644
--- a/commands/gaypoints/sql.go
+++ b/commands/gaypoints/sql.go
@@ -13,21 +13,21 @@ var gpSelectChat *sql.Stmt
 
 var gpSet *sql.Stmt
 
-func sqlGetAllGP(chatid int64) (gaypoints map[int64]int64) {
+func sqlGetAllGP(chatid int64) (gaypoints []gaypointShortDetails) {
 	rows, err := gpSelectChat.Query(chatid)
 	if err != nil {
 		log.Panicf("Failed to query gaypoints: %v\n", err)
 	}
 
-	gaypoints = make(map[int64]int64)
 	var c int64
 	var b int64
 	for rows.Next() {
 		switch err := rows.Scan(&c, &b); err {
-		case sql.ErrNoRows:
-			gaypoints[c] = -1
 		case nil:
-			gaypoints[c] = b
+			gaypoints = append(gaypoints, gaypointShortDetails{
+				userID:    c,
+				gaypoints: b,
+			})
 		default:
 			log.Panicf("Failed to query gaypoints: %v\n", err)