diff --git a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
index 3ac99ca..25876ba 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java
@@ -15,7 +15,7 @@ import gent.zeus.mc13dtl.MC13DTL;
 
 public class EventRunner implements Runnable {
     static List<Event> currentEvents = new ArrayList<>();
-    public static List<Integer> startTimes = List.of(5000, 13000, 1000, 1000, 13000, 100, 1000, 500, 10000, 5000, 13000, 13000, 100);
+    public static List<Integer> startTimes = List.of(4000, 13000, 4000, 5000, 14000, 100, 1000, 500, 10000, 5000, 13000, 13000, 5000);
 
     private final List<Integer> dayScores = List.of(10, 20, 50, 100, 150, 250, 400, 600, 850, 1150, 1500, 2000, 3000);
 
@@ -45,8 +45,8 @@ public class EventRunner implements Runnable {
                 Event event = switch ((int) day) {
                     case 0 -> new SuicideEvent(team, difficulty, dayScore);
                     case 1 -> new KillMobs1Event(team, difficulty, dayScore);
-                    case 2 -> new CraftEvent(team, difficulty, dayScore);
-                    case 3 -> new MineEvent(team, difficulty, dayScore);
+                    case 2 -> new MineEvent(team, difficulty, dayScore);
+                    case 3 -> new CraftEvent(team, difficulty, dayScore);
                     case 4 -> new ClimbEvent(team, difficulty, dayScore);
                     case 5 -> new FallEvent(team, difficulty, dayScore);
                     case 6 -> new KillPlayerEvent(team, difficulty, dayScore);
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/CraftEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/CraftEvent.java
index 17a2491..f5fc7ca 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/CraftEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/CraftEvent.java
@@ -17,10 +17,10 @@ public class CraftEvent extends Event {
         super(team, difficulty, scoreOnSuccess);
         item = switch (difficulty) {
             case BABY -> Material.SHIELD;
-            case EASY -> Material.ENCHANTING_TABLE;
+            case EASY -> Material.COMPASS;
             case MEDIUM -> Material.REDSTONE_LAMP;
             case HARD -> Material.BREWING_STAND;
-            case SWEAT -> Material.STICKY_PISTON;
+            case SWEAT -> Material.RESPAWN_ANCHOR;
             case IMPOSSIBLE -> Material.BEACON;
         };
     }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs1Event.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs1Event.java
index 8bba76f..9b02b95 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs1Event.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs1Event.java
@@ -25,6 +25,7 @@ public class KillMobs1Event extends Event {
                 Difficulty.EASY, new Pair<>(EntityType.ZOMBIE, 3),
                 Difficulty.MEDIUM, new Pair<>(EntityType.ZOMBIE, 6),
                 Difficulty.HARD, new Pair<>(EntityType.SKELETON, 4),
+                Difficulty.SWEAT, new Pair<>(EntityType.CREEPER, 6),
                 Difficulty.IMPOSSIBLE, new Pair<>(EntityType.ENDERMAN, 4));
         monster = monsters.get(difficulty).getFirst();
         killsLeft = monsters.get(difficulty).getSecond();
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs2Event.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs2Event.java
index 5c6fdd4..7b78233 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs2Event.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillMobs2Event.java
@@ -23,9 +23,10 @@ public class KillMobs2Event extends Event {
         Map<Difficulty, Pair<EntityType, Integer>> monsters = Map.of(
                 Difficulty.BABY, new Pair<>(EntityType.CREEPER, 3),
                 Difficulty.EASY, new Pair<>(EntityType.PIGLIN, 3),
-                Difficulty.MEDIUM, new Pair<>(EntityType.GHAST, 2),
-                Difficulty.HARD, new Pair<>(EntityType.BLAZE, 3),
-                Difficulty.IMPOSSIBLE, new Pair<>(EntityType.WITHER, 1));
+                Difficulty.MEDIUM, new Pair<>(EntityType.GHAST, 1),
+                Difficulty.HARD, new Pair<>(EntityType.HOGLIN, 4),
+                Difficulty.SWEAT, new Pair<>(EntityType.WITHER, 4),
+                Difficulty.IMPOSSIBLE, new Pair<>(EntityType.WARDEN, 1));
         monster = monsters.get(difficulty).getFirst();
         killsLeft = monsters.get(difficulty).getSecond();
     }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillPlayerEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillPlayerEvent.java
index 7bed7f0..cf6bea7 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillPlayerEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillPlayerEvent.java
@@ -52,6 +52,6 @@ public class KillPlayerEvent extends Event {
 
     @Override
     protected String getMessage() {
-        return "Your team has to kill another player in team " + huntingTeam.getName() + " before dawn";
+        return "Your team has to kill another player in team " + huntingTeam.getName() + " before next dawn";
     }
 }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/StructureEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/StructureEvent.java
index fac78ee..a9ba070 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/StructureEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/StructureEvent.java
@@ -13,7 +13,7 @@ import org.bukkit.util.StructureSearchResult;
 public class StructureEvent extends Event {
 
     enum StructureType {
-        RUINED_PORTAL, VILLAGE, PYRAMID, SWAMP_HUT, FORTRESS, END_CITY
+        RUINED_PORTAL, VILLAGE, PYRAMID, SWAMP_HUT, STRONGHOLD, END_CITY
     }
 
     private final StructureType structure;
@@ -25,7 +25,7 @@ public class StructureEvent extends Event {
             case EASY -> StructureType.VILLAGE;
             case MEDIUM -> StructureType.PYRAMID;
             case HARD -> StructureType.SWAMP_HUT;
-            case SWEAT -> StructureType.FORTRESS;
+            case SWEAT -> StructureType.STRONGHOLD;
             case IMPOSSIBLE -> StructureType.END_CITY;
         };
     }
@@ -33,13 +33,15 @@ public class StructureEvent extends Event {
     @Override
     public void run() {
         Structure[] structures = switch (structure) {
-            case RUINED_PORTAL -> new Structure[] { Structure.RUINED_PORTAL, Structure.RUINED_PORTAL_DESERT, Structure.RUINED_PORTAL_JUNGLE, Structure.RUINED_PORTAL_MOUNTAIN, Structure.RUINED_PORTAL_NETHER,
-                    Structure.RUINED_PORTAL_OCEAN, Structure.RUINED_PORTAL_SWAMP };
-            case END_CITY -> new Structure[] { Structure.END_CITY };
-            case FORTRESS -> new Structure[] { Structure.FORTRESS };
-            case PYRAMID -> new Structure[] { Structure.DESERT_PYRAMID, Structure.JUNGLE_PYRAMID };
-            case SWAMP_HUT -> new Structure[] { Structure.SWAMP_HUT };
-            case VILLAGE -> new Structure[] { Structure.VILLAGE_DESERT, Structure.VILLAGE_PLAINS, Structure.VILLAGE_SAVANNA, Structure.VILLAGE_SNOWY, Structure.VILLAGE_TAIGA };
+            case RUINED_PORTAL ->
+                    new Structure[]{Structure.RUINED_PORTAL, Structure.RUINED_PORTAL_DESERT, Structure.RUINED_PORTAL_JUNGLE, Structure.RUINED_PORTAL_MOUNTAIN, Structure.RUINED_PORTAL_NETHER,
+                            Structure.RUINED_PORTAL_OCEAN, Structure.RUINED_PORTAL_SWAMP};
+            case END_CITY -> new Structure[]{Structure.END_CITY};
+            case STRONGHOLD -> new Structure[]{Structure.STRONGHOLD};
+            case PYRAMID -> new Structure[]{Structure.DESERT_PYRAMID, Structure.JUNGLE_PYRAMID};
+            case SWAMP_HUT -> new Structure[]{Structure.SWAMP_HUT};
+            case VILLAGE ->
+                    new Structure[]{Structure.VILLAGE_DESERT, Structure.VILLAGE_PLAINS, Structure.VILLAGE_SAVANNA, Structure.VILLAGE_SNOWY, Structure.VILLAGE_TAIGA};
         };
 
         for (Player player : MC13DTL.board.getPlayers(team)) {
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java
index cb3d237..e0d9f37 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java
@@ -15,7 +15,14 @@ public class SuicideEvent extends Event {
     public SuicideEvent(Team team, Difficulty difficulty, int scoreOnSuccess) {
         super(team, difficulty, scoreOnSuccess);
 
-        timeLeft = ((Difficulty.IMPOSSIBLE.ordinal() + 1) - difficulty.ordinal()) * 10;
+        timeLeft = switch (difficulty) {
+            case BABY -> 300;
+            case EASY -> 240;
+            case MEDIUM -> 100;
+            case HARD -> 60;
+            case SWEAT -> 30;
+            case IMPOSSIBLE -> 10;
+        };
     }
 
     @Override