diff --git a/annotations/src/main/java/mindustry/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java
index e286ce6694..c4ba024d88 100644
--- a/annotations/src/main/java/mindustry/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -15,6 +15,7 @@ public class Annotations{
         flying,
         bullets,
         effects,
+        overlays,
         names,
     }
 
@@ -213,11 +214,6 @@ public class Annotations{
         PacketPriority priority() default PacketPriority.normal;
     }
 
-    /**
-     * Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
-     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
-     * being the type returned by {@link #value()}.
-     */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
     public @interface TypeIOHandler{
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 30b03ade64..e4f6765dbe 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -247,6 +247,8 @@ public class Renderer implements ApplicationListener{
             player.builder().drawBuildRequests();
         }
 
+        Groups.drawOverlays();
+
         overlays.drawTop();
 
         endFx();
diff --git a/core/src/mindustry/entities/def/TileComp.java b/core/src/mindustry/entities/def/TileComp.java
index 46cf9f903d..b585f9cc2c 100644
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/def/TileComp.java
@@ -657,7 +657,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
 
     /** Called when arbitrary configuration is applied to a tile. */
     public void configured(@Nullable Playerc player, @Nullable Object value){
-        //null is of type Void.class; anonymous classes use their superclass.
+        //null is of type void.class; anonymous classes use their superclass.
         Class<?> type = value == null ? void.class : value.getClass().isAnonymousClass() ? value.getClass().getSuperclass() : value.getClass();
 
         if(block.configurations.containsKey(type)){
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index cb42b6fe0b..ad7cb5c0da 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -60,7 +60,7 @@ public class IndexedRenderer implements Disposable{
 
         updateMatrix();
 
-        program.begin();
+        program.bind();
 
         texture.bind();
 
@@ -69,7 +69,6 @@ public class IndexedRenderer implements Disposable{
 
         mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
 
-        program.end();
     }
 
     public void setColor(Color color){
diff --git a/core/src/mindustry/graphics/g3d/PlanetMesh.java b/core/src/mindustry/graphics/g3d/PlanetMesh.java
index 0af251c51a..161b235af2 100644
--- a/core/src/mindustry/graphics/g3d/PlanetMesh.java
+++ b/core/src/mindustry/graphics/g3d/PlanetMesh.java
@@ -2,7 +2,6 @@ package mindustry.graphics.g3d;
 
 import arc.graphics.*;
 import arc.graphics.gl.*;
-import arc.math.geom.*;
 import mindustry.type.*;
 
 /** Defines a mesh that is rendered for a planet. Subclasses provide a mesh and a shader. */
@@ -22,11 +21,10 @@ public abstract class PlanetMesh{
 
     public void render(Mat3D projection, Mat3D transform){
         preRender();
-        shader.begin();
+        shader.bind();
         shader.setUniformMatrix4("u_proj", projection.val);
         shader.setUniformMatrix4("u_trans", transform.val);
         shader.apply();
         mesh.render(shader, Gl.triangles);
-        shader.end();
     }
 }
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index 8f58f24eac..03f570be88 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -242,12 +242,11 @@ public class PlanetDialog extends FloatingDialog{
         //Log.info(tile);
         Shaders.planetGrid.mouse.lerp(tile == null ? Vec3.Zero : tile.sub(planet.position).rotate(Vec3.Y, planet.getRotation()), 0.2f);
 
-        shader.begin();
+        shader.bind();
         shader.setUniformMatrix4("u_proj", cam.combined().val);
         shader.setUniformMatrix4("u_trans", planet.getTransform(mat).val);
         shader.apply();
         mesh.render(shader, Gl.lines);
-        shader.end();
     }
 
     private void drawBorders(Sector sector, Color base){