diff --git a/src/main/kotlin/org/neoflock/neocomputers/block/Capacitor.kt b/src/main/kotlin/org/neoflock/neocomputers/block/Capacitor.kt
index 75e73f5..80ee95e 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/block/Capacitor.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/block/Capacitor.kt
@@ -1,6 +1,5 @@
 package org.neoflock.neocomputers.block
 
-import net.minecraft.client.player.LocalPlayer
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.HolderLookup
@@ -8,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.chat.OutgoingChatMessage
 import net.minecraft.network.chat.PlayerChatMessage
-import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionResult
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.Level
@@ -18,7 +16,6 @@ import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.phys.BlockHitResult
 import org.neoflock.neocomputers.entity.BlockEntities
 import org.neoflock.neocomputers.network.DeviceNode
-import org.neoflock.neocomputers.network.Networking
 import org.neoflock.neocomputers.network.PowerRole
 import kotlin.math.min
 
@@ -43,9 +40,9 @@ open class CapacitorEntity(val capacity: Long, type: BlockEntityType<*>, pos: Bl
     override fun getDeviceNodes() = listOf(deviceNode)
     override fun getNodeFromSide(directionToRequester: Direction) = deviceNode
 
-    override fun loadAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
-        super.loadAdditional(compoundTag, provider)
-        deviceNode.energy = min(compoundTag.getLong("energy"), deviceNode.energyCapacity)
+    override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
+        super.loadAdditional(tag, registries)
+        deviceNode.energy = min(tag.getLong("energy"), deviceNode.energyCapacity)
     }
 
     override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
diff --git a/src/main/kotlin/org/neoflock/neocomputers/entity/ScreenEntity.kt b/src/main/kotlin/org/neoflock/neocomputers/entity/ScreenEntity.kt
index b649578..e02eb07 100644
--- a/src/main/kotlin/org/neoflock/neocomputers/entity/ScreenEntity.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/entity/ScreenEntity.kt
@@ -1,4 +1,4 @@
-package org.neoflock.neocomputers.entity;
+package org.neoflock.neocomputers.entity
 
 import net.minecraft.core.BlockPos
 import net.minecraft.locale.Language
@@ -59,7 +59,7 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
 
         override fun processCommit(buf: FriendlyByteBuf) {
             super.processCommit(buf)
-            if(Networking.changeNodeAddress(this, buf.readUUID())) createscreenstuffs()
+            if(Networking.changeNodeAddress(this, buf.readUUID())) createScreenTexture()
             isOn = buf.readBoolean()
             lastError = buf.readUtf().ifEmpty { null }
             textBuf.decodeContents(buf)
@@ -69,30 +69,30 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
 
     val textBuf = TextBuffer(50, 16)
 
-    private var cleanrenderer: () -> Unit = { }; // TODO: THIS SUCKS, FIND A BETTER WAY
+    private var cleanRenderer: () -> Unit = { } // TODO: THIS SUCKS, FIND A BETTER WAY
 
     override fun tickDevice(level: Level) {
         super.tickDevice(level)
-        cleanrenderer()
-        createscreenstuffs()
+        cleanRenderer()
+        createScreenTexture()
     }
 
     override fun setRemoved() {
         super.setRemoved()
         bound = "screen/unbound" // ensure no missing texture is displayed
-        cleanrenderer()
+        cleanRenderer()
     }
 
-    private fun createscreenstuffs() {
+    private fun createScreenTexture() {
         bound = "screen/"+deviceNode.address.toString().replace("-", "_")
         if (level!!.isClientSide) {
             if(lastError == null) {
                 if(!isOn) {
                     textBuf.fill(0, 0, textBuf.width, textBuf.height)
                 }
-                var renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), textBuf)
+                val renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), textBuf)
                 renderer.drawBuffer()
-                cleanrenderer = { renderer.clean() }
+                cleanRenderer = { renderer.clean() }
             } else {
                 var trueError = lastError!!
                 if(trueError.startsWith("@")) {
@@ -105,9 +105,9 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
                 val bg = 0x2B68A6
                 throwAwayBuf.fill(0, 0, throwAwayBuf.width, throwAwayBuf.height, GPUChar(' ', fg, bg))
                 throwAwayBuf.set((throwAwayBuf.width - trueError.length) / 2, throwAwayBuf.height/2, trueError, fg, bg)
-                var renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), throwAwayBuf)
+                val renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), throwAwayBuf)
                 renderer.drawBuffer()
-                cleanrenderer = { renderer.clean() }
+                cleanRenderer = { renderer.clean() }
             }
         }
     }