diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java
index 7352820..6394ee8 100644
--- a/src/main/java/de/fanta/challenges/Challenges.java
+++ b/src/main/java/de/fanta/challenges/Challenges.java
@@ -341,6 +341,7 @@
 
     public void setCurrentEditor(Player currentEditor) {
         this.currentEditor = currentEditor;
+        plugin.setFirstEditor(currentEditor);
         if (currentEditor != null) {
             ChatUtil.sendNormalMessage(currentEditor, "Du bist nun der Editor dieser Lobby!");
             ChatUtil.sendNormalMessage(currentEditor, "Alle Befehle und Funktionen vom Challenge Plugin findest du in unserem Wiki.");
diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java
index 794e4c9..83b9942 100644
--- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java
+++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/DeathrunChallengeEvent.java
@@ -94,9 +94,7 @@
     public void onDamage(EntityDamageEvent e) {
         if (e.getEntity() instanceof Player p) {
             if (Objects.equals(plugin.getConfig().getString("event.type"), "deathrun") && plugin.getTimer().isRunning()) {
-                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
-                    p.setWalkSpeed((float) (p.getHealth() / 100f));
-                }, 1L);
+                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> p.setWalkSpeed((float) (p.getHealth() / 100f)), 1L);
             }
         }
     }
@@ -243,7 +241,7 @@
                     if (!deadPlayer.contains(p.getUniqueId())) {
                         bossBar.setTitle(ChatUtil.GREEN + "Position: " + ChatUtil.BLUE + scoreManager.getPosition(new ChallengePlayer(p.getUniqueId())) + ChatUtil.RED + " | " + ChatUtil.GREEN + "Distanz zum Spawn: " + ChatUtil.BLUE + scoreManager.getScore(new ChallengePlayer(p.getUniqueId())) + " Blöcke");
                     } else {
-                        bossBar.setTitle(ChatUtil.GREEN + "Position: " + ChatUtil.BLUE + scoreManager.getPosition(new ChallengePlayer(p.getUniqueId())) + ChatUtil.RED + " | " + ChatUtil.GREEN + ChatColor.BOLD + "†" + ChatUtil.RED + "Distanz zum Spawn: " + ChatUtil.BLUE + scoreManager.getScore(new ChallengePlayer(p.getUniqueId())) + " Blöcke");
+                        bossBar.setTitle(ChatUtil.GREEN + "Position: " + ChatUtil.BLUE + scoreManager.getPosition(new ChallengePlayer(p.getUniqueId())) + ChatUtil.RED + " | " + ChatUtil.RED + ChatColor.BOLD + "† " + ChatUtil.GREEN + "Distanz zum Spawn: " + ChatUtil.RED + scoreManager.getScore(new ChallengePlayer(p.getUniqueId())) + " Blöcke");
                     }
                 }
             }
diff --git a/src/main/java/de/fanta/challenges/commands/event/EventGetScoreCommand.java b/src/main/java/de/fanta/challenges/commands/event/EventGetScoreCommand.java
index e620574..1d14aa9 100644
--- a/src/main/java/de/fanta/challenges/commands/event/EventGetScoreCommand.java
+++ b/src/main/java/de/fanta/challenges/commands/event/EventGetScoreCommand.java
@@ -2,18 +2,15 @@
 
 import de.fanta.challenges.Challenges;
 import de.fanta.challenges.scoreboard.ChallengePlayer;
+import de.fanta.challenges.scoreboard.Scorable;
 import de.fanta.challenges.utils.ChatUtil;
 import de.iani.cubesideutils.bukkit.commands.SubCommand;
 import de.iani.cubesideutils.commands.ArgsParser;
 import org.bukkit.Bukkit;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.LinkedHashSet;
-import java.util.stream.Collectors;
-
 public class EventGetScoreCommand extends SubCommand {
     private final Challenges plugin;
 
@@ -40,7 +37,15 @@
                 ChatUtil.sendNormalMessage(sender, player.getName() + ": " + plugin.getScoreManager().getScore(new ChallengePlayer(player.getUniqueId())));
                 return true;
             } else {
-                ChatUtil.sendNormalMessage(sender, "Kapput");//plugin.getScoreManager().getScores().entrySet().stream().sorted((o1, o2) -> o1.getValue().compareTo(o2.getValue()) * -1).collect(Collectors.toCollection(LinkedHashSet::new))); //TODO GANZ MACHEN
+                if (plugin.getScoreManager().getScores().isEmpty()) {
+                    ChatUtil.sendWarningMessage(sender, "Aktuell gibt es keine Scores");
+                    return true;
+                }
+                for (Scorable scorable : plugin.getScoreManager().getScores().keySet()) {
+                    int position = plugin.getScoreManager().getPosition(scorable);
+                    int score = plugin.getScoreManager().getScore(scorable);
+                    ChatUtil.sendNormalMessage(sender, position + ". " + scorable.getIdentifier() + ": " + score);
+                }
             }
         } else {
             ChatUtil.sendErrorMessage(sender, "Keine Berechtigung!");
diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
index ed22994..f76ab68 100644
--- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
+++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java
@@ -56,7 +56,6 @@
                 Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> {
                     if (p.hasPermission("Challenges.editor")) {
                         plugin.setCurrentEditor(p);
-                        plugin.setFirstEditor(p);
 
                     } else {
                         ChatUtil.sendWarningMessage(p, "Es ist aktuell kein Editor in dieser Lobby");