diff --git a/src/main/java/com/github/thethingyee/bridgingpractice/Commands.java b/src/main/java/com/github/thethingyee/bridgingpractice/Commands.java
index 160ae56..6fdfc12 100644
--- a/src/main/java/com/github/thethingyee/bridgingpractice/Commands.java
+++ b/src/main/java/com/github/thethingyee/bridgingpractice/Commands.java
@@ -62,7 +62,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
                             bridgingPractice.getWorldArray().add(player.getUniqueId().toString().replaceAll("-", ""));
 
-                            String schematicName = (args.length == 2) ? args[1] : "default";
+                            String schematicName = (args.length == 2) ? args[1] : file.getName().replaceAll(".schematic", "");
 
                             File prev = file;
                             file = customSchematicFound ? prev : new File(bridgingPractice.getDataFolder() + File.separator + "/schematics/" + bridgingPractice.getConfig().getString("defaults.schematic"));
diff --git a/src/main/java/com/github/thethingyee/bridgingpractice/PlayerSpeed.java b/src/main/java/com/github/thethingyee/bridgingpractice/PlayerSpeed.java
index f776cdc..bfaa031 100644
--- a/src/main/java/com/github/thethingyee/bridgingpractice/PlayerSpeed.java
+++ b/src/main/java/com/github/thethingyee/bridgingpractice/PlayerSpeed.java
@@ -21,7 +21,9 @@ public void startPlayerSpeed(Player player) {
             Location oldLoc = player.getLocation();
             @Override
             public void run() {
+                oldLoc.setY(0.0);
                 Location newLoc = player.getLocation();
+                newLoc.setY(0.0);
                 double equation = newLoc.distance(oldLoc) * 2;
                 hMaps.getPlayerSpeed().put(player, equation);
                 oldLoc = newLoc;
diff --git a/src/main/java/com/github/thethingyee/bridgingpractice/ScoreboardManager.java b/src/main/java/com/github/thethingyee/bridgingpractice/ScoreboardManager.java
index e3f35ff..13763b8 100644
--- a/src/main/java/com/github/thethingyee/bridgingpractice/ScoreboardManager.java
+++ b/src/main/java/com/github/thethingyee/bridgingpractice/ScoreboardManager.java
@@ -31,6 +31,8 @@ public void run() {
                             "",
                             "Name: " + ChatColor.GREEN + player.getName(),
                             "",
+                            "Map: " + ChatColor.GREEN + hMaps.getPlayerSchematic().get(player),
+                            "",
                             "Blocks Placed: " + ChatColor.GREEN + hMaps.getBlocksPlaced().get(player),
                             "Speed: " + ChatColor.GREEN + String.format("%.2f", hMaps.getPlayerSpeed().get(player)) + " m/s",
                             "",
@@ -56,6 +58,8 @@ public void run() {
                                 "",
                                 "Name: " + ChatColor.GREEN + target.getName(),
                                 "",
+                                "Map: " + ChatColor.GREEN + hMaps.getPlayerSchematic().get(target),
+                                "",
                                 "Blocks Placed: " + ChatColor.GREEN + hMaps.getBlocksPlaced().get(target),
                                 "Speed: " + ChatColor.GREEN + String.format("%.2f", hMaps.getPlayerSpeed().get(target)) + " m/s",
                                 "",
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index f85e63a..c9fab41 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -7,6 +7,11 @@ commands:
     aliases:
       - bridging
       - b
+      - iamasweatybridger
+      - deeznuts
+      - suckingass
+      - gay
+      - urmom
     usage: "/<command> <practice|leave|changecolor|restart>"
     description: "The main command for the BridgingPractice Plugin."