diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/FletchingScreenHandler.java b/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/FletchingScreenHandler.java
index e9531b22..864367e3 100644
--- a/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/FletchingScreenHandler.java
+++ b/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/FletchingScreenHandler.java
@@ -12,10 +12,10 @@ import net.minecraft.screen.slot.ForgingSlotsManager;
 import net.minecraft.screen.slot.Slot;
 
 import java.util.IdentityHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.List;
 
 public class FletchingScreenHandler extends ForgingScreenHandler {
 
@@ -74,13 +74,12 @@ public class FletchingScreenHandler extends ForgingScreenHandler {
         getSlot(2).setStack(recipe.get().getValue().apply(stack));
     }
 
-    //FIXME
     @Override
     protected ForgingSlotsManager getForgingSlotsManager() {
         return ForgingSlotsManager.create()
-                .input(0, 8, 48, stack -> stack.getItem() instanceof BowItem)
-                .input(1, 26, 48, stack -> stack.getItem() == Items.STRING)
-                .output(0, 98, 48).build();
+                .input(0, 27, 47, stack -> true)
+                .input(1, 76, 47, stack -> true)
+                .output(0, 134, 47).build();
     }
 
     @Override
diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/client/FletchingScreen.java b/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/client/FletchingScreen.java
index 6430ef07..e85f1f95 100644
--- a/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/client/FletchingScreen.java
+++ b/src/main/java/me/melontini/andromeda/modules/blocks/better_fletching_table/client/FletchingScreen.java
@@ -28,8 +28,8 @@ public class FletchingScreen extends ForgingScreen<FletchingScreenHandler> {
 
     @Override
     protected void drawInvalidRecipeArrow(DrawContext context, int x, int y) {
-        if ((handler.getSlot(0).hasStack() && !handler.getSlot(1).hasStack()) || (!handler.getSlot(0).hasStack() && handler.getSlot(1).hasStack())) {
-            context.drawTexture(TEXTURE, x + 65, y + 46, this.backgroundWidth, 0, 28, 21);
+        if (handler.getSlot(0).hasStack() && handler.getSlot(1).hasStack() && !handler.getSlot(2).hasStack()) {
+            context.drawTexture(TEXTURE, x + 99, y + 45, this.backgroundWidth, 0, 28, 21);
         }
     }
 }
diff --git a/src/main/java/me/melontini/andromeda/modules/entities/boats/items/AndromedaBoatItem.java b/src/main/java/me/melontini/andromeda/modules/entities/boats/items/AndromedaBoatItem.java
index 59423371..48c922ef 100644
--- a/src/main/java/me/melontini/andromeda/modules/entities/boats/items/AndromedaBoatItem.java
+++ b/src/main/java/me/melontini/andromeda/modules/entities/boats/items/AndromedaBoatItem.java
@@ -1,6 +1,6 @@
 package me.melontini.andromeda.modules.entities.boats.items;
 
-import me.melontini.andromeda.util.MiscUtil;
+import me.melontini.andromeda.common.util.MiscUtil;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.vehicle.BoatEntity;
diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/Content.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/Content.java
index e78b5528..a6441ebf 100644
--- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/Content.java
+++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/Content.java
@@ -33,7 +33,6 @@ import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
 
 import static me.melontini.andromeda.common.registries.Common.id;
-import static me.melontini.andromeda.common.registries.Common.run;
 import static me.melontini.andromeda.util.CommonValues.MODID;
 
 public class Content {
@@ -65,7 +64,7 @@ public class Content {
             AndromedaLog.error("DispenserBlock.BEHAVIORS is not Object2ObjectMap! Can't override default dispense behavior!");
         }
 
-        BRICKED = run(() -> RegistryKey.of(RegistryKeys.DAMAGE_TYPE, id("bricked")));
+        BRICKED = RegistryKey.of(RegistryKeys.DAMAGE_TYPE, id("bricked"));
 
         ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
             var packet = sendItemsS2CPacket();
diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/DefaultBehaviors.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/DefaultBehaviors.java
index 1787996c..95578060 100644
--- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/DefaultBehaviors.java
+++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/DefaultBehaviors.java
@@ -1,7 +1,7 @@
 package me.melontini.andromeda.modules.mechanics.throwable_items.data;
 
+import me.melontini.andromeda.common.util.MiscUtil;
 import me.melontini.andromeda.modules.mechanics.throwable_items.Content;
-import me.melontini.andromeda.util.MiscUtil;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.block.AbstractFireBlock;