diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 5ec95a64bd..671eff2048 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -560,7 +560,7 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
-sector.biomassResearchFacility.name = Biomass Research Facility
+sector.biomassFacility.name = Biomass Synthesis Facility
 
 #unused
 #sector.crags.name = Crags
diff --git a/core/assets/maps/biomassFacility.msav b/core/assets/maps/biomassFacility.msav
new file mode 100644
index 0000000000..37132355e2
Binary files /dev/null and b/core/assets/maps/biomassFacility.msav differ
diff --git a/core/assets/maps/biomassResearchFacility.msav b/core/assets/maps/biomassResearchFacility.msav
deleted file mode 100644
index b9faa4a7f4..0000000000
Binary files a/core/assets/maps/biomassResearchFacility.msav and /dev/null differ
diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java
index b61511684d..3fc012eeaa 100644
--- a/core/src/mindustry/ai/BlockIndexer.java
+++ b/core/src/mindustry/ai/BlockIndexer.java
@@ -208,16 +208,30 @@ public class BlockIndexer{
     public Seq<Tile> getEnemy(Team team, BlockFlag type){
         returnArray.clear();
         Seq<TeamData> data = state.teams.present;
-        for(int i = 0; i < data.size; i++){
-            Team enemy = data.items[i].team;
-            if(enemy == team) continue;
-            TileArray set = getFlagged(enemy)[type.ordinal()];
-            if(set != null){
-                for(Tile tile : set){
-                    returnArray.add(tile);
+        //when team data is not initialized, scan through every team. this is terrible
+        if(data.isEmpty()){
+            for(Team enemy : Team.all){
+                if(enemy == team) continue;
+                TileArray set = getFlagged(enemy)[type.ordinal()];
+                if(set != null){
+                    for(Tile tile : set){
+                        returnArray.add(tile);
+                    }
+                }
+            }
+        }else{
+            for(int i = 0; i < data.size; i++){
+                Team enemy = data.items[i].team;
+                if(enemy == team) continue;
+                TileArray set = getFlagged(enemy)[type.ordinal()];
+                if(set != null){
+                    for(Tile tile : set){
+                        returnArray.add(tile);
+                    }
                 }
             }
         }
+
         return returnArray;
     }
 
diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java
index d36cb32291..e26ae14fd0 100644
--- a/core/src/mindustry/ai/Pathfinder.java
+++ b/core/src/mindustry/ai/Pathfinder.java
@@ -351,13 +351,7 @@ public class Pathfinder implements Runnable{
         threadList.add(path);
 
         //add to main thread's list of paths
-        Core.app.post(() -> {
-            mainList.add(path);
-            //TODO
-            //if(fieldMap[team.id] != null){
-            //    fieldMap[team.id].put(target, path);
-            //}
-        });
+        Core.app.post(() -> mainList.add(path));
 
         //fill with impassables by default
         for(int x = 0; x < world.width(); x++){
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index 804c6769da..8b1459552a 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -31,7 +31,7 @@ public class SectorPresets implements ContentList{
             difficulty = 2;
         }};
 
-        biomassFacility = new SectorPreset("biomassResearchFacility", serpulo, 81){{
+        biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{
             captureWave = 20;
             difficulty = 3;
         }};
diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
index 52f59a190e..44b54df434 100644
--- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java
+++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java
@@ -30,9 +30,7 @@ public class SchematicsDialog extends BaseDialog{
 
     public SchematicsDialog(){
         super("@schematics");
-        Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> {
-            ((Texture)t).setWrap(TextureWrap.repeat);
-        };
+        Core.assets.load("sprites/schematic-background.png", Texture.class).loaded = t -> ((Texture)t).setWrap(TextureWrap.repeat);
 
         shouldPause = true;
         addCloseButton();
diff --git a/tools/src/mindustry/tools/FontGenerator.java b/tools/src/mindustry/tools/FontGenerator.java
index ff13b8fd53..1c1ef50013 100644
--- a/tools/src/mindustry/tools/FontGenerator.java
+++ b/tools/src/mindustry/tools/FontGenerator.java
@@ -11,7 +11,7 @@ import java.io.*;
  1. take set of pre-defined icons and SVGs
  2. use Fontello API to get a font with these
  3. combine fontello font and standard font, get output font
- 4. use apache ttf API to generate a file with constants for every icon size+type (during annotation processing)
+ 4. use json to generate a file with constants for every icon size+type (during annotation processing)
  */
 public class FontGenerator{