diff --git a/core/assets-raw/sprites/units/risse-cell.png b/core/assets-raw/sprites/units/risse-cell.png
new file mode 100644
index 0000000000..f01db0e5b1
Binary files /dev/null and b/core/assets-raw/sprites/units/risse-cell.png differ
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 3a56609b84..fff82dc5de 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1702,7 +1702,7 @@ public class Blocks implements ContentList{
         navalFactory = new UnitFactory("naval-factory"){{
             requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.risse, 200f, with(Items.silicon, 10)),
+                new UnitPlan(UnitTypes.risse, 200f, with(Items.silicon, 20, Items.metaglass, 25)),
             };
             size = 3;
             requiresWater = true;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 2928c791e3..d85acf1b54 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -672,7 +672,7 @@ public class UnitTypes implements ContentList{
             speed = 1.1f;
             drag = 0.13f;
             hitsize = 9f;
-            health = 200;
+            health = 220;
             immunities = ObjectSet.with(StatusEffects.wet);
             weapons.add(new Weapon("mount-weapon"){{
                 reload = 12f;
diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java
index 354bcf4014..29178f3976 100644
--- a/core/src/mindustry/editor/MapResizeDialog.java
+++ b/core/src/mindustry/editor/MapResizeDialog.java
@@ -27,7 +27,7 @@ public class MapResizeDialog extends BaseDialog{
                 table.field((w ? width : height) + "", TextFieldFilter.digitsOnly, value -> {
                     int val = Integer.parseInt(value);
                     if(w) width = val; else height = val;
-                }).valid(value -> Strings.canParsePostiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).addInputDialog(3);
+                }).valid(value -> Strings.canParsePositiveInt(value) && Integer.parseInt(value) <= maxSize && Integer.parseInt(value) >= minSize).addInputDialog(3);
 
                 table.row();
             }
diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java
index 77574793af..56ecfa9de3 100644
--- a/core/src/mindustry/editor/WaveInfoDialog.java
+++ b/core/src/mindustry/editor/WaveInfoDialog.java
@@ -149,14 +149,14 @@ public class WaveInfoDialog extends BaseDialog{
                     t.row();
                     t.table(spawns -> {
                         spawns.field("" + (group.begin + 1), TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePositiveInt(text)){
                                 group.begin = Strings.parseInt(text) - 1;
                                 updateWaves();
                             }
                         }).width(100f);
                         spawns.add("$waves.to").padLeft(4).padRight(4);
                         spawns.field(group.end == never ? "" : (group.end + 1) + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePositiveInt(text)){
                                 group.end = Strings.parseInt(text) - 1;
                                 updateWaves();
                             }else if(text.isEmpty()){
@@ -169,7 +169,7 @@ public class WaveInfoDialog extends BaseDialog{
                     t.table(p -> {
                         p.add("$waves.every").padRight(4);
                         p.field(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text) && Strings.parseInt(text) > 0){
+                            if(Strings.canParsePositiveInt(text) && Strings.parseInt(text) > 0){
                                 group.spacing = Strings.parseInt(text);
                                 updateWaves();
                             }
@@ -180,7 +180,7 @@ public class WaveInfoDialog extends BaseDialog{
                     t.row();
                     t.table(a -> {
                         a.field(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePositiveInt(text)){
                                 group.unitAmount = Strings.parseInt(text);
                                 updateWaves();
                             }
@@ -198,7 +198,7 @@ public class WaveInfoDialog extends BaseDialog{
                     t.row();
                     t.table(a -> {
                         a.field((int)group.shields + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePositiveInt(text)){
                                 group.shields = Strings.parseInt(text);
                                 updateWaves();
                             }
@@ -206,7 +206,7 @@ public class WaveInfoDialog extends BaseDialog{
 
                         a.add(" + ");
                         a.field((int)group.shieldScaling + "", TextFieldFilter.digitsOnly, text -> {
-                            if(Strings.canParsePostiveInt(text)){
+                            if(Strings.canParsePositiveInt(text)){
                                 group.shieldScaling = Strings.parseInt(text);
                                 updateWaves();
                             }
diff --git a/core/src/mindustry/ui/dialogs/LoadoutDialog.java b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
index e367bc08da..079b5b5245 100644
--- a/core/src/mindustry/ui/dialogs/LoadoutDialog.java
+++ b/core/src/mindustry/ui/dialogs/LoadoutDialog.java
@@ -82,7 +82,7 @@ public class LoadoutDialog extends BaseDialog{
                 }).size(bsize);
 
                 t.button(Icon.pencil, Styles.cleari, () -> ui.showTextInput("$configure", stack.item.localizedName, 10, stack.amount + "", true, str -> {
-                    if(Strings.canParsePostiveInt(str)){
+                    if(Strings.canParsePositiveInt(str)){
                         int amount = Strings.parseInt(str);
                         if(amount >= 0 && amount <= capacity){
                             stack.amount = amount;
diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
index add5bdd595..5fcd64c674 100644
--- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java
@@ -112,7 +112,9 @@ public class ItemBridge extends Block{
             return false;
         }
 
-        return (other.block() == tile.block() || (!(tile.block() instanceof ItemBridge) && other.block() == this)) && (other.team() == tile.team() || tile.block() != this) && (!checkDouble || other.<ItemBridgeEntity>bc().link != tile.pos());
+        return ((other.block() == tile.block() && tile.block() == this) || (!(tile.block() instanceof ItemBridge) && other.block() == this))
+            && (other.team() == tile.team() || tile.block() != this)
+            && (!checkDouble || other.<ItemBridgeEntity>bc().link != tile.pos());
     }
 
     public Tile findLink(int x, int y){
diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java
index 863e7763f8..03703921c1 100644
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -477,7 +477,7 @@ public class ServerControl implements ApplicationListener{
                 return;
             }
 
-            if(Strings.canParsePostiveInt(arg[0]) && Strings.parseInt(arg[0]) > 0){
+            if(Strings.canParsePositiveInt(arg[0]) && Strings.parseInt(arg[0]) > 0){
                 int lim = Strings.parseInt(arg[0]);
                 netServer.admins.setPlayerLimit(lim);
                 info("Player limit is now &lc@.", lim);