diff --git a/client/src/main/java/rt4/AudioChannel.java b/client/src/main/java/rt4/AudioChannel.java
index 329a0a0..9852290 100644
--- a/client/src/main/java/rt4/AudioChannel.java
+++ b/client/src/main/java/rt4/AudioChannel.java
@@ -126,7 +126,18 @@ public class AudioChannel {
 		}
 	}
 
-	@OriginalMember(owner = "client!vh", name = "a", descriptor = "()V")
+    @OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V")
+    public static void setInactive(@OriginalArg(1) PcmStream arg0) {
+        if (arg0.aClass3_Sub16_5 != null) {
+            arg0.aClass3_Sub16_5.anInt3313 = 0;
+        }
+        arg0.aBoolean292 = false;
+        for (@Pc(14) PcmStream local14 = arg0.method4406(); local14 != null; local14 = arg0.method4409()) {
+            setInactive(local14);
+        }
+    }
+
+    @OriginalMember(owner = "client!vh", name = "a", descriptor = "()V")
 	protected void write() throws Exception {
 	}
 
@@ -148,7 +159,7 @@ public class AudioChannel {
 		this.anInt4638 -= 256;
 		if (this.stream != null && this.anInt4638 <= 0) {
 			this.anInt4638 += sampleRate >> 4;
-			Static167.setInactive(this.stream);
+			setInactive(this.stream);
 			this.method3567(this.stream, this.stream.method4407());
 			@Pc(45) int local45 = 0;
 			@Pc(47) int local47 = 255;
diff --git a/client/src/main/java/rt4/Base37.java b/client/src/main/java/rt4/Base37.java
index 6e3347f..2492179 100644
--- a/client/src/main/java/rt4/Base37.java
+++ b/client/src/main/java/rt4/Base37.java
@@ -5,6 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public class Base37 {
+    @OriginalMember(owner = "client!ch", name = "v", descriptor = "[B")
+    public static final byte[] aByteArray12 = new byte[] { 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 };
+
     @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IJ)Lclient!na;")
     public static JagString decode37(@OriginalArg(1) long arg0) {
         if (arg0 <= 0L || arg0 >= 6582952005840035281L) {
@@ -23,7 +26,7 @@ public class Base37 {
                 @Pc(65) long local65 = arg0;
                 arg0 /= 37L;
                 local32--;
-                local48[local32] = Static31.aByteArray12[(int) (local65 - arg0 * 37L)];
+                local48[local32] = aByteArray12[(int) (local65 - arg0 * 37L)];
             }
             @Pc(88) JagString local88 = new JagString();
             local88.chars = local48;
diff --git a/client/src/main/java/rt4/Buffer.java b/client/src/main/java/rt4/Buffer.java
index 3127715..d295956 100644
--- a/client/src/main/java/rt4/Buffer.java
+++ b/client/src/main/java/rt4/Buffer.java
@@ -66,7 +66,21 @@ public class Buffer extends Node {
         return arg0.length() + 1;
     }
 
-    @OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I")
+    @OriginalMember(owner = "client!nf", name = "a", descriptor = "(II[BB)I")
+    public static int crc32(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
+        @Pc(5) int local5 = -1;
+        for (@Pc(15) int local15 = arg0; local15 < arg1; local15++) {
+            local5 = local5 >>> 8 ^ HuffmanCodec.anIntArray175[(local5 ^ arg2[local15]) & 0xFF];
+        }
+        return ~local5;
+    }
+
+	@OriginalMember(owner = "client!fk", name = "a", descriptor = "([BIZ)I")
+	public static int crc32(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) {
+		return crc32(0, arg1, arg0);
+	}
+
+	@OriginalMember(owner = "client!wa", name = "c", descriptor = "(I)I")
 	public final int g2() {
 		this.offset += 2;
 		return ((this.data[this.offset - 2] & 0xFF) << 8) + (this.data[this.offset - 1] & 0xFF);
@@ -235,7 +249,7 @@ public class Buffer extends Node {
 		@Pc(32) int off = this.offset;
 		while (this.data[this.offset++] != 0) {
 		}
-		return Static10.decodeString(this.data, this.offset - off - 1, off);
+		return JagString.decodeString(this.data, this.offset - off - 1, off);
 	}
 
 	@OriginalMember(owner = "client!wa", name = "a", descriptor = "(FB)V")
@@ -370,7 +384,7 @@ public class Buffer extends Node {
 		@Pc(12) int start = this.offset;
 		while (this.data[this.offset++] != 0) {
 		}
-		return Static10.decodeString(this.data, this.offset - start - 1, start);
+		return JagString.decodeString(this.data, this.offset - start - 1, start);
 	}
 
 	@OriginalMember(owner = "client!wa", name = "f", descriptor = "(Z)I")
@@ -465,7 +479,7 @@ public class Buffer extends Node {
 
 	@OriginalMember(owner = "client!wa", name = "c", descriptor = "(BI)I")
 	public final int pCrc32(@OriginalArg(1) int off) {
-		@Pc(16) int checksum = Static169.crc32(off, this.offset, this.data);
+		@Pc(16) int checksum = crc32(off, this.offset, this.data);
 		this.p4(checksum);
 		return checksum;
 	}
diff --git a/client/src/main/java/rt4/Camera.java b/client/src/main/java/rt4/Camera.java
index 5792dba..be35792 100644
--- a/client/src/main/java/rt4/Camera.java
+++ b/client/src/main/java/rt4/Camera.java
@@ -13,6 +13,11 @@ public class Camera {
     @OriginalMember(owner = "client!ef", name = "i", descriptor = "I")
     public static double pitchAccel = 0;
 
+    @OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
+    public static int cameraZ;
+    @OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
+    public static int cameraX;
+
     public static double mod(double a, double b) {
         return ((a % b) + b) % b;
     }
@@ -26,9 +31,9 @@ public class Camera {
             pitchTarget = 383;
         }
         yawTarget = mod(yawTarget, 2047.0d);
-        @Pc(33) int local33 = Static81.cameraX >> 7;
-        @Pc(37) int local37 = Static111.cameraZ >> 7;
-        @Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, Static81.cameraX, Static111.cameraZ);
+        @Pc(33) int local33 = cameraX >> 7;
+        @Pc(37) int local37 = cameraZ >> 7;
+        @Pc(43) int local43 = SceneGraph.getTileHeight(Player.level, cameraX, cameraZ);
         @Pc(45) int local45 = 0;
         @Pc(64) int local64;
         if (local33 > 3 && local37 > 3 && local33 < 100 && local37 < 100) {
diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java
index 3f98744..60d0a17 100644
--- a/client/src/main/java/rt4/Cheat.java
+++ b/client/src/main/java/rt4/Cheat.java
@@ -75,6 +75,20 @@ public class Cheat {
     public static final JagString aClass100_476 = JagString.parse("::gc");
     @OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;")
 	public static final JagString CLIENTJS5DROP = JagString.parse("::clientjs5drop");
+    @OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;")
+    public static final JagString FPSON = JagString.parse("::fpson");
+    @OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;")
+    public static final JagString MM = JagString.parse("::mm");
+    @OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;")
+    public static final JagString REPLACECANVAS = JagString.parse("::replacecanvas");
+    @OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;")
+    public static final JagString REBUILD = JagString.parse("::rebuild");
+    @OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;")
+    public static final JagString WM1 = JagString.parse("::wm1");
+    @OriginalMember(owner = "client!ql", name = "i", descriptor = "Lclient!na;")
+    public static final JagString WM2 = JagString.parse("::wm2");
+    @OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;")
+    public static final JagString WM3 = JagString.parse("::wm3");
     @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
     public static boolean displayFps = false;
     @OriginalMember(owner = "client!nj", name = "a", descriptor = "Z")
@@ -84,7 +98,7 @@ public class Cheat {
 
     @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
 	public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, Static123.parseInt(arg2), Static159.aClass100_760, Static123.parseInt(arg0 >> 6), Static159.aClass100_760, Static123.parseInt(arg1 >> 6), Static159.aClass100_760, Static123.parseInt(arg0 & 0x3F), Static159.aClass100_760, Static123.parseInt(arg1 & 0x3F) });
+		@Pc(66) JagString local66 = JagString.concatenate(new JagString[] { aClass100_521, JagString.parseInt(arg2), Static70.aClass100_760, JagString.parseInt(arg0 >> 6), Static70.aClass100_760, JagString.parseInt(arg1 >> 6), Static70.aClass100_760, JagString.parseInt(arg0 & 0x3F), Static70.aClass100_760, JagString.parseInt(arg1 & 0x3F) });
 		local66.print();
 		execute(local66);
 	}
@@ -102,27 +116,27 @@ public class Cheat {
                 }
                 local29 = Runtime.getRuntime();
                 local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, Static123.parseInt(local38), DEBUG_MEM_UNIT}));
+                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
             }
             @Pc(117) int local117;
-            if (arg0.equalsIgnoreCase(Static154.MM)) {
+            if (arg0.equalsIgnoreCase(MM)) {
                 client.method2380();
                 for (local18 = 0; local18 < 10; local18++) {
                     System.gc();
                 }
                 local29 = Runtime.getRuntime();
                 local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, Static123.parseInt(local38), DEBUG_MEM_UNIT}));
+                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
                 Static16.method501();
                 client.method2380();
                 for (local117 = 0; local117 < 10; local117++) {
                     System.gc();
                 }
                 local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L);
-                Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, Static123.parseInt(local38), DEBUG_MEM_UNIT}));
+                Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, JagString.parseInt(local38), DEBUG_MEM_UNIT}));
             }
             if (arg0.equalsIgnoreCase(PCACHESIZE)) {
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, Static123.parseInt(Static198.method1029()) }));
+                Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, JagString.parseInt(Static198.method1029()) }));
             }
             if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) {
                 System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry);
@@ -136,20 +150,20 @@ public class Cheat {
                 client.js5NetQueue.quit();
             }
             if (arg0.equalsIgnoreCase(JS5DROP)) {
-                client.js5NetQueue.method2319();
+                client.js5NetQueue.drop();
             }
             if (arg0.equalsIgnoreCase(BREAKCON)) {
                 GameShell.signLink.breakConnection();
                 Protocol.socket.breakConnection();
-                client.js5NetQueue.method2323();
+                client.js5NetQueue.breakConnection();
             }
-            if (arg0.equalsIgnoreCase(Static114.REPLACECANVAS)) {
+            if (arg0.equalsIgnoreCase(REPLACECANVAS)) {
                 GameShell.replaceCanvas = true;
             }
-            if (arg0.equalsIgnoreCase(Static148.REBUILD)) {
+            if (arg0.equalsIgnoreCase(REBUILD)) {
                 client.setGameState(25);
             }
-            if (arg0.equalsIgnoreCase(Static107.FPSON)) {
+            if (arg0.equalsIgnoreCase(FPSON)) {
                 displayFps = true;
             }
             if (arg0.equalsIgnoreCase(FPSOFF)) {
@@ -158,13 +172,13 @@ public class Cheat {
             if (arg0.equalsIgnoreCase(WM0)) {
                 Static241.setWindowMode(false, 0, -1, -1);
             }
-            if (arg0.equalsIgnoreCase(Static181.WM1)) {
+            if (arg0.equalsIgnoreCase(WM1)) {
                 Static241.setWindowMode(false, 1, -1, -1);
             }
-            if (arg0.equalsIgnoreCase(Static207.WM2)) {
+            if (arg0.equalsIgnoreCase(WM2)) {
                 Static241.setWindowMode(false, 2, -1, -1);
             }
-            if (arg0.equalsIgnoreCase(Static99.WM3)) {
+            if (arg0.equalsIgnoreCase(WM3)) {
                 Static241.setWindowMode(false, 3, 1024, 768);
             }
             if (arg0.equalsIgnoreCase(NOCLIP)) {
@@ -189,7 +203,7 @@ public class Cheat {
             }
             if (arg0.startsWith(RECT_DEBUG)) {
                 rectDebug = arg0.substring(12).trim().parseInt();
-                Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, Static123.parseInt(rectDebug) }));
+                Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, JagString.parseInt(rectDebug) }));
             }
             if (arg0.equalsIgnoreCase(QA_OP_TEST)) {
                 Static121.aBoolean154 = true;
diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java
index c502717..420dee4 100644
--- a/client/src/main/java/rt4/ClientProt.java
+++ b/client/src/main/java/rt4/ClientProt.java
@@ -309,7 +309,7 @@ public class ClientProt {
             }
         }
         if (GlRenderer.enabled) {
-            Static120.method2404();
+            LightingManager.method2404();
         }
         if (GlRenderer.enabled) {
             Static75.setDefaultChunksAtmosphere();
@@ -317,7 +317,7 @@ public class ClientProt {
         client.audioLoop();
         System.gc();
         ping(true);
-        Static196.method3535(false);
+        SceneGraph.method3535(false);
         if (!Static230.dynamicMapRegion) {
             Static87.method1805(false);
             ping(true);
@@ -345,10 +345,10 @@ public class ClientProt {
         ping(true);
         Static45.method1169(PathFinder.collisionMaps, false);
         if (GlRenderer.enabled) {
-            Static120.method2395();
+            LightingManager.method2395();
         }
         ping(true);
-        i = Static146.anInt3508;
+        i = SceneGraph.firstVisibleLevel;
         if (i > Player.level) {
             i = Player.level;
         }
@@ -357,12 +357,12 @@ public class ClientProt {
         if (SceneGraph.allLevelsAreVisible()) {
             Static146.method2750(0);
         } else {
-            Static146.method2750(Static146.anInt3508);
+            Static146.method2750(SceneGraph.firstVisibleLevel);
         }
-        Static105.method2255();
+        SceneGraph.method2255();
         if (GlRenderer.enabled && hasUnderWaterMap) {
             Static278.setRenderTiles(true);
-            Static196.method3535(true);
+            SceneGraph.method3535(true);
             if (!Static230.dynamicMapRegion) {
                 Static87.method1805(true);
                 ping(true);
@@ -377,7 +377,7 @@ public class ClientProt {
             ping(true);
             Static45.method1169(PathFinder.collisionMaps, true);
             ping(true);
-            Static105.method2255();
+            SceneGraph.method2255();
             Static278.setRenderTiles(false);
         }
         if (GlRenderer.enabled) {
@@ -409,8 +409,8 @@ public class ClientProt {
             for (@Pc(837) int local837 = chunkX - 1; local837 <= chunkZ + 1; local837++) {
                 for (@Pc(850) int local850 = local821 - 1; local850 <= local815 + 1; local850++) {
                     if (local837 < chunkX || local837 > chunkZ || local850 < local821 || local850 > local815) {
-                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) }));
-                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local837), Static86.aClass100_488, Static123.parseInt(local850) }));
+                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
+                        client.js5Archive5.method4486(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local837), Static86.aClass100_488, JagString.parseInt(local850) }));
                     }
                 }
             }
@@ -423,7 +423,7 @@ public class ClientProt {
                 Protocol.outboundBuffer.p1isaac(110);
             }
         }
-        Static141.method2720();
+        WorldMap.method2720();
         client.audioLoop();
         GameShell.resetTimer();
     }
diff --git a/client/src/main/java/rt4/ColorImageCache.java b/client/src/main/java/rt4/ColorImageCache.java
index 71995b5..efba229 100644
--- a/client/src/main/java/rt4/ColorImageCache.java
+++ b/client/src/main/java/rt4/ColorImageCache.java
@@ -69,7 +69,7 @@ public final class ColorImageCache {
 					local29 = new ColorImageCacheEntry(row, this.size);
 					this.size++;
 				} else {
-					@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.method2279();
+					@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.tail();
 					local29 = new ColorImageCacheEntry(row, local66.index);
 					this.entries[local66.row] = null;
 					local66.unlink();
diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java
index 6f73a4a..c2f9dc2 100644
--- a/client/src/main/java/rt4/Component.java
+++ b/client/src/main/java/rt4/Component.java
@@ -954,7 +954,7 @@ public final class Component {
 		}
 		@Pc(85) SoftwareSprite local85;
 		if (this.aBoolean18) {
-			local85 = Static80.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12);
+			local85 = SoftwareSprite.loadSoftwareAlphaSprite(InterfaceList.aClass153_12, local12);
 		} else {
 			local85 = SpriteLoader.loadSoftwareSprite(0, InterfaceList.aClass153_12, local12);
 		}
diff --git a/client/src/main/java/rt4/CursorType.java b/client/src/main/java/rt4/CursorType.java
index e981622..f246091 100644
--- a/client/src/main/java/rt4/CursorType.java
+++ b/client/src/main/java/rt4/CursorType.java
@@ -23,7 +23,7 @@ public final class CursorType {
 		if (local7 != null) {
 			return local7;
 		}
-		local7 = Static80.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId);
+		local7 = SoftwareSprite.loadSoftwareAlphaSprite(CursorTypeList.spritesArchive, this.spriteId);
 		if (local7 != null) {
 			CursorTypeList.sprites.put(local7, (long) this.spriteId);
 		}
diff --git a/client/src/main/java/rt4/DelayedStateChange.java b/client/src/main/java/rt4/DelayedStateChange.java
index fd86ab5..ca6f7aa 100644
--- a/client/src/main/java/rt4/DelayedStateChange.java
+++ b/client/src/main/java/rt4/DelayedStateChange.java
@@ -141,6 +141,106 @@ public final class DelayedStateChange extends SecondaryNode {
 		return local13;
 	}
 
+	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V")
+	public static void method4600(@OriginalArg(1) int arg0) {
+		@Pc(8) DelayedStateChange local8 = create(4, arg0);
+		local8.pushClient();
+	}
+
+	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
+	public static void method2353(@OriginalArg(0) int arg0) {
+		@Pc(12) DelayedStateChange local12 = create(12, arg0);
+		local12.pushClient();
+	}
+
+	@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
+	public static DelayedStateChange poll() {
+		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) serverQueue.method795();
+		if (local10 != null) {
+			local10.unlink();
+			local10.method4365();
+			return local10;
+		}
+		do {
+			local10 = (DelayedStateChange) clientQueue.method795();
+			if (local10 == null) {
+				return null;
+			}
+			if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
+				return null;
+			}
+			local10.unlink();
+			local10.method4365();
+		} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
+		return local10;
+	}
+
+	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
+	public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+		@Pc(8) DelayedStateChange local8 = create(10, arg0);
+		local8.pushServer();
+		local8.intArg3 = arg2;
+		local8.intArg1 = arg3;
+		local8.intArg2 = arg1;
+	}
+
+	@OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V")
+	public static void method3096(@OriginalArg(0) int arg0) {
+		@Pc(8) DelayedStateChange local8 = create(3, arg0);
+		local8.pushClient();
+	}
+
+	@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
+	public static void method3345(@OriginalArg(0) int arg0) {
+		@Pc(8) DelayedStateChange local8 = create(5, arg0);
+		local8.pushClient();
+	}
+
+	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V")
+	public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+		@Pc(12) DelayedStateChange local12 = create(9, arg0);
+		local12.pushServer();
+		local12.intArg1 = arg2;
+		local12.intArg3 = arg1;
+	}
+
+	@OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V")
+	public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+		@Pc(16) DelayedStateChange local16 = create(12, arg1);
+		local16.pushServer();
+		local16.intArg1 = arg0;
+	}
+
+	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V")
+	public static void method4224(@OriginalArg(0) int arg0) {
+		@Pc(16) DelayedStateChange local16 = create(6, arg0);
+		local16.pushClient();
+	}
+
+	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(II)V")
+	public static void method4675(@OriginalArg(1) int arg0) {
+		@Pc(17) DelayedStateChange local17 = create(11, arg0);
+		local17.pushClient();
+	}
+
+	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(BI)V")
+	public static void method24(@OriginalArg(1) int arg0) {
+		@Pc(16) DelayedStateChange local16 = create(1, arg0);
+		local16.pushClient();
+	}
+
+	@OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V")
+	public static void method1840(@OriginalArg(1) int arg0) {
+		@Pc(8) DelayedStateChange local8 = create(2, arg0);
+		local8.pushClient();
+	}
+
+	@OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V")
+	public static void method1906(@OriginalArg(1) int arg0) {
+		@Pc(12) DelayedStateChange local12 = create(7, arg0);
+		local12.pushClient();
+	}
+
 	@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
 	public final void pushClient() {
 		this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;
diff --git a/client/src/main/java/rt4/FloType.java b/client/src/main/java/rt4/FloType.java
index 2cd11f9..2b0c612 100644
--- a/client/src/main/java/rt4/FloType.java
+++ b/client/src/main/java/rt4/FloType.java
@@ -40,7 +40,12 @@ public final class FloType {
 	@OriginalMember(owner = "client!wl", name = "m", descriptor = "I")
 	public int anInt5889 = 1190717;
 
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V")
+    @OriginalMember(owner = "client!be", name = "a", descriptor = "(II)I")
+    public static int method492(@OriginalArg(1) int arg0) {
+        return arg0 == 16711935 ? -1 : ColorUtils.rgbToHsl(arg0);
+    }
+
+    @OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V")
 	public final void decode(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		while (true) {
 			@Pc(5) int local5 = arg0.g1();
@@ -54,7 +59,7 @@ public final class FloType {
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IILclient!wa;I)V")
 	private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
 		if (arg0 == 1) {
-			this.anInt5899 = Static15.method492(arg1.g3());
+			this.anInt5899 = method492(arg1.g3());
 		} else if (arg0 == 2) {
 			this.texture = arg1.g1();
 		} else if (arg0 == 3) {
@@ -65,7 +70,7 @@ public final class FloType {
 		} else if (arg0 == 5) {
 			this.aBoolean312 = false;
 		} else if (arg0 == 7) {
-			this.anInt5894 = Static15.method492(arg1.g3());
+			this.anInt5894 = method492(arg1.g3());
 		} else if (arg0 == 8) {
 			anInt865 = arg2;
 		} else if (arg0 == 9) {
diff --git a/client/src/main/java/rt4/Font.java b/client/src/main/java/rt4/Font.java
index 92d41e1..09fe672 100644
--- a/client/src/main/java/rt4/Font.java
+++ b/client/src/main/java/rt4/Font.java
@@ -198,7 +198,22 @@ public abstract class Font extends SecondaryNode {
 		return -local37;
 	}
 
-	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
+    @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;")
+	public static Font method799(@OriginalArg(1) byte[] arg0) {
+		if (arg0 == null) {
+			return null;
+		}
+		@Pc(27) Font local27;
+		if (GlRenderer.enabled) {
+			local27 = new GlFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
+		} else {
+			local27 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
+		}
+		SpriteLoader.clear();
+		return local27;
+	}
+
+    @OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIII)I")
 	public final int method2852(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
 		return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 	}
diff --git a/client/src/main/java/rt4/FriendsList.java b/client/src/main/java/rt4/FriendsList.java
index 8765ff2..4bfa973 100644
--- a/client/src/main/java/rt4/FriendsList.java
+++ b/client/src/main/java/rt4/FriendsList.java
@@ -15,6 +15,8 @@ public class FriendsList {
     public static final int[] worlds = new int[200];
     @OriginalMember(owner = "client!jh", name = "b", descriptor = "[Lclient!na;")
 	public static final JagString[] usernames = new JagString[200];
+    @OriginalMember(owner = "client!ab", name = "c", descriptor = "[Z")
+    public static final boolean[] aBooleanArray135 = new boolean[200];
     @OriginalMember(owner = "client!p", name = "d", descriptor = "I")
     public static int transmitAt = 0;
     @OriginalMember(owner = "client!nc", name = "m", descriptor = "I")
@@ -71,7 +73,7 @@ public class FriendsList {
         worlds[size] = 0;
         worldNames[size] = JagString.EMPTY;
         ranks[size] = 0;
-        Static3.aBooleanArray135[size] = false;
+        aBooleanArray135[size] = false;
         size++;
         transmitAt = InterfaceList.transmitTimer;
         Protocol.outboundBuffer.p1isaac(120);
@@ -92,7 +94,7 @@ public class FriendsList {
                     worldNames[local41] = worldNames[local41 + 1];
                     encodedUsernames[local41] = encodedUsernames[local41 + 1];
                     ranks[local41] = ranks[local41 + 1];
-                    Static3.aBooleanArray135[local41] = Static3.aBooleanArray135[local41 + 1];
+                    aBooleanArray135[local41] = aBooleanArray135[local41 + 1];
                 }
                 transmitAt = InterfaceList.transmitTimer;
                 Protocol.outboundBuffer.p1isaac(57);
diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java
index 4b861ac..08fbd5e 100644
--- a/client/src/main/java/rt4/GlModel.java
+++ b/client/src/main/java/rt4/GlModel.java
@@ -710,7 +710,7 @@ public final class GlModel extends Model {
 
 	@OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I")
 	public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) {
-		@Pc(5) int local5 = Rasteriser.palette[Static268.method4585(arg0, arg2)];
+		@Pc(5) int local5 = Rasteriser.palette[SoftwareModel.method4585(arg0, arg2)];
 		if (arg1 != -1) {
 			@Pc(15) int local15 = Rasteriser.textureProvider.method3238(arg1 & 0xFFFF);
 			@Pc(21) int local21;
diff --git a/client/src/main/java/rt4/GlRaster.java b/client/src/main/java/rt4/GlRaster.java
index 609cc65..6ef58fe 100644
--- a/client/src/main/java/rt4/GlRaster.java
+++ b/client/src/main/java/rt4/GlRaster.java
@@ -236,7 +236,7 @@ public final class GlRaster {
 	}
 
 	@OriginalMember(owner = "client!dj", name = "d", descriptor = "(IIII)V")
-	public static void method1187(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	public static void setClip(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg0 < 0) {
 			arg0 = 0;
 		}
diff --git a/client/src/main/java/rt4/GlRenderer.java b/client/src/main/java/rt4/GlRenderer.java
index e206f92..8f042bf 100644
--- a/client/src/main/java/rt4/GlRenderer.java
+++ b/client/src/main/java/rt4/GlRenderer.java
@@ -129,7 +129,7 @@ public final class GlRenderer {
 	private static JagString method4147(@OriginalArg(0) String arg0) {
 		@Pc(3) byte[] local3;
 		local3 = arg0.getBytes(StandardCharsets.ISO_8859_1);
-		return Static10.decodeString(local3, local3.length, 0);
+		return JagString.decodeString(local3, local3.length, 0);
 	}
 
 	@OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIII)V")
@@ -271,7 +271,7 @@ public final class GlRenderer {
 		gl.glMatrixMode(GL2.GL_MODELVIEW);
 		gl.glLoadIdentity();
 		Static161.method3065();
-		Static120.method2400(); // LightingManager
+		LightingManager.method2400(); // LightingManager
 	}
 
 	@OriginalMember(owner = "client!tf", name = "g", descriptor = "()V")
@@ -511,7 +511,7 @@ public final class GlRenderer {
 		gl = null;
 		context = null;
 		drawable = null;
-		Static120.method2398(); // LightingManager
+		LightingManager.method2398(); // LightingManager
 		enabled = false;
 	}
 
@@ -808,7 +808,7 @@ public final class GlRenderer {
 		anInt5328 = local2[0];
 		gl.glBindTexture(GL2.GL_TEXTURE_2D, anInt5328);
 		gl.glTexImage2D(GL2.GL_TEXTURE_2D, 0, 4, 1, 1, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(new int[] { -1 }));
-		Static120.method2401();
+		LightingManager.method2401();
 		MaterialManager.init();
 	}
 }
diff --git a/client/src/main/java/rt4/GlSprite.java b/client/src/main/java/rt4/GlSprite.java
index acc6832..3932de4 100644
--- a/client/src/main/java/rt4/GlSprite.java
+++ b/client/src/main/java/rt4/GlSprite.java
@@ -145,7 +145,7 @@ public class GlSprite extends Sprite {
 	}
 
 	@OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIIIIIIILclient!cf;)V")
-	public final void method1427(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) GlSprite arg8) {
+	public final void renderRotatedTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) GlSprite arg8) {
 		if (arg8 == null) {
 			return;
 		}
@@ -232,7 +232,7 @@ public class GlSprite extends Sprite {
 
 	@OriginalMember(owner = "client!cf", name = "e", descriptor = "(II)V")
 	@Override
-	public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		GlRenderer.method4149();
 		@Pc(5) int local5 = arg0 + this.anInt1863;
 		@Pc(10) int local10 = arg1 + this.anInt1861;
diff --git a/client/src/main/java/rt4/GroundDecor.java b/client/src/main/java/rt4/GroundDecor.java
index 35e8686..96842d3 100644
--- a/client/src/main/java/rt4/GroundDecor.java
+++ b/client/src/main/java/rt4/GroundDecor.java
@@ -16,7 +16,7 @@ public final class GroundDecor {
 	public int anInt733;
 
 	@OriginalMember(owner = "client!bm", name = "m", descriptor = "J")
-	public long aLong26;
+	public long key;
 
 	@OriginalMember(owner = "client!bm", name = "o", descriptor = "I")
 	public int anInt736;
diff --git a/client/src/main/java/rt4/IgnoreList.java b/client/src/main/java/rt4/IgnoreList.java
index 201140e..56d6d3e 100644
--- a/client/src/main/java/rt4/IgnoreList.java
+++ b/client/src/main/java/rt4/IgnoreList.java
@@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
 public class IgnoreList {
     @OriginalMember(owner = "client!pf", name = "h", descriptor = "[J")
     public static final long[] encodedUsernames = new long[100];
+    @OriginalMember(owner = "client!pi", name = "V", descriptor = "[Lclient!na;")
+    public static final JagString[] aClass100Array134 = new JagString[100];
     @OriginalMember(owner = "client!cl", name = "Z", descriptor = "I")
     public static int size = 0;
 
@@ -16,7 +18,7 @@ public class IgnoreList {
             return false;
         }
         for (@Pc(11) int local11 = 0; local11 < size; local11++) {
-            if (arg0.equalsIgnoreCase(Static193.aClass100Array134[local11])) {
+            if (arg0.equalsIgnoreCase(aClass100Array134[local11])) {
                 return true;
             }
         }
@@ -51,7 +53,7 @@ public class IgnoreList {
             return;
         }
         encodedUsernames[size] = arg0;
-        Static193.aClass100Array134[size++] = Base37.decode37(arg0);
+        aClass100Array134[size++] = Base37.decode37(arg0);
         FriendsList.transmitAt = InterfaceList.transmitTimer;
         Protocol.outboundBuffer.p1isaac(34);
         Protocol.outboundBuffer.p8(arg0);
@@ -67,7 +69,7 @@ public class IgnoreList {
                 size--;
                 for (@Pc(36) int local36 = local12; local36 < size; local36++) {
                     encodedUsernames[local36] = encodedUsernames[local36 + 1];
-                    Static193.aClass100Array134[local36] = Static193.aClass100Array134[local36 + 1];
+                    aClass100Array134[local36] = aClass100Array134[local36 + 1];
                 }
                 FriendsList.transmitAt = InterfaceList.transmitTimer;
                 Protocol.outboundBuffer.p1isaac(213);
diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java
index 1395cc4..65ea11f 100644
--- a/client/src/main/java/rt4/InterfaceList.java
+++ b/client/src/main/java/rt4/InterfaceList.java
@@ -185,7 +185,7 @@ public class InterfaceList {
         if (!getServerActiveProperties(arg0).method503(arg1) && arg0.anObjectArray29 == null) {
             return null;
         } else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) {
-            return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, Static123.parseInt(arg1) }) : null;
+            return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null;
         } else {
             return arg0.ops[arg1];
         }
diff --git a/client/src/main/java/rt4/Inv.java b/client/src/main/java/rt4/Inv.java
index 75468f6..0863500 100644
--- a/client/src/main/java/rt4/Inv.java
+++ b/client/src/main/java/rt4/Inv.java
@@ -12,6 +12,8 @@ public final class Inv extends Node {
     public static final int[] updatedInventories = new int[32];
     @OriginalMember(owner = "client!ii", name = "c", descriptor = "I")
     public static int updatedInventoriesWriterIndex = 0;
+    @OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
+    public static HashTable objectContainerCache = new HashTable(32);
     @OriginalMember(owner = "client!qe", name = "p", descriptor = "[I")
 	public int[] objectIds = new int[] { -1 };
 
@@ -23,7 +25,7 @@ public final class Inv extends Node {
         if (arg0 < 0) {
             return 0;
         }
-        @Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0);
+        @Pc(17) Inv local17 = (Inv) objectContainerCache.get((long) arg0);
         if (local17 == null) {
             return InvTypeList.list(arg0).size;
         }
@@ -38,7 +40,7 @@ public final class Inv extends Node {
 
     @OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I")
     public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-        @Pc(19) Inv local19 = (Inv) Static20.objectContainerCache.get((long) arg1);
+        @Pc(19) Inv local19 = (Inv) objectContainerCache.get((long) arg1);
         if (local19 == null) {
             return 0;
         }
@@ -63,7 +65,7 @@ public final class Inv extends Node {
 
     @OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I")
     public static int getSlotTotal(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
+        @Pc(8) Inv local8 = (Inv) objectContainerCache.get((long) arg0);
         if (local8 == null) {
             return 0;
         } else if (arg1 == -1) {
@@ -81,7 +83,7 @@ public final class Inv extends Node {
 
     @OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I")
     public static int getItemCount(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
+        @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
         if (local10 == null) {
             return 0;
         } else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) {
@@ -93,7 +95,7 @@ public final class Inv extends Node {
 
     @OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
     public static int getItemType(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-        @Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
+        @Pc(10) Inv local10 = (Inv) objectContainerCache.get((long) arg0);
         if (local10 == null) {
             return -1;
         } else if (arg1 >= 0 && arg1 < local10.objectIds.length) {
@@ -105,7 +107,7 @@ public final class Inv extends Node {
 
     @OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
     public static void delete(@OriginalArg(0) int arg0) {
-        @Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
+        @Pc(14) Inv local14 = (Inv) objectContainerCache.get((long) arg0);
         if (local14 != null) {
             local14.unlink();
         }
diff --git a/client/src/main/java/rt4/JagString.java b/client/src/main/java/rt4/JagString.java
index 47fcbf8..6d26f83 100644
--- a/client/src/main/java/rt4/JagString.java
+++ b/client/src/main/java/rt4/JagString.java
@@ -18,7 +18,9 @@ public final class JagString implements StringInterface {
 
     @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
     public static final JagString EMPTY = parse("");
-    @OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
+	@OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
+	public static final JagString aClass100_853 = parse("null");
+	@OriginalMember(owner = "client!na", name = "T", descriptor = "[B")
 	public byte[] chars;
 
 	@OriginalMember(owner = "client!na", name = "lb", descriptor = "I")
@@ -40,7 +42,7 @@ public final class JagString implements StringInterface {
 		@Pc(5) int local5 = 0;
 		for (@Pc(7) int local7 = 0; local7 < arg1; local7++) {
 			if (arg2[arg0 + local7] == null) {
-				arg2[local7 + arg0] = Static193.aClass100_853;
+				arg2[local7 + arg0] = aClass100_853;
 			}
 			local5 += arg2[local7 + arg0].length;
 		}
@@ -128,7 +130,65 @@ public final class JagString implements StringInterface {
         return local13.method3151();
     }
 
-	@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
+    @OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
+    public static JagString parseInt(@OriginalArg(1) int arg0) {
+        return parseInt(false, arg0);
+    }
+
+	@OriginalMember(owner = "client!q", name = "a", descriptor = "(BZII)Lclient!na;")
+	public static JagString parseInt(@OriginalArg(1) boolean arg0, @OriginalArg(3) int arg1) {
+		@Pc(23) int local23 = 1;
+		@Pc(27) int local27 = arg1 / 10;
+		while (local27 != 0) {
+			local27 /= 10;
+			local23++;
+		}
+		@Pc(38) int local38 = local23;
+		if (arg1 < 0 || arg0) {
+			local38 = local23 + 1;
+		}
+		@Pc(46) byte[] local46 = new byte[local38];
+		if (arg1 < 0) {
+			local46[0] = 45;
+		} else if (arg0) {
+			local46[0] = 43;
+		}
+		for (@Pc(61) int local61 = 0; local61 < local23; local61++) {
+			@Pc(68) int local68 = arg1 % 10;
+			if (local68 < 0) {
+				local68 = -local68;
+			}
+			if (local68 > 9) {
+				local68 += 39;
+			}
+			local46[local38 - local61 - 1] = (byte) (local68 + 48);
+			arg1 /= 10;
+		}
+		@Pc(112) JagString local112 = new JagString();
+		local112.chars = local46;
+		local112.length = local38;
+		return local112;
+	}
+
+    @OriginalMember(owner = "client!an", name = "a", descriptor = "([BIII)Lclient!na;")
+    public static JagString decodeString(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
+        @Pc(7) JagString local7 = new JagString();
+        local7.chars = new byte[arg1];
+        local7.length = 0;
+        for (@Pc(22) int local22 = arg2; local22 < arg1 + arg2; local22++) {
+            if (arg0[local22] != 0) {
+                local7.chars[local7.length++] = arg0[local22];
+            }
+        }
+        return local7;
+    }
+
+    @OriginalMember(owner = "client!bg", name = "d", descriptor = "(II)Z")
+    public static boolean method530(@OriginalArg(0) int arg0) {
+        return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223;
+    }
+
+    @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z)Ljava/net/URL;")
 	public final URL method3107() throws MalformedURLException {
 		return new URL(new String(this.chars, 0, this.length));
 	}
@@ -389,7 +449,7 @@ public final class JagString implements StringInterface {
 				local12 = this.chars[local28] & 0xFF;
 				local28++;
 			}
-			if (Static17.method530(local12)) {
+			if (method530(local12)) {
 				local23++;
 			} else {
 				local20--;
@@ -404,7 +464,7 @@ public final class JagString implements StringInterface {
 				local14 = arg0.chars[local30] & 0xFF;
 				local30++;
 			}
-			if (Static17.method530(local14)) {
+			if (method530(local14)) {
 				local26++;
 			} else {
 				local17--;
@@ -888,7 +948,7 @@ public final class JagString implements StringInterface {
 		@Pc(17) Object local17 = BrowserControl.call(local12, arg0);
 		if (local17 instanceof String) {
 			@Pc(24) byte[] local24 = ((String) local17).getBytes();
-			local17 = Static10.decodeString(local24, local24.length, 0);
+			local17 = decodeString(local24, local24.length, 0);
 		}
 		return local17;
 	}
diff --git a/client/src/main/java/rt4/JavaAudioChannel.java b/client/src/main/java/rt4/JavaAudioChannel.java
index 024a76b..ebc0afe 100644
--- a/client/src/main/java/rt4/JavaAudioChannel.java
+++ b/client/src/main/java/rt4/JavaAudioChannel.java
@@ -29,6 +29,16 @@ public final class JavaAudioChannel extends AudioChannel {
 	@OriginalMember(owner = "client!qa", name = "N", descriptor = "Z")
 	private boolean aBoolean230 = false;
 
+	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(II)I")
+	public static int method3289(@OriginalArg(0) int arg0) {
+		@Pc(9) int local9 = (arg0 >>> 1 & 0xD5555555) + (arg0 & 0x55555555);
+		@Pc(19) int local19 = (local9 >>> 2 & 0x33333333) + (local9 & 0x33333333);
+		@Pc(31) int local31 = (local19 >>> 4) + local19 & 0xF0F0F0F;
+		@Pc(37) int local37 = local31 + (local31 >>> 8);
+		@Pc(43) int local43 = local37 + (local37 >>> 16);
+		return local43 & 0xFF;
+	}
+
 	@OriginalMember(owner = "client!qa", name = "d", descriptor = "()V")
 	@Override
 	protected final void flush() {
@@ -67,7 +77,7 @@ public final class JavaAudioChannel extends AudioChannel {
 			this.aSourceDataLine1.start();
 			this.anInt4645 = arg0;
 		} catch (@Pc(36) LineUnavailableException local36) {
-			if (Static248.method3289(arg0) == 1) {
+			if (method3289(arg0) == 1) {
 				this.aSourceDataLine1 = null;
 				throw local36;
 			} else {
diff --git a/client/src/main/java/rt4/Js5.java b/client/src/main/java/rt4/Js5.java
index 2899826..21bca28 100644
--- a/client/src/main/java/rt4/Js5.java
+++ b/client/src/main/java/rt4/Js5.java
@@ -48,6 +48,23 @@ public final class Js5 {
         }
     }
 
+    @OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZI[B)Ljava/lang/Object;")
+    public static Object method869(@OriginalArg(2) byte[] arg0) {
+        if (arg0 == null) {
+            return null;
+        }
+        if (arg0.length > 136 && !Static84.aBoolean127) {
+            try {
+                @Pc(27) ByteArray local27 = new DirectByteArray();
+                local27.set(arg0);
+                return local27;
+            } catch (@Pc(34) Throwable local34) {
+                Static84.aBoolean127 = true;
+            }
+        }
+        return arg0;
+    }
+
     @OriginalMember(owner = "client!ve", name = "a", descriptor = "(B)Z")
 	public final boolean fetchAll() {
 		if (!this.method4484()) {
@@ -305,7 +322,7 @@ public final class Js5 {
 			try {
 				local140 = Js5Compression.uncompress(local114);
 			} catch (@Pc(142) RuntimeException local142) {
-				System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Static71.method1442(local114, local114.length) + "," + Static71.method1442(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911);
+				System.out.println("T3 - " + (arg1 != null) + "," + arg0 + "," + local114.length + "," + Buffer.crc32(local114, local114.length) + "," + Buffer.crc32(local114, local114.length - 2) + "," + this.aClass70_2.anIntArray268[arg0] + "," + this.aClass70_2.anInt2911);
 				local140 = new byte[] { 0 };
 			}
 			if (this.discardPacked) {
@@ -357,7 +374,7 @@ public final class Js5 {
 					if (this.discardUnpacked) {
 						local53[local320] = local282[local252];
 					} else {
-						local53[local320] = Static33.method869(local282[local252]);
+						local53[local320] = method869(local282[local252]);
 					}
 				}
 			} else {
@@ -369,7 +386,7 @@ public final class Js5 {
 				if (this.discardUnpacked) {
 					local53[local213] = local140;
 				} else {
-					local53[local213] = Static33.method869(local140);
+					local53[local213] = method869(local140);
 				}
 			}
 			return true;
@@ -386,7 +403,7 @@ public final class Js5 {
 		if (this.discardPacked) {
 			this.anObjectArray32[arg0] = this.provider.method525(arg0);
 		} else {
-			this.anObjectArray32[arg0] = Static33.method869(this.provider.method525(arg0));
+			this.anObjectArray32[arg0] = method869(this.provider.method525(arg0));
 		}
 	}
 
diff --git a/client/src/main/java/rt4/Js5Index.java b/client/src/main/java/rt4/Js5Index.java
index 90c1115..155574b 100644
--- a/client/src/main/java/rt4/Js5Index.java
+++ b/client/src/main/java/rt4/Js5Index.java
@@ -52,7 +52,7 @@ public final class Js5Index {
 
 	@OriginalMember(owner = "client!ii", name = "<init>", descriptor = "([BI)V")
 	public Js5Index(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) {
-		this.anInt2911 = Static71.method1442(arg0, arg0.length);
+		this.anInt2911 = Buffer.crc32(arg0, arg0.length);
 		if (arg1 != this.anInt2911) {
 			throw new RuntimeException();
 		}
diff --git a/client/src/main/java/rt4/Js5NetQueue.java b/client/src/main/java/rt4/Js5NetQueue.java
index 74fb37d..1970818 100644
--- a/client/src/main/java/rt4/Js5NetQueue.java
+++ b/client/src/main/java/rt4/Js5NetQueue.java
@@ -199,7 +199,7 @@ public final class Js5NetQueue {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(Z)V")
-	public final void method2319() {
+	public final void drop() {
 		if (this.aClass95_1 == null) {
 			return;
 		}
@@ -246,7 +246,7 @@ public final class Js5NetQueue {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "c", descriptor = "(I)V")
-	public final void method2323() {
+	public final void breakConnection() {
 		if (this.aClass95_1 != null) {
 			this.aClass95_1.breakConnection();
 		}
diff --git a/client/src/main/java/rt4/Light.java b/client/src/main/java/rt4/Light.java
index 89a34df..188c430 100644
--- a/client/src/main/java/rt4/Light.java
+++ b/client/src/main/java/rt4/Light.java
@@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!gi")
 public final class Light {
 
-	@OriginalMember(owner = "client!gi", name = "a", descriptor = "Z")
+    @OriginalMember(owner = "client!f", name = "P", descriptor = "[I")
+    public static int[] anIntArray150;
+    @OriginalMember(owner = "client!gi", name = "a", descriptor = "Z")
 	public final boolean aBoolean124;
 
 	@OriginalMember(owner = "client!gi", name = "d", descriptor = "I")
@@ -70,7 +72,7 @@ public final class Light {
 
 	@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
 	public Light(@OriginalArg(0) Buffer arg0) {
-		if (Static62.anIntArray150 == null) {
+		if (anIntArray150 == null) {
 			Static84.method1771();
 		}
 		this.anInt2241 = arg0.g1();
@@ -118,7 +120,7 @@ public final class Light {
 		if (local29 == 1) {
 			local62 = (MathUtils.sin[local26] >> 6) + 1024;
 		} else if (local29 == 3) {
-			local62 = Static62.anIntArray150[local26] >> 1;
+			local62 = anIntArray150[local26] >> 1;
 		} else if (local29 == 4) {
 			local62 = local26 >> 10 << 11;
 		} else if (local29 == 2) {
diff --git a/client/src/main/java/rt4/LightingManager.java b/client/src/main/java/rt4/LightingManager.java
index bace134..ce51e74 100644
--- a/client/src/main/java/rt4/LightingManager.java
+++ b/client/src/main/java/rt4/LightingManager.java
@@ -1,10 +1,448 @@
 package rt4;
 
+import com.jogamp.opengl.GL2;
+import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
+import org.openrs2.deob.annotation.Pc;
 
 public class LightingManager {
+    @OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
+    private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
     @OriginalMember(owner = "client!jf", name = "l", descriptor = "I")
     public static int lightCount = 0;
     @OriginalMember(owner = "client!jf", name = "a", descriptor = "[Lclient!gi;")
     public static Light[] lights;
+    @OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
+    private static int[] anIntArray283;
+    @OriginalMember(owner = "client!jf", name = "d", descriptor = "I")
+    private static int anInt3029;
+    @OriginalMember(owner = "client!jf", name = "e", descriptor = "I")
+    private static int anInt3030;
+    @OriginalMember(owner = "client!jf", name = "f", descriptor = "[Z")
+    private static boolean[] aBooleanArray65;
+    @OriginalMember(owner = "client!jf", name = "g", descriptor = "[[[I")
+    private static int[][][] anIntArrayArrayArray11;
+    @OriginalMember(owner = "client!jf", name = "h", descriptor = "[I")
+    private static int[] anIntArray284;
+    @OriginalMember(owner = "client!jf", name = "i", descriptor = "I")
+    private static int anInt3031;
+    @OriginalMember(owner = "client!jf", name = "j", descriptor = "I")
+    private static int anInt3032;
+    @OriginalMember(owner = "client!jf", name = "k", descriptor = "I")
+    private static int anInt3033;
+    @OriginalMember(owner = "client!jf", name = "m", descriptor = "[Z")
+    private static boolean[] aBooleanArray66;
+    @OriginalMember(owner = "client!jf", name = "n", descriptor = "I")
+    private static int anInt3035;
+    @OriginalMember(owner = "client!jf", name = "o", descriptor = "I")
+    private static int anInt3036;
+    @OriginalMember(owner = "client!jf", name = "p", descriptor = "I")
+    private static int anInt3037;
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
+    public static void method2388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
+        if (!Preferences.highDetailLighting) {
+            return;
+        }
+        if (arg0 == 1 && arg5 > 0) {
+            method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6);
+        } else if (arg0 == 4 && arg5 < anInt3037 - 1) {
+            method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6);
+        } else if (arg0 == 8 && arg6 > 0) {
+            method2393(arg1, arg2, arg3, arg4, arg5, arg6 - 1);
+        } else if (arg0 == 2 && arg6 < anInt3036 - 1) {
+            method2393(arg1, arg2, arg3, arg4, arg5, arg6 + 1);
+        } else if (arg0 == 16 && arg5 > 0 && arg6 < anInt3036 - 1) {
+            method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 + 1);
+        } else if (arg0 == 32 && arg5 < anInt3037 - 1 && arg6 < anInt3036 - 1) {
+            method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 + 1);
+        } else if (arg0 == 128 && arg5 > 0 && arg6 > 0) {
+            method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 - 1);
+        } else if (arg0 == 64 && arg5 < anInt3037 - 1 && arg6 > 0) {
+            method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 - 1);
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
+    public static void method2389(@OriginalArg(0) Light arg0) {
+        if (lightCount >= 255) {
+            System.out.println("Number of lights added exceeds maximum!");
+        } else {
+            lights[lightCount++] = arg0;
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "()V")
+    public static void method2390() {
+        for (@Pc(1) int local1 = 0; local1 < 4; local1++) {
+            anIntArray284[local1] = -1;
+            method2396(local1);
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V")
+    public static void method2391(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
+        if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
+            return;
+        }
+        @Pc(20) int local20;
+        for (local20 = 0; local20 < 4; local20++) {
+            aBooleanArray66[local20] = false;
+        }
+        local20 = 0;
+        @Pc(33) int local33 = 0;
+        @Pc(35) int local35;
+        @Pc(40) int local40;
+        label112: for (local35 = arg4; local35 <= arg6; local35++) {
+            label110: for (local40 = arg5; local40 <= arg7; local40++) {
+                @Pc(51) int local51 = anIntArrayArrayArray11[arg3][local35][local40];
+                while (true) {
+                    while (true) {
+                        label96: while (true) {
+                            if (local51 == 0) {
+                                continue label110;
+                            }
+                            @Pc(59) int local59 = (local51 & 0xFF) - 1;
+                            local51 >>>= 0x8;
+                            @Pc(65) int local65;
+                            for (local65 = 0; local65 < local33; local65++) {
+                                if (local59 == anIntArray283[local65]) {
+                                    continue label96;
+                                }
+                            }
+                            for (local65 = 0; local65 < 4; local65++) {
+                                if (local59 == anIntArray284[local65]) {
+                                    if (!aBooleanArray66[local65]) {
+                                        aBooleanArray66[local65] = true;
+                                        local20++;
+                                        if (local20 == 4) {
+                                            break label112;
+                                        }
+                                    }
+                                    continue label96;
+                                }
+                            }
+                            anIntArray283[local33++] = local59;
+                            local20++;
+                            if (local20 == 4) {
+                                break label112;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        for (local35 = 0; local35 < local33; local35++) {
+            for (local40 = 0; local40 < 4; local40++) {
+                if (!aBooleanArray66[local40]) {
+                    anIntArray284[local40] = anIntArray283[local35];
+                    aBooleanArray66[local40] = true;
+                    method2403(local40, lights[anIntArray283[local35]], arg0, arg1, arg2);
+                    break;
+                }
+            }
+        }
+        for (local35 = 0; local35 < 4; local35++) {
+            if (!aBooleanArray66[local35]) {
+                anIntArray284[local35] = -1;
+                method2396(local35);
+            }
+        }
+        anInt3031 = arg3;
+        anInt3033 = arg4;
+        anInt3029 = arg5;
+        anInt3035 = arg6;
+        anInt3030 = arg7;
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(III)V")
+    public static void method2392() {
+        anInt3032 = 4;
+        anInt3037 = 104;
+        anInt3036 = 104;
+        anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V")
+    public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+        if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
+            return;
+        }
+        @Pc(20) int local20;
+        for (local20 = 0; local20 < 4; local20++) {
+            aBooleanArray66[local20] = false;
+        }
+        local20 = 0;
+        @Pc(39) int local39 = anIntArrayArrayArray11[arg3][arg4][arg5];
+        while (true) {
+            @Pc(47) int local47;
+            @Pc(53) int local53;
+            label72: while (local39 != 0) {
+                local47 = (local39 & 0xFF) - 1;
+                local39 >>>= 0x8;
+                for (local53 = 0; local53 < 4; local53++) {
+                    if (local47 == anIntArray284[local53]) {
+                        aBooleanArray66[local53] = true;
+                        continue label72;
+                    }
+                }
+                anIntArray283[local20++] = local47;
+            }
+            for (local47 = 0; local47 < local20; local47++) {
+                for (local53 = 0; local53 < 4; local53++) {
+                    if (!aBooleanArray66[local53]) {
+                        anIntArray284[local53] = anIntArray283[local47];
+                        aBooleanArray66[local53] = true;
+                        method2403(local53, lights[anIntArray283[local47]], arg0, arg1, arg2);
+                        break;
+                    }
+                }
+            }
+            for (local47 = 0; local47 < 4; local47++) {
+                if (!aBooleanArray66[local47]) {
+                    anIntArray284[local47] = -1;
+                    method2396(local47);
+                }
+            }
+            anInt3031 = arg3;
+            anInt3033 = arg4;
+            anInt3029 = arg5;
+            anInt3035 = arg4;
+            anInt3030 = arg5;
+            return;
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
+    public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
+        for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
+            lights[local1].method1765(arg1, arg0);
+        }
+        anInt3031 = -1;
+        anInt3033 = -1;
+        anInt3029 = -1;
+        anInt3035 = -1;
+        anInt3030 = -1;
+    }
+
+    @OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
+    public static void method2395() {
+        for (@Pc(1) int local1 = 0; local1 < lightCount; local1++) {
+            @Pc(8) Light local8 = lights[local1];
+            @Pc(11) int local11 = local8.anInt2241;
+            if (local8.aBoolean124) {
+                local11 = 0;
+            }
+            @Pc(19) int local19 = local8.anInt2241;
+            if (local8.aBoolean126) {
+                local19 = 3;
+            }
+            for (@Pc(26) int local26 = local11; local26 <= local19; local26++) {
+                @Pc(31) int local31 = 0;
+                @Pc(39) int local39 = (local8.anInt2245 >> 7) - local8.anInt2236;
+                if (local39 < 0) {
+                    local31 = -local39;
+                    local39 = 0;
+                }
+                @Pc(55) int local55 = (local8.anInt2245 >> 7) + local8.anInt2236;
+                if (local55 > anInt3036 - 1) {
+                    local55 = anInt3036 - 1;
+                }
+                for (@Pc(66) int local66 = local39; local66 <= local55; local66++) {
+                    @Pc(75) short local75 = local8.aShortArray30[local31++];
+                    @Pc(87) int local87 = (local8.anInt2240 >> 7) + (local75 >> 8) - local8.anInt2236;
+                    @Pc(95) int local95 = local87 + (local75 & 0xFF) - 1;
+                    if (local87 < 0) {
+                        local87 = 0;
+                    }
+                    if (local95 > anInt3037 - 1) {
+                        local95 = anInt3037 - 1;
+                    }
+                    for (@Pc(110) int local110 = local87; local110 <= local95; local110++) {
+                        @Pc(121) int local121 = anIntArrayArrayArray11[local26][local110][local66];
+                        if ((local121 & 0xFF) == 0) {
+                            anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1;
+                        } else if ((local121 & 0xFF00) == 0) {
+                            anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 8;
+                        } else if ((local121 & 0xFF0000) == 0) {
+                            anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 16;
+                        } else if ((local121 & 0xFF000000) == 0) {
+                            anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 24;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(I)V")
+    private static void method2396(@OriginalArg(0) int arg0) {
+        if (aBooleanArray65[arg0]) {
+            aBooleanArray65[arg0] = false;
+            @Pc(14) int local14 = arg0 + 16384 + 4;
+            @Pc(16) GL2 local16 = GlRenderer.gl;
+            local16.glDisable(local14);
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V")
+    public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+        if (!Preferences.highDetailLighting) {
+            return;
+        }
+        label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
+            if (anIntArray284[local4] != -1) {
+                @Pc(20) int local20 = anIntArrayArrayArray11[arg0][arg1][arg2];
+                @Pc(28) int local28;
+                while (local20 != 0) {
+                    local28 = (local20 & 0xFF) - 1;
+                    local20 >>>= 0x8;
+                    if (local28 == anIntArray284[local4]) {
+                        continue label43;
+                    }
+                }
+                local20 = anIntArrayArrayArray11[arg0][arg3][arg4];
+                while (local20 != 0) {
+                    local28 = (local20 & 0xFF) - 1;
+                    local20 >>>= 0x8;
+                    if (local28 == anIntArray284[local4]) {
+                        continue label43;
+                    }
+                }
+            }
+            anIntArray284[local4] = -1;
+            method2396(local4);
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
+    public static void method2398() {
+        lights = null;
+        anIntArray284 = null;
+        aBooleanArray65 = null;
+        anIntArray283 = null;
+        aBooleanArray66 = null;
+        anIntArrayArrayArray11 = null;
+    }
+
+    @OriginalMember(owner = "client!jf", name = "e", descriptor = "()V")
+    public static void method2400() {
+        @Pc(1) GL2 local1 = GlRenderer.gl;
+        @Pc(3) int local3;
+        for (local3 = 0; local3 < 4; local3++) {
+            @Pc(10) int local10 = local3 + 16388;
+            local1.glLightfv(local10, GL2.GL_AMBIENT, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
+            local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F);
+            local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F);
+        }
+        for (local3 = 0; local3 < 4; local3++) {
+            anIntArray284[local3] = -1;
+            method2396(local3);
+        }
+    }
+
+    @OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
+    public static void method2401() {
+        lights = new Light[255];
+        anIntArray284 = new int[4];
+        aBooleanArray65 = new boolean[4];
+        anIntArray283 = new int[4];
+        aBooleanArray66 = new boolean[4];
+        anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
+    public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
+        if (!Preferences.highDetailLighting) {
+            return;
+        }
+        @Pc(4) GL2 local4 = GlRenderer.gl;
+        MaterialManager.setMaterial(0, 0);
+        GlRenderer.setTextureCombineRgbMode(0);
+        GlRenderer.resetTextureMatrix();
+        GlRenderer.setTextureId(GlRenderer.anInt5328);
+        local4.glDepthMask(false);
+        GlRenderer.setLightingEnabled(false);
+        local4.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE);
+        local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
+        local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
+        local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
+        label71: for (@Pc(56) int local56 = 0; local56 < lightCount; local56++) {
+            @Pc(63) Light local63 = lights[local56];
+            @Pc(66) int local66 = local63.anInt2241;
+            if (local63.aBoolean125) {
+                local66--;
+            }
+            if (local63.aClass45_1 != null) {
+                @Pc(76) int local76 = 0;
+                @Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236;
+                @Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236;
+                if (local92 >= Static215.anInt4866) {
+                    local92 = Static215.anInt4866 - 1;
+                }
+                if (local84 < Static80.anInt4698) {
+                    local76 = Static80.anInt4698 - local84;
+                    local84 = Static80.anInt4698;
+                }
+                for (@Pc(112) int local112 = local84; local112 <= local92; local112++) {
+                    @Pc(121) short local121 = local63.aShortArray30[local76++];
+                    @Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236;
+                    @Pc(141) int local141 = local133 + (local121 & 0xFF) - 1;
+                    if (local133 < Static31.anInt987) {
+                        local133 = Static31.anInt987;
+                    }
+                    if (local141 >= Static2.anInt15) {
+                        local141 = Static2.anInt15 - 1;
+                    }
+                    for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
+                        @Pc(160) Tile local160 = null;
+                        if (local66 >= 0) {
+                            local160 = arg2[local66][local155][local112];
+                        }
+                        if (local66 < 0 || local160 != null && local160.aBoolean45) {
+                            GlRenderer.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F);
+                            local4.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.aFloat8 }, 0);
+                            local63.aClass45_1.method1556();
+                            continue label71;
+                        }
+                    }
+                }
+            }
+        }
+        local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
+        local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
+        local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
+        local4.glDepthMask(true);
+        local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0);
+        local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
+        GlRenderer.method4173();
+    }
+
+    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V")
+    private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+        @Pc(5) int local5 = arg0 + 16384 + 4;
+        @Pc(7) GL2 local7 = GlRenderer.gl;
+        if (!aBooleanArray65[arg0]) {
+            local7.glEnable(local5);
+            aBooleanArray65[arg0] = true;
+        }
+        local7.glLightf(local5, GL2.GL_QUADRATIC_ATTENUATION, arg1.aFloat9);
+        local7.glLightfv(local5, GL2.GL_DIFFUSE, arg1.aFloatArray3, 0);
+        aFloatArray17[0] = arg1.anInt2240 - arg2;
+        aFloatArray17[1] = arg1.anInt2235 - arg3;
+        aFloatArray17[2] = arg1.anInt2245 - arg4;
+        local7.glLightfv(local5, GL2.GL_POSITION, aFloatArray17, 0);
+    }
+
+    @OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
+    public static void method2404() {
+        lightCount = 0;
+        for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
+            for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
+                for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {
+                    anIntArrayArrayArray11[local3][local8][local13] = 0;
+                }
+            }
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/LinkedList.java b/client/src/main/java/rt4/LinkedList.java
index 0585b61..44303b7 100644
--- a/client/src/main/java/rt4/LinkedList.java
+++ b/client/src/main/java/rt4/LinkedList.java
@@ -33,7 +33,7 @@ public final class LinkedList {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "b", descriptor = "(I)Lclient!ab;")
-	public final Node method2279() {
+	public final Node tail() {
 		@Pc(7) Node local7 = this.aClass3_109.aClass3_223;
 		if (this.aClass3_109 == local7) {
 			this.aClass3_110 = null;
@@ -67,7 +67,7 @@ public final class LinkedList {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "d", descriptor = "(I)Lclient!ab;")
-	public final Node method2286() {
+	public final Node prev() {
 		@Pc(13) Node local13 = this.aClass3_110;
 		if (this.aClass3_109 == local13) {
 			this.aClass3_110 = null;
diff --git a/client/src/main/java/rt4/LoadingBarAwt.java b/client/src/main/java/rt4/LoadingBarAwt.java
index f72c5ce..d9f5a8e 100644
--- a/client/src/main/java/rt4/LoadingBarAwt.java
+++ b/client/src/main/java/rt4/LoadingBarAwt.java
@@ -10,6 +10,8 @@ import java.awt.Font;
 public class LoadingBarAwt {
     @OriginalMember(owner = "client!tg", name = "a", descriptor = "Ljava/awt/FontMetrics;")
     public static FontMetrics aFontMetrics1;
+    @OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
+    public static Image anImage3;
 
     @OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
     public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
@@ -27,10 +29,10 @@ public class LoadingBarAwt {
                 arg0 = new Color(140, 17, 17);
             }
             try {
-                if (Static149.anImage3 == null) {
-                    Static149.anImage3 = GameShell.canvas.createImage(304, 34);
+                if (anImage3 == null) {
+                    anImage3 = GameShell.canvas.createImage(304, 34);
                 }
-                @Pc(56) Graphics local56 = Static149.anImage3.getGraphics();
+                @Pc(56) Graphics local56 = anImage3.getGraphics();
                 local56.setColor(arg0);
                 local56.drawRect(0, 0, 303, 33);
                 local56.fillRect(2, 2, arg3 * 3, 30);
@@ -40,7 +42,7 @@ public class LoadingBarAwt {
                 local56.setFont(Static222.aFont1);
                 local56.setColor(Color.white);
                 arg2.method3112(22, (304 - arg2.method3155(aFontMetrics1)) / 2, local56);
-                local6.drawImage(Static149.anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
+                local6.drawImage(anImage3, GameShell.canvasWidth / 2 - 152, GameShell.canvasHeight / 2 + -18, null);
             } catch (@Pc(134) Exception local134) {
                 @Pc(140) int local140 = GameShell.canvasWidth / 2 - 152;
                 @Pc(146) int local146 = GameShell.canvasHeight / 2 - 18;
@@ -68,6 +70,6 @@ public class LoadingBarAwt {
     public static void clear() {
         aFontMetrics1 = null;
         Static222.aFont1 = null;
-        Static149.anImage3 = null;
+        anImage3 = null;
     }
 }
diff --git a/client/src/main/java/rt4/Loc.java b/client/src/main/java/rt4/Loc.java
index 79e0583..c467c44 100644
--- a/client/src/main/java/rt4/Loc.java
+++ b/client/src/main/java/rt4/Loc.java
@@ -93,7 +93,7 @@ public final class Loc extends Entity {
 					local67 = local67.getMultiLoc();
 				}
 				if (local67 != null) {
-					Static9.method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303);
+					method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303);
 				}
 			}
 		}
@@ -141,7 +141,55 @@ public final class Loc extends Entity {
 		}
 	}
 
-	@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V")
+    @OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V")
+    public static void method181(@OriginalArg(0) LocType arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
+        @Pc(5) int local5 = arg2 & 0x3;
+        @Pc(28) int local28;
+        @Pc(31) int local31;
+        if (local5 == 1 || local5 == 3) {
+            local28 = arg0.length;
+            local31 = arg0.width;
+        } else {
+            local31 = arg0.length;
+            local28 = arg0.width;
+        }
+        @Pc(53) int local53;
+        @Pc(51) int local51;
+        if (arg6 + local31 > 104) {
+            local51 = arg6 + 1;
+            local53 = arg6;
+        } else {
+            local53 = arg6 + (local31 >> 1);
+            local51 = arg6 + (local31 + 1 >> 1);
+        }
+        @Pc(80) int local80 = (arg5 << 7) + (local28 << 6);
+        @Pc(88) int local88 = (arg6 << 7) + (local31 << 6);
+        @Pc(96) int local96;
+        @Pc(100) int local100;
+        if (arg5 + local28 > 104) {
+            local96 = arg5;
+            local100 = arg5 + 1;
+        } else {
+            local96 = arg5 + (local28 >> 1);
+            local100 = (local28 + 1 >> 1) + arg5;
+        }
+        @Pc(120) int[][] local120 = SceneGraph.tileHeights[arg7];
+        @Pc(122) int local122 = 0;
+        @Pc(148) int local148 = local120[local96][local51] + local120[local96][local53] + local120[local100][local53] + local120[local100][local51] >> 2;
+        @Pc(158) int[][] local158;
+        if (arg7 != 0) {
+            local158 = SceneGraph.tileHeights[0];
+            local122 = local148 - (local158[local96][local51] + local158[local100][local53] + local158[local96][local53] + local158[local100][local51] >> 2);
+        }
+        local158 = null;
+        if (arg7 < 3) {
+            local158 = SceneGraph.tileHeights[arg7 + 1];
+        }
+        @Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88);
+        Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1);
+    }
+
+    @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V")
 	@Override
 	public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (GlRenderer.enabled) {
diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java
index 8095afb..df5f8ae 100644
--- a/client/src/main/java/rt4/LocType.java
+++ b/client/src/main/java/rt4/LocType.java
@@ -10,6 +10,8 @@ public final class LocType {
 
     @OriginalMember(owner = "client!wf", name = "o", descriptor = "[Lclient!gb;")
     public static final RawModel[] tempModels = new RawModel[4];
+    @OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;")
+	public static Loc_Class139 aClass139_1 = new Loc_Class139();
     @OriginalMember(owner = "client!pb", name = "a", descriptor = "[S")
 	private short[] retextureSource;
 
@@ -58,8 +60,10 @@ public final class LocType {
 	@OriginalMember(owner = "client!pb", name = "u", descriptor = "I")
 	private int anInt4407 = 0;
 
+	@OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;")
+	public static final JagString aClass100_475 = JagString.parse("null");
 	@OriginalMember(owner = "client!pb", name = "E", descriptor = "Lclient!na;")
-	public JagString name = Static81.aClass100_475;
+	public JagString name = aClass100_475;
 
 	@OriginalMember(owner = "client!pb", name = "D", descriptor = "Z")
 	public boolean aBoolean212 = true;
@@ -749,9 +753,9 @@ public final class LocType {
 			if (local225 == null) {
 				local235 = this.method3427(arg0, false, arg3);
 				if (local235 == null) {
-					Static171.aClass139_1.aClass8_10 = null;
-					Static171.aClass139_1.aClass36_Sub1_3 = null;
-					return Static171.aClass139_1;
+					aClass139_1.aClass8_10 = null;
+					aClass139_1.aClass36_Sub1_3 = null;
+					return aClass139_1;
 				}
 				if (arg3 == 10 && arg0 > 3) {
 					local235.method4554(256);
@@ -775,10 +779,10 @@ public final class LocType {
 				local330.method4110(this.aByte15, this.aShort26, local235, arg2, arg5, arg1, arg4, arg9);
 			}
 			local330.method4111(this.anInt4429 == 0 && !this.aBoolean214, true, true, this.anInt4429 == 0, true, false);
-			Static171.aClass139_1.aClass8_10 = local330;
+			aClass139_1.aClass8_10 = local330;
 			local330.aBoolean259 = local298;
-			Static171.aClass139_1.aClass36_Sub1_3 = local265;
-			return Static171.aClass139_1;
+			aClass139_1.aClass36_Sub1_3 = local265;
+			return aClass139_1;
 		}
 		if (this.shapes == null) {
 			local29 = (this.id << 10) + arg0;
@@ -796,8 +800,8 @@ public final class LocType {
 		if (local60 == null) {
 			@Pc(69) RawModel local69 = this.method3418(arg0, arg3);
 			if (local69 == null) {
-				Static171.aClass139_1.aClass8_10 = null;
-				return Static171.aClass139_1;
+				aClass139_1.aClass8_10 = null;
+				return aClass139_1;
 			}
 			local69.method1681();
 			if (arg3 == 10 && arg0 > 3) {
@@ -823,8 +827,8 @@ public final class LocType {
 				local60 = ((RawModel) local60).method1670(this.aByte15, this.aShort26, arg2, arg5, arg1, arg4, arg9);
 			}
 		}
-		Static171.aClass139_1.aClass8_10 = local60;
-		return Static171.aClass139_1;
+		aClass139_1.aClass8_10 = local60;
+		return aClass139_1;
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;")
@@ -863,8 +867,8 @@ public final class LocType {
 				}
 				local195 = local195.method4586(this.aByte15, this.aShort26, arg6, arg9, arg1, arg3, arg0, false);
 			}
-			Static171.aClass139_1.aClass8_10 = local195;
-			return Static171.aClass139_1;
+			aClass139_1.aClass8_10 = local195;
+			return aClass139_1;
 		}
 		if (this.shapes == null) {
 			local30 = arg5 + (this.id << 10);
@@ -895,9 +899,9 @@ public final class LocType {
 			local82.method4554(256);
 		}
 		if (arg7) {
-			Static171.aClass139_1.aClass36_Sub1_3 = local82.method4124(arg2);
+			aClass139_1.aClass36_Sub1_3 = local82.method4124(arg2);
 		} else {
-			Static171.aClass139_1.aClass36_Sub1_3 = null;
+			aClass139_1.aClass36_Sub1_3 = null;
 		}
 		if (this.aByte15 != 0) {
 			if (!local80) {
@@ -905,8 +909,8 @@ public final class LocType {
 			}
 			local82.method4110(this.aByte15, this.aShort26, local46, arg6, arg9, arg1, arg3, arg0);
 		}
-		Static171.aClass139_1.aClass8_10 = local82;
-		return Static171.aClass139_1;
+		aClass139_1.aClass8_10 = local82;
+		return aClass139_1;
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!na;II)Lclient!na;")
diff --git a/client/src/main/java/rt4/MidiInstrument.java b/client/src/main/java/rt4/MidiInstrument.java
index 5d956fc..9e6123e 100644
--- a/client/src/main/java/rt4/MidiInstrument.java
+++ b/client/src/main/java/rt4/MidiInstrument.java
@@ -290,7 +290,7 @@ public final class MidiInstrument extends Node {
 				local734 += 2;
 				local1014 = (local995 - local954) * local958 + (local995 - local954) / 2;
 				for (local1016 = local954; local1016 < local995; local1016++) {
-					local1031 = Static222.method3825(local1014, local995 - local954);
+					local1031 = method3825(local1014, local995 - local954);
 					local1014 += local1001 - local958;
 					this.aByteArray45[local1016] = (byte) (local1031 * this.aByteArray45[local1016] + 32 >> 6);
 				}
@@ -328,7 +328,7 @@ public final class MidiInstrument extends Node {
 				local1207 = local327[local734 + 1] << 1;
 				local734 += 2;
 				for (local1016 = local954; local1016 < local995; local1016++) {
-					local1031 = Static222.method3825(local1014, local995 - local954);
+					local1031 = method3825(local1014, local995 - local954);
 					local1014 += local1207 - local1133;
 					@Pc(1237) int local1237 = local1031 + (this.aByteArray43[local1016] & 0xFF);
 					if (local1237 < 0) {
@@ -385,7 +385,13 @@ public final class MidiInstrument extends Node {
 		}
 	}
 
-	@OriginalMember(owner = "client!jk", name = "d", descriptor = "(B)V")
+    @OriginalMember(owner = "client!sa", name = "c", descriptor = "(III)I")
+	public static int method3825(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
+		@Pc(12) int local12 = arg0 >>> 31;
+		return (arg0 + local12) / arg1 - local12;
+	}
+
+    @OriginalMember(owner = "client!jk", name = "d", descriptor = "(B)V")
 	public final void method2432() {
 		this.anIntArray289 = null;
 	}
diff --git a/client/src/main/java/rt4/MidiPcmStream.java b/client/src/main/java/rt4/MidiPcmStream.java
index 6777aec..e6a4bd8 100644
--- a/client/src/main/java/rt4/MidiPcmStream.java
+++ b/client/src/main/java/rt4/MidiPcmStream.java
@@ -265,7 +265,7 @@ public final class MidiPcmStream extends PcmStream {
 	private void method4427(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
 		this.method4434(arg2, 64, arg1);
 		if ((this.anIntArray508[arg1] & 0x2) != 0) {
-			for (@Pc(28) MidiNote local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2279(); local28 != null; local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.method2286()) {
+			for (@Pc(28) MidiNote local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.tail(); local28 != null; local28 = (MidiNote) this.aClass3_Sub3_Sub3_1.aClass69_126.prev()) {
 				if (arg1 == local28.anInt3773 && local28.anInt3767 < 0) {
 					this.aClass3_Sub25ArrayArray1[arg1][local28.anInt3779] = null;
 					this.aClass3_Sub25ArrayArray1[arg1][arg2] = local28;
diff --git a/client/src/main/java/rt4/MidiPlayer.java b/client/src/main/java/rt4/MidiPlayer.java
index 2428749..894bd0a 100644
--- a/client/src/main/java/rt4/MidiPlayer.java
+++ b/client/src/main/java/rt4/MidiPlayer.java
@@ -13,13 +13,23 @@ public class MidiPlayer {
     public static int anInt441 = 0;
     @OriginalMember(owner = "client!uh", name = "P", descriptor = "Lclient!ve;")
     public static Js5 aClass153_103;
+    @OriginalMember(owner = "client!ui", name = "R", descriptor = "I")
+    public static int anInt5527;
+    @OriginalMember(owner = "client!wi", name = "ab", descriptor = "I")
+    public static int anInt5853;
+    @OriginalMember(owner = "client!eg", name = "t", descriptor = "I")
+    public static int anInt1757;
+    @OriginalMember(owner = "client!fl", name = "u", descriptor = "Z")
+    public static boolean aBoolean116;
+    @OriginalMember(owner = "client!rb", name = "f", descriptor = "Lclient!ve;")
+    public static Js5 aClass153_87;
 
     @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z")
     public static boolean method2699() {
         try {
             if (anInt441 == 2) {
                 if (Static144.aClass3_Sub29_1 == null) {
-                    Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, Static277.anInt5853, Static226.anInt5085);
+                    Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, anInt5853, Static226.anInt5085);
                     if (Static144.aClass3_Sub29_1 == null) {
                         return false;
                     }
@@ -27,10 +37,10 @@ public class MidiPlayer {
                 if (aClass89_1 == null) {
                     aClass89_1 = new SoundBank(Static78.aClass153_32, aClass153_103);
                 }
-                if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, Static210.aClass153_87, aClass89_1)) {
+                if (Static172.aClass3_Sub3_Sub4_2.method4411(Static144.aClass3_Sub29_1, aClass153_87, aClass89_1)) {
                     Static172.aClass3_Sub3_Sub4_2.method4412();
-                    Static172.aClass3_Sub3_Sub4_2.method4447(Static253.anInt5527);
-                    Static172.aClass3_Sub3_Sub4_2.method4431(Static72.aBoolean116, Static144.aClass3_Sub29_1);
+                    Static172.aClass3_Sub3_Sub4_2.method4447(anInt5527);
+                    Static172.aClass3_Sub3_Sub4_2.method4431(aBoolean116, Static144.aClass3_Sub29_1);
                     anInt441 = 0;
                     Static144.aClass3_Sub29_1 = null;
                     aClass89_1 = null;
@@ -51,29 +61,29 @@ public class MidiPlayer {
 
     @OriginalMember(owner = "client!ce", name = "a", descriptor = "(II)V")
     public static void method801() {
-        Static253.anInt5527 = 0;
+        anInt5527 = 0;
         Static226.anInt5085 = -1;
         anInt441 = 1;
-        Static57.anInt1757 = 2;
-        Static72.aBoolean116 = false;
+        anInt1757 = 2;
+        aBoolean116 = false;
         Static172.aClass153_70 = null;
-        Static277.anInt5853 = -1;
+        anInt5853 = -1;
     }
 
     @OriginalMember(owner = "client!v", name = "a", descriptor = "(ZIILclient!ve;ZII)V")
     public static void playFadeOut(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(5) int arg2) {
         Static172.aClass153_70 = arg1;
         Static226.anInt5085 = 0;
-        Static277.anInt5853 = arg0;
-        Static72.aBoolean116 = false;
+        anInt5853 = arg0;
+        aBoolean116 = false;
         anInt441 = 1;
-        Static57.anInt1757 = 2;
-        Static253.anInt5527 = arg2;
+        anInt1757 = 2;
+        anInt5527 = arg2;
     }
 
     @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z")
     public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) {
-        Static210.aClass153_87 = arg1;
+        aClass153_87 = arg1;
         Static78.aClass153_32 = arg3;
         aClass153_103 = arg2;
         Static172.aClass3_Sub3_Sub4_2 = arg0;
@@ -86,7 +96,7 @@ public class MidiPlayer {
             if (anInt441 == 1) {
                 @Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440();
                 if (local16 > 0 && Static172.aClass3_Sub3_Sub4_2.method4414()) {
-                    local16 -= Static57.anInt1757;
+                    local16 -= anInt1757;
                     if (local16 < 0) {
                         local16 = 0;
                     }
diff --git a/client/src/main/java/rt4/MiniMap.java b/client/src/main/java/rt4/MiniMap.java
index ccc994c..d039c3b 100644
--- a/client/src/main/java/rt4/MiniMap.java
+++ b/client/src/main/java/rt4/MiniMap.java
@@ -21,6 +21,10 @@ public class MiniMap {
     public static Sprite sprite;
     @OriginalMember(owner = "client!ug", name = "m", descriptor = "I")
     public static int locs = 0;
+    @OriginalMember(owner = "client!wb", name = "d", descriptor = "I")
+    public static int state = 0;
+    @OriginalMember(owner = "client!we", name = "w", descriptor = "I")
+    public static int anInt4130 = 0;
 
     @OriginalMember(owner = "client!ma", name = "a", descriptor = "([IIIIII)V")
     public static void renderTile(@OriginalArg(0) int[] pixels, @OriginalArg(1) int index, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@@ -114,7 +118,7 @@ public class MiniMap {
             locs = 0;
             for (local37 = 0; local37 < 104; local37++) {
                 for (local76 = 0; local76 < 104; local76++) {
-                    @Pc(169) long local169 = Static20.method602(Player.level, local37 + 0, local76);
+                    @Pc(169) long local169 = SceneGraph.method602(Player.level, local37 + 0, local76);
                     if (local169 != 0L) {
                         @Pc(184) LocType local184 = LocTypeList.get((int) (local169 >>> 32) & Integer.MAX_VALUE);
                         @Pc(187) int local187 = local184.mapElement;
@@ -203,4 +207,216 @@ public class MiniMap {
         softwareSprite = null;
         return true;
     }
+
+    @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IBIILclient!be;)V")
+    public static void render(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) {
+        client.audioLoop();
+        if (GlRenderer.enabled) {
+            GlRaster.setClip(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
+        } else {
+            SoftwareRaster.setClip(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
+        }
+        if (state != 2 && state != 5 && sprite != null) {
+            @Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
+            @Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
+            @Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
+            if (GlRenderer.enabled) {
+                ((GlSprite) sprite).renderRotatedTransparent(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, anInt4130 + 256, (GlSprite) arg3.method489(false));
+            } else {
+                ((SoftwareSprite) sprite).renderRotatedTransparent(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45);
+            }
+            @Pc(146) int local146;
+            @Pc(181) int local181;
+            @Pc(150) int local150;
+            @Pc(154) int local154;
+            @Pc(231) int local231;
+            @Pc(200) int local200;
+            @Pc(239) int local239;
+            @Pc(271) int local271;
+            if (Static235.mapElementList != null) {
+                for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) {
+                    if (Static235.mapElementList.method3892(local117)) {
+                        local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
+                        local150 = MathUtils.sin[local48];
+                        local154 = MathUtils.cos[local48];
+                        @Pc(156) Font local156 = Fonts.p11Full;
+                        @Pc(164) int local164 = local150 * 256 / (anInt4130 + 256);
+                        local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
+                        @Pc(189) int local189 = local154 * 256 / (anInt4130 + 256);
+                        local200 = local181 * local189 - local146 * local164 >> 16;
+                        if (Static235.mapElementList.method3894(local117) == 1) {
+                            local156 = Fonts.p12Full;
+                        }
+                        if (Static235.mapElementList.method3894(local117) == 2) {
+                            local156 = Fonts.b12Full;
+                        }
+                        local231 = local164 * local181 + local189 * local146 >> 16;
+                        local239 = local156.method2856(Static235.mapElementList.aClass100Array153[local117], 100);
+                        @Pc(245) int local245 = local231 - local239 / 2;
+                        if (local245 >= -arg3.anInt445 && local245 <= arg3.anInt445 && local200 >= -arg3.anInt459 && local200 <= arg3.anInt459) {
+                            local271 = 16777215;
+                            if (Static235.mapElementList.anIntArray444[local117] != -1) {
+                                local271 = Static235.mapElementList.anIntArray444[local117];
+                            }
+                            if (GlRenderer.enabled) {
+                                GlFont.method1188((GlSprite) arg3.method489(false));
+                            } else {
+                                SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
+                            }
+                            local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
+                            if (GlRenderer.enabled) {
+                                GlFont.method1173();
+                            } else {
+                                SoftwareRaster.method2482();
+                            }
+                        }
+                    }
+                }
+            }
+            for (local146 = 0; local146 < locs; local146++) {
+                local181 = locX[local146] * 4 + 2 - PlayerList.self.xFine / 32;
+                local150 = locZ[local146] * 4 + 2 - PlayerList.self.zFine / 32;
+                @Pc(382) LocType local382 = LocTypeList.get(locId[local146]);
+                if (local382.multiLocs != null) {
+                    local382 = local382.getMultiLoc();
+                    if (local382 == null || local382.mapElement == -1) {
+                        continue;
+                    }
+                }
+                method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
+            }
+            for (local146 = 0; local146 < 104; local146++) {
+                for (local181 = 0; local181 < 104; local181++) {
+                    @Pc(439) LinkedList local439 = Static159.objStacks[Player.level][local146][local181];
+                    if (local439 != null) {
+                        local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32;
+                        local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32;
+                        method1446(arg3, Sprites.mapdots[0], local231, local154, arg1, arg2);
+                    }
+                }
+            }
+            for (local146 = 0; local146 < NpcList.size; local146++) {
+                @Pc(498) Npc local498 = NpcList.npcs[NpcList.ids[local146]];
+                if (local498 != null && local498.method2682()) {
+                    @Pc(507) NpcType local507 = local498.type;
+                    if (local507 != null && local507.multiNpcs != null) {
+                        local507 = local507.getMultiNpc();
+                    }
+                    if (local507 != null && local507.aBoolean184 && local507.aBoolean183) {
+                        local154 = local498.xFine / 32 - PlayerList.self.xFine / 32;
+                        local231 = local498.zFine / 32 - PlayerList.self.zFine / 32;
+                        if (local507.anInt3739 == -1) {
+                            method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2);
+                        } else {
+                            method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
+                        }
+                    }
+                }
+            }
+            for (local146 = 0; local146 < PlayerList.size; local146++) {
+                @Pc(591) Player local591 = PlayerList.players[PlayerList.ids[local146]];
+                if (local591 != null && local591.method2682()) {
+                    local154 = local591.zFine / 32 - PlayerList.self.zFine / 32;
+                    local150 = local591.xFine / 32 - PlayerList.self.xFine / 32;
+                    @Pc(624) long local624 = local591.username.encode37();
+                    @Pc(626) boolean local626 = false;
+                    for (local239 = 0; local239 < FriendsList.size; local239++) {
+                        if (local624 == FriendsList.encodedUsernames[local239] && FriendsList.worlds[local239] != 0) {
+                            local626 = true;
+                            break;
+                        }
+                    }
+                    @Pc(660) boolean local660 = false;
+                    for (local271 = 0; local271 < ClanChat.size; local271++) {
+                        if (local624 == ClanChat.members[local271].key) {
+                            local660 = true;
+                            break;
+                        }
+                    }
+                    @Pc(682) boolean local682 = false;
+                    if (PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650) {
+                        local682 = true;
+                    }
+                    if (local626) {
+                        method1446(arg3, Sprites.mapdots[3], local154, local150, arg1, arg2);
+                    } else if (local660) {
+                        method1446(arg3, Sprites.mapdots[5], local154, local150, arg1, arg2);
+                    } else if (local682) {
+                        method1446(arg3, Sprites.mapdots[4], local154, local150, arg1, arg2);
+                    } else {
+                        method1446(arg3, Sprites.mapdots[2], local154, local150, arg1, arg2);
+                    }
+                }
+            }
+            @Pc(756) MapMarker[] local756 = Static143.hintMapMarkers;
+            for (local181 = 0; local181 < local756.length; local181++) {
+                @Pc(770) MapMarker local770 = local756[local181];
+                if (local770 != null && local770.type != 0 && client.loop % 20 < 10) {
+                    if (local770.type == 1 && local770.actorTargetId >= 0 && local770.actorTargetId < NpcList.npcs.length) {
+                        @Pc(804) Npc local804 = NpcList.npcs[local770.actorTargetId];
+                        if (local804 != null) {
+                            local231 = local804.xFine / 32 - PlayerList.self.xFine / 32;
+                            local200 = local804.zFine / 32 - PlayerList.self.zFine / 32;
+                            Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
+                        }
+                    }
+                    if (local770.type == 2) {
+                        local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
+                        local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
+                        Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
+                    }
+                    if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
+                        @Pc(905) Player local905 = PlayerList.players[local770.actorTargetId];
+                        if (local905 != null) {
+                            local200 = local905.zFine / 32 - PlayerList.self.zFine / 32;
+                            local231 = local905.xFine / 32 - PlayerList.self.xFine / 32;
+                            Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
+                        }
+                    }
+                }
+            }
+            if (Static115.mapFlagX != 0) {
+                local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
+                local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32;
+                method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
+            }
+            if (GlRenderer.enabled) {
+                GlRaster.method1186(arg2 + arg3.anInt445 / 2 - 1, arg1 + -1 - -(arg3.anInt459 / 2), 3, 3, 16777215);
+            } else {
+                SoftwareRaster.fillRect(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215);
+            }
+        } else if (GlRenderer.enabled) {
+            @Pc(1041) Sprite local1041 = arg3.method489(false);
+            if (local1041 != null) {
+                local1041.renderTransparent(arg2, arg1);
+            }
+        } else {
+            SoftwareRaster.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45);
+        }
+        InterfaceList.rectangleRedraw[arg0] = true;
+    }
+
+    @OriginalMember(owner = "client!em", name = "a", descriptor = "(Lclient!be;Lclient!qf;IIIBI)V")
+	public static void method1446(@OriginalArg(0) Component arg0, @OriginalArg(1) Sprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
+		if (arg1 == null) {
+			return;
+		}
+		@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
+		@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
+		@Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10;
+		if (local39 * local39 < local21) {
+			return;
+		}
+		@Pc(50) int local50 = MathUtils.sin[local27];
+		@Pc(58) int local58 = local50 * 256 / (anInt4130 + 256);
+		@Pc(62) int local62 = MathUtils.cos[local27];
+		@Pc(70) int local70 = local62 * 256 / (anInt4130 + 256);
+		@Pc(81) int local81 = local58 * arg2 + arg3 * local70 >> 16;
+		@Pc(92) int local92 = local70 * arg2 - arg3 * local58 >> 16;
+		if (GlRenderer.enabled) {
+			((GlSprite) arg1).method1425(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, arg0.anInt459 / 2 + arg4 - (local92 + arg1.anInt1866 / 2), (GlSprite) arg0.method489(false));
+		} else {
+			((SoftwareSprite) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java
index 1157382..c603db6 100644
--- a/client/src/main/java/rt4/MiniMenu.java
+++ b/client/src/main/java/rt4/MiniMenu.java
@@ -39,12 +39,56 @@ public class MiniMenu {
     public static final JagString aClass100_965 = JagString.parse("<col=ffff00>");
     @OriginalMember(owner = "client!vg", name = "f", descriptor = "Lclient!na;")
     public static final JagString aClass100_1081 = JagString.parse("<col=80ff00>");
+    @OriginalMember(owner = "client!r", name = "d", descriptor = "Z")
+    public static final boolean aBoolean237 = false;
+    @OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;")
+    public static final JagString aClass100_961 = JagString.parse(" )2>");
+    @OriginalMember(owner = "client!a", name = "j", descriptor = "Lclient!na;")
+    public static final JagString aClass100_2 = JagString.parse("<col=ffffff> )4 ");
+    @OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;")
+    public static final JagString aClass100_168 = JagString.parse(": ");
+    @OriginalMember(owner = "client!qf", name = "Q", descriptor = "Lclient!na;")
+    public static final JagString aClass100_407 = JagString.parse(" )2> <col=ffff00>");
+    @OriginalMember(owner = "client!qf", name = "R", descriptor = "Lclient!na;")
+    public static final JagString aClass100_408 = JagString.parse(" )2> ");
+    @OriginalMember(owner = "client!aj", name = "R", descriptor = "Lclient!na;")
+    public static final JagString aClass100_32 = JagString.parse("<col=ff9040>");
+    @OriginalMember(owner = "client!fl", name = "V", descriptor = "Lclient!na;")
+	public static final JagString aClass100_448 = JagString.parse("(Y");
     @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;")
 	public static JagString aClass100_203 = null;
     @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;")
     public static JagString aClass100_545 = null;
     @OriginalMember(owner = "client!sk", name = "kb", descriptor = "I")
 	public static int size = 0;
+    @OriginalMember(owner = "client!v", name = "b", descriptor = "Lclient!be;")
+    public static Component aClass13_7;
+    @OriginalMember(owner = "client!gd", name = "i", descriptor = "Lclient!na;")
+    public static JagString aClass100_466 = null;
+    @OriginalMember(owner = "client!vd", name = "C", descriptor = "I")
+	public static int anInt5014 = 0;
+    @OriginalMember(owner = "client!wf", name = "f", descriptor = "I")
+    public static int anInt4999;
+    @OriginalMember(owner = "client!wf", name = "d", descriptor = "I")
+	public static int anInt4997;
+    @OriginalMember(owner = "client!be", name = "Ec", descriptor = "I")
+    public static int anInt506 = -1;
+    @OriginalMember(owner = "client!fl", name = "P", descriptor = "I")
+    public static int anInt2043 = 0;
+    @OriginalMember(owner = "client!hj", name = "e", descriptor = "I")
+    public static int anInt2512;
+    @OriginalMember(owner = "client!mh", name = "Y", descriptor = "Z")
+    public static boolean aBoolean187 = false;
+    @OriginalMember(owner = "client!mj", name = "i", descriptor = "I")
+    public static int anInt3902 = 0;
+    @OriginalMember(owner = "client!ha", name = "q", descriptor = "I")
+    public static int anInt2388 = 0;
+    @OriginalMember(owner = "client!kd", name = "zb", descriptor = "I")
+    public static int anInt3259 = 0;
+    @OriginalMember(owner = "client!ef", name = "g", descriptor = "I")
+    public static int anInt1742 = -1;
+    @OriginalMember(owner = "client!jb", name = "p", descriptor = "I")
+    public static int anInt2954 = -1;
 
     @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
     public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) {
@@ -88,19 +132,19 @@ public class MiniMenu {
                         if (component.objTypes[local171] > 0) {
                             @Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component);
                             @Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1);
-                            if (Static260.anInt5014 == 1 && local267.isObjOpsEnabled()) {
+                            if (anInt5014 == 1 && local267.isObjOpsEnabled()) {
                                 if (Static224.anInt5062 != component.id || Static185.anInt4370 != local171) {
                                     add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local276.name}), local171, (short) 40, LocalizedText.USE, component.id);
                                 }
                             } else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) {
                                 @Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
-                                if ((Static274.anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) {
-                                    add(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static78.aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
+                                if ((anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) {
+                                    add(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id);
                                 }
                             } else {
                                 @Pc(296) JagString[] local296 = local276.inventoryOps;
-                                if (Static208.aBoolean237) {
-                                    local296 = Static279.method4664(local296);
+                                if (aBoolean237) {
+                                    local296 = annotateOps(local296);
                                 }
                                 @Pc(309) int local309;
                                 @Pc(334) byte local334;
@@ -112,12 +156,12 @@ public class MiniMenu {
                                             } else {
                                                 local334 = 58;
                                             }
-                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
                                         }
                                     }
                                 }
                                 if (local267.method507()) {
-                                    add(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
+                                    add(Static169.anInt4075, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 22, LocalizedText.USE, component.id);
                                 }
                                 if (local267.isObjOpsEnabled() && local296 != null) {
                                     for (local309 = 2; local309 >= 0; local309--) {
@@ -132,13 +176,13 @@ public class MiniMenu {
                                             if (local309 == 2) {
                                                 local334 = 43;
                                             }
-                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
                                         }
                                     }
                                 }
                                 local296 = component.aClass100Array19;
-                                if (Static208.aBoolean237) {
-                                    local296 = Static279.method4664(local296);
+                                if (aBoolean237) {
+                                    local296 = annotateOps(local296);
                                 }
                                 if (local296 != null) {
                                     for (local309 = 4; local309 >= 0; local309--) {
@@ -159,11 +203,11 @@ public class MiniMenu {
                                             if (local309 == 4) {
                                                 local334 = 13;
                                             }
-                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
+                                            add(-1, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, local334, local296[local309], component.id);
                                         }
                                     }
                                 }
-                                add(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { Static8.aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
+                                add(Static225.anInt5073, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_32, local276.name}), local171, (short) 1006, LocalizedText.EXAMINE, component.id);
                             }
                         }
                     }
@@ -178,7 +222,7 @@ public class MiniMenu {
             for (local171 = 9; local171 >= 5; local171--) {
                 @Pc(765) JagString local765 = InterfaceList.getOp(component, local171);
                 if (local765 != null) {
-                    add(Static8.getOpCursor(local171, component), (long) (local171 + 1), component.opBase, component.createdComponentId, (short) 1003, local765, component.id);
+                    add(getOpCursor(local171, component), (long) (local171 + 1), component.opBase, component.createdComponentId, (short) 1003, local765, component.id);
                 }
             }
             local47 = Static97.getTargetVerb(component);
@@ -188,14 +232,14 @@ public class MiniMenu {
             for (local173 = 4; local173 >= 0; local173--) {
                 @Pc(828) JagString local828 = InterfaceList.getOp(component, local173);
                 if (local828 != null) {
-                    add(Static8.getOpCursor(local173, component), (long) (local173 + 1), component.opBase, component.createdComponentId, (short) 9, local828, component.id);
+                    add(getOpCursor(local173, component), (long) (local173 + 1), component.opBase, component.createdComponentId, (short) 9, local828, component.id);
                 }
             }
             if (InterfaceList.getServerActiveProperties(component).method506()) {
                 add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id);
             }
-        } else if (InterfaceList.getServerActiveProperties(component).method508() && (Static274.anInt4999 & 0x20) != 0) {
-            add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, component.opBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
+        } else if (InterfaceList.getServerActiveProperties(component).method508() && (anInt4999 & 0x20) != 0) {
+            add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.opBase}), component.createdComponentId, (short) 12, aClass100_545, component.id);
         }
     }
 
@@ -307,10 +351,10 @@ public class MiniMenu {
             Protocol.outboundBuffer.p4le2(local19);
             Protocol.outboundBuffer.p2le(local15);
             Protocol.outboundBuffer.p4le2(Static224.anInt5062);
-            Protocol.outboundBuffer.p2leadd(Static274.anInt4997);
+            Protocol.outboundBuffer.p2leadd(anInt4997);
             Protocol.outboundBuffer.p2leadd(local36);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         @Pc(192) Npc local192;
@@ -355,8 +399,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2add(local36);
             Protocol.outboundBuffer.p2add(local15);
             Protocol.outboundBuffer.p4me(local19);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 42) {
@@ -378,8 +422,8 @@ public class MiniMenu {
                 Cross.milliseconds = 0;
                 Cross.y = Mouse.clickY;
                 Protocol.outboundBuffer.p1isaac(239);
-                Protocol.outboundBuffer.p4le2(Static98.anInt2512);
-                Protocol.outboundBuffer.p2add(Static15.anInt506);
+                Protocol.outboundBuffer.p4le2(anInt2512);
+                Protocol.outboundBuffer.p2add(anInt506);
                 Protocol.outboundBuffer.p2leadd(local36);
             }
         }
@@ -424,15 +468,15 @@ public class MiniMenu {
                 Protocol.outboundBuffer.p1isaac(92);
                 Protocol.outboundBuffer.p2leadd(local36);
             } else {
-                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
+                Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, ObjTypeList.get(local36).name}));
             }
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 60) {
             if (local36 == 0) {
-                Static113.method3556(Player.level, local15, local19);
+                method3556(Player.level, local15, local19);
             } else if (local36 == 1) {
                 if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
                     Cheat.teleport(Static225.originX + local15, Static142.originZ + local19, Player.level);
@@ -442,7 +486,7 @@ public class MiniMenu {
                     Protocol.outboundBuffer.p2((int)Camera.yawTarget);
                     Protocol.outboundBuffer.p1(57);
                     Protocol.outboundBuffer.p1(Static59.anInt1814);
-                    Protocol.outboundBuffer.p1(Static273.anInt4130);
+                    Protocol.outboundBuffer.p1(MiniMap.anInt4130);
                     Protocol.outboundBuffer.p1(89);
                     Protocol.outboundBuffer.p2(PlayerList.self.xFine);
                     Protocol.outboundBuffer.p2(PlayerList.self.zFine);
@@ -473,19 +517,19 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2leadd(local15);
             Protocol.outboundBuffer.p2add(local36);
             Protocol.outboundBuffer.p4le2(local19);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 3) {
             Protocol.outboundBuffer.p1isaac(253);
-            Protocol.outboundBuffer.p4le2(Static98.anInt2512);
+            Protocol.outboundBuffer.p4le2(anInt2512);
             Protocol.outboundBuffer.p2leadd(local15);
             Protocol.outboundBuffer.p4le2(local19);
             Protocol.outboundBuffer.p2add(local36);
-            Protocol.outboundBuffer.p2le(Static15.anInt506);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            Protocol.outboundBuffer.p2le(anInt506);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 10) {
@@ -517,14 +561,14 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2add(local36);
             Protocol.outboundBuffer.p2le(local15);
             Protocol.outboundBuffer.p4le2(local19);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) {
             Protocol.outboundBuffer.p1isaac(134);
             Protocol.outboundBuffer.p2add(Static225.originX + local15);
-            Protocol.outboundBuffer.p2(Static274.anInt4997);
+            Protocol.outboundBuffer.p2(anInt4997);
             Protocol.outboundBuffer.p2le(local19 + Static142.originZ);
             Protocol.outboundBuffer.p2(Static185.anInt4370);
             Protocol.outboundBuffer.p4me(Static224.anInt5062);
@@ -550,8 +594,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2le(local36);
             Protocol.outboundBuffer.p2add(local15);
             Protocol.outboundBuffer.p4rme(local19);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 21) {
@@ -590,15 +634,15 @@ public class MiniMenu {
                 Static53.method1294();
                 @Pc(1493) ServerActiveProperties local1493 = InterfaceList.getServerActiveProperties(local693);
                 Static247.method4246(local19, local15, local1493.getTargetMask(), local1493.anInt540, local693.anInt499, local693.anInt484);
-                Static260.anInt5014 = 0;
+                anInt5014 = 0;
                 aClass100_545 = Static97.getTargetVerb(local693);
                 if (aClass100_545 == null) {
                     aClass100_545 = Static250.aClass100_1042;
                 }
                 if (local693.usingScripts) {
-                    Static78.aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 });
+                    aClass100_466 = JagString.concatenate(new JagString[] { local693.opBase, Static204.aClass100_896 });
                 } else {
-                    Static78.aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
+                    aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, Static204.aClass100_896 });
                 }
             }
             return;
@@ -620,8 +664,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p4le2(local19);
             Protocol.outboundBuffer.p2leadd(local36);
             Protocol.outboundBuffer.p2leadd(local15);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 15) {
@@ -633,8 +677,8 @@ public class MiniMenu {
                 Cross.x = Mouse.clickX;
                 Cross.y = Mouse.clickY;
                 Protocol.outboundBuffer.p1isaac(195);
-                Protocol.outboundBuffer.p2add(Static15.anInt506);
-                Protocol.outboundBuffer.p4le2(Static98.anInt2512);
+                Protocol.outboundBuffer.p2add(anInt506);
+                Protocol.outboundBuffer.p4le2(anInt2512);
                 Protocol.outboundBuffer.p2leadd(local36);
             }
         }
@@ -661,8 +705,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2add(local15);
             Protocol.outboundBuffer.p2(local36);
             Protocol.outboundBuffer.p4rme(local19);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 2) {
@@ -702,7 +746,7 @@ public class MiniMenu {
                 Protocol.outboundBuffer.p4me(Static224.anInt5062);
                 Protocol.outboundBuffer.p2le(Static185.anInt4370);
                 Protocol.outboundBuffer.p2le(local36);
-                Protocol.outboundBuffer.p2leadd(Static274.anInt4997);
+                Protocol.outboundBuffer.p2leadd(anInt4997);
             }
         }
         if (local23 == 59) {
@@ -727,7 +771,7 @@ public class MiniMenu {
             Protocol.outboundBuffer.p1isaac(101);
             Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
             Protocol.outboundBuffer.p2le(Static185.anInt4370);
-            Protocol.outboundBuffer.p2le(Static274.anInt4997);
+            Protocol.outboundBuffer.p2le(anInt4997);
             Protocol.outboundBuffer.p2le(local36);
             Protocol.outboundBuffer.p2leadd(Static142.originZ + local19);
             Protocol.outboundBuffer.p4me(Static224.anInt5062);
@@ -743,12 +787,12 @@ public class MiniMenu {
         if (local23 == 11) {
             if (local36 == 0) {
                 Static125.anInt3096 = 1;
-                Static113.method3556(Player.level, local15, local19);
+                method3556(Player.level, local15, local19);
             } else if (local36 == 1) {
                 Protocol.outboundBuffer.p1isaac(131);
-                Protocol.outboundBuffer.p4me(Static98.anInt2512);
+                Protocol.outboundBuffer.p4me(anInt2512);
                 Protocol.outboundBuffer.p2add(Static225.originX + local15);
-                Protocol.outboundBuffer.p2leadd(Static15.anInt506);
+                Protocol.outboundBuffer.p2leadd(anInt506);
                 Protocol.outboundBuffer.p2add(local19 + Static142.originZ);
             }
         }
@@ -773,7 +817,7 @@ public class MiniMenu {
                 Cross.x = Mouse.clickX;
                 Protocol.outboundBuffer.p1isaac(248);
                 Protocol.outboundBuffer.p2leadd(local36);
-                Protocol.outboundBuffer.p2(Static274.anInt4997);
+                Protocol.outboundBuffer.p2(anInt4997);
                 Protocol.outboundBuffer.p2(Static185.anInt4370);
                 Protocol.outboundBuffer.p4me(Static224.anInt5062);
             }
@@ -783,8 +827,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p4rme(local19);
             Protocol.outboundBuffer.p2(local15);
             Protocol.outboundBuffer.p2add(local36);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 24) {
@@ -809,8 +853,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p1isaac(233);
             Protocol.outboundBuffer.p2leadd(local19 + Static142.originZ);
             Protocol.outboundBuffer.p2add(Static225.originX + local15);
-            Protocol.outboundBuffer.p2leadd(Static15.anInt506);
-            Protocol.outboundBuffer.p4rme(Static98.anInt2512);
+            Protocol.outboundBuffer.p2leadd(anInt506);
+            Protocol.outboundBuffer.p4rme(anInt2512);
             Protocol.outboundBuffer.p2add((int) (local31 >>> 32) & Integer.MAX_VALUE);
         }
         if (local23 == 13) {
@@ -818,8 +862,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p4(local19);
             Protocol.outboundBuffer.p2add(local15);
             Protocol.outboundBuffer.p2le(local36);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 57) {
@@ -839,10 +883,10 @@ public class MiniMenu {
             local693 = InterfaceList.getComponent(local19);
             Static224.anInt5062 = local19;
             Static185.anInt4370 = local15;
-            Static260.anInt5014 = 1;
-            Static274.anInt4997 = local36;
+            anInt5014 = 1;
+            anInt4997 = local36;
             InterfaceList.redraw(local693);
-            aClass100_203 = JagString.concatenate(new JagString[] { Static8.aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 });
+            aClass100_203 = JagString.concatenate(new JagString[] { aClass100_32, ObjTypeList.get(local36).name, Static204.aClass100_896 });
             if (aClass100_203 == null) {
                 aClass100_203 = Static92.NULL;
             }
@@ -860,8 +904,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p2le(local15);
             Protocol.outboundBuffer.p4rme(local19);
             Protocol.outboundBuffer.p2leadd(local36);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 30) {
@@ -881,8 +925,8 @@ public class MiniMenu {
             Protocol.outboundBuffer.p4le2(local19);
             Protocol.outboundBuffer.p2le(local15);
             Protocol.outboundBuffer.p2le(local36);
-            Static72.anInt2043 = 0;
-            Static257.aClass13_7 = InterfaceList.getComponent(local19);
+            anInt2043 = 0;
+            aClass13_7 = InterfaceList.getComponent(local19);
             Static250.anInt5444 = local15;
         }
         if (local23 == 39) {
@@ -895,23 +939,23 @@ public class MiniMenu {
             Cross.type = 2;
             Cross.milliseconds = 0;
             Protocol.outboundBuffer.p1isaac(73);
-            Protocol.outboundBuffer.p4rme(Static98.anInt2512);
+            Protocol.outboundBuffer.p4rme(anInt2512);
             Protocol.outboundBuffer.p2(Static142.originZ + local19);
             Protocol.outboundBuffer.p2leadd(local36);
             Protocol.outboundBuffer.p2leadd(local15 + Static225.originX);
-            Protocol.outboundBuffer.p2le(Static15.anInt506);
+            Protocol.outboundBuffer.p2le(anInt506);
         }
         if (local23 == 12) {
             Protocol.outboundBuffer.p1isaac(82);
-            Protocol.outboundBuffer.p2(Static15.anInt506);
+            Protocol.outboundBuffer.p2(anInt506);
             Protocol.outboundBuffer.p4rme(local19);
-            Protocol.outboundBuffer.p4(Static98.anInt2512);
+            Protocol.outboundBuffer.p4(anInt2512);
             Protocol.outboundBuffer.p2leadd(local15);
         }
         if (local23 == 36) {
             if (local36 == 0) {
                 Static187.anInt4422 = 1;
-                Static113.method3556(Player.level, local15, local19);
+                method3556(Player.level, local15, local19);
             } else if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
                 Cheat.teleport(local15 + Static225.originX, Static142.originZ - -local19, Player.level);
             } else {
@@ -962,15 +1006,15 @@ public class MiniMenu {
                 Protocol.outboundBuffer.p2leadd(local36);
             }
         }
-        if (Static260.anInt5014 != 0) {
-            Static260.anInt5014 = 0;
+        if (anInt5014 != 0) {
+            anInt5014 = 0;
             InterfaceList.redraw(InterfaceList.getComponent(Static224.anInt5062));
         }
         if (Static241.aBoolean302) {
             Static53.method1294();
         }
-        if (Static257.aClass13_7 != null && Static72.anInt2043 == 0) {
-            InterfaceList.redraw(Static257.aClass13_7);
+        if (aClass13_7 != null && anInt2043 == 0) {
+            InterfaceList.redraw(aClass13_7);
         }
     }
 
@@ -995,4 +1039,411 @@ public class MiniMenu {
             return aClass100_1081;
         }
     }
+
+    @OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIIIB)V")
+    public static void addEntries(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+        @Pc(15) int local15;
+        @Pc(47) int x;
+        if (anInt5014 == 0) {
+            @Pc(13) int local13 = Static148.screenUpperY;
+            local15 = Static1.screenLowerY;
+            @Pc(17) int local17 = Static247.screenUpperX;
+            @Pc(19) int local19 = Static240.screenLowerX;
+            @Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
+            x = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
+            if (Static241.aBoolean302 && (anInt4999 & 0x40) != 0) {
+                @Pc(61) Component local61 = Static201.method1418(anInt2512, anInt506);
+                if (local61 == null) {
+                    Static53.method1294();
+                } else {
+                    add(Static246.anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x);
+                }
+            } else {
+                if (client.game == 1) {
+                    add(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, x);
+                }
+                add(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.walkText, x);
+            }
+        }
+        @Pc(112) long local112 = -1L;
+        for (local15 = 0; local15 < Static2.anInt7; local15++) {
+            @Pc(121) long local121 = Static259.aLongArray11[local15];
+            x = (int) local121 & 0x7F;
+            @Pc(133) int local133 = (int) local121 >> 29 & 0x3;
+            @Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
+            @Pc(147) int z = (int) local121 >> 7 & 0x7F;
+            if (local121 != local112) {
+                local112 = local121;
+                @Pc(240) int local240;
+                if (local133 == 2 && SceneGraph.isLocValid(Player.level, x, z, local121)) {
+                    @Pc(172) LocType local172 = LocTypeList.get(local140);
+                    if (local172.multiLocs != null) {
+                        local172 = local172.getMultiLoc();
+                    }
+                    if (local172 == null) {
+                        continue;
+                    }
+                    if (anInt5014 == 1) {
+                        add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] {aClass100_203, Static27.aClass100_164, local172.name}), x, (short) 14, LocalizedText.USE, z);
+                    } else if (Static241.aBoolean302) {
+                        @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
+                        if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
+                            add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, Static27.aClass100_164, local172.name}), x, (short) 38, aClass100_545, z);
+                        }
+                    } else {
+                        @Pc(228) JagString[] local228 = local172.ops;
+                        if (aBoolean237) {
+                            local228 = annotateOps(local228);
+                        }
+                        if (local228 != null) {
+                            for (local240 = 4; local240 >= 0; local240--) {
+                                if (local228[local240] != null) {
+                                    @Pc(254) short local254 = 0;
+                                    if (local240 == 0) {
+                                        local254 = 42;
+                                    }
+                                    if (local240 == 1) {
+                                        local254 = 50;
+                                    }
+                                    @Pc(268) int local268 = -1;
+                                    if (local240 == 2) {
+                                        local254 = 49;
+                                    }
+                                    if (local172.cursor1Op == local240) {
+                                        local268 = local172.cursor1;
+                                    }
+                                    if (local240 == 3) {
+                                        local254 = 46;
+                                    }
+                                    if (local240 == local172.cursor2Op) {
+                                        local268 = local172.cursor2;
+                                    }
+                                    if (local240 == 4) {
+                                        local254 = 1001;
+                                    }
+                                    add(local268, local121, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, local254, local228[local240], z);
+                                }
+                            }
+                        }
+                        add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z);
+                    }
+                }
+                @Pc(514) int local514;
+                @Pc(526) int local526;
+                @Pc(479) int local479;
+                @Pc(493) int local493;
+                @Pc(502) Npc local502;
+                @Pc(597) Player local597;
+                if (local133 == 1) {
+                    @Pc(421) Npc local421 = NpcList.npcs[local140];
+                    if ((local421.type.size & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.size & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
+                        local479 = local421.xFine + 64 - local421.type.size * 64;
+                        local240 = local421.zFine - (local421.type.size - 1) * 64;
+                        for (local493 = 0; local493 < NpcList.size; local493++) {
+                            local502 = NpcList.npcs[NpcList.ids[local493]];
+                            local514 = local502.xFine + 64 - local502.type.size * 64;
+                            local526 = local502.zFine + 64 - local502.type.size * 64;
+                            if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.size - (local514 - local479 >> 7) >= local502.type.size && local240 <= local526 && local502.type.size <= local421.type.size - (local526 - local240 >> 7)) {
+                                addNpcEntries(local502.type, x, NpcList.ids[local493], z);
+                            }
+                        }
+                        for (local493 = 0; local493 < PlayerList.size; local493++) {
+                            local597 = PlayerList.players[PlayerList.ids[local493]];
+                            local514 = local597.xFine + 64 - local597.getSize() * 64;
+                            local526 = local597.zFine + 64 - local597.getSize() * 64;
+                            if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.size - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.size - (local526 - local240 >> 7)) {
+                                addPlayerEntries(PlayerList.ids[local493], z, local597, x);
+                            }
+                        }
+                    }
+                    addNpcEntries(local421.type, x, local140, z);
+                }
+                if (local133 == 0) {
+                    @Pc(688) Player player = PlayerList.players[local140];
+                    if ((player.xFine & 0x7F) == 64 && (player.zFine & 0x7F) == 64) {
+                        local479 = player.xFine - (player.getSize() - 1) * 64;
+                        local240 = player.zFine + 64 - player.getSize() * 64;
+                        for (local493 = 0; local493 < NpcList.size; local493++) {
+                            local502 = NpcList.npcs[NpcList.ids[local493]];
+                            local514 = local502.xFine + 64 - local502.type.size * 64;
+                            local526 = local502.zFine + 64 - local502.type.size * 64;
+                            if (local502 != null && local514 >= local479 && local502.type.size <= player.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.size <= player.getSize() - (local526 - local240 >> 7)) {
+                                addNpcEntries(local502.type, x, NpcList.ids[local493], z);
+                            }
+                        }
+                        for (local493 = 0; local493 < PlayerList.size; local493++) {
+                            local597 = PlayerList.players[PlayerList.ids[local493]];
+                            local514 = local597.xFine - (local597.getSize() - 1) * 64;
+                            local526 = local597.zFine + 64 - local597.getSize() * 64;
+                            if (local597 != null && local597 != player && local479 <= local514 && local597.getSize() <= player.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= player.getSize() - (local526 - local240 >> 7)) {
+                                addPlayerEntries(PlayerList.ids[local493], z, local597, x);
+                            }
+                        }
+                    }
+                    addPlayerEntries(local140, z, player, x);
+                }
+                if (local133 == 3) {
+                    @Pc(931) LinkedList objStacks = Static159.objStacks[Player.level][x][z];
+                    if (objStacks != null) {
+                        for (@Pc(940) ObjStackNode node = (ObjStackNode) objStacks.tail(); node != null; node = (ObjStackNode) objStacks.prev()) {
+                            local240 = node.value.type;
+                            @Pc(951) ObjType local951 = ObjTypeList.get(local240);
+                            if (anInt5014 == 1) {
+                                add(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { aClass100_203, aClass100_947, local951.name }), x, (short) 33, LocalizedText.USE, z);
+                            } else if (Static241.aBoolean302) {
+                                @Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
+                                if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) {
+                                    add(Static246.anInt5393, (long) local240, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local951.name }), x, (short) 39, aClass100_545, z);
+                                }
+                            } else {
+                                @Pc(997) JagString[] local997 = local951.ops;
+                                if (aBoolean237) {
+                                    local997 = annotateOps(local997);
+                                }
+                                for (local514 = 4; local514 >= 0; local514--) {
+                                    if (local997 != null && local997[local514] != null) {
+                                        @Pc(1025) byte local1025 = 0;
+                                        if (local514 == 0) {
+                                            local1025 = 21;
+                                        }
+                                        if (local514 == 1) {
+                                            local1025 = 34;
+                                        }
+                                        @Pc(1041) int local1041 = -1;
+                                        if (local514 == local951.cursor1Op) {
+                                            local1041 = local951.cursor1;
+                                        }
+                                        if (local514 == 2) {
+                                            local1025 = 18;
+                                        }
+                                        if (local951.cursor2Op == local514) {
+                                            local1041 = local951.cursor2;
+                                        }
+                                        if (local514 == 3) {
+                                            local1025 = 20;
+                                        }
+                                        if (local514 == 4) {
+                                            local1025 = 24;
+                                        }
+                                        add(local1041, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, local1025, local997[local514], z);
+                                    }
+                                }
+                                add(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { aClass100_32, local951.name}), x, (short) 1002, LocalizedText.EXAMINE, z);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!bc", name = "f", descriptor = "(B)Lclient!na;")
+    public static JagString method471() {
+        @Pc(32) JagString local32;
+        if (anInt5014 == 1 && size < 2) {
+            local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, aClass100_203, aClass100_961});
+        } else if (Static241.aBoolean302 && size < 2) {
+            local32 = JagString.concatenate(new JagString[] { aClass100_545, LocalizedText.MINISEPARATOR, aClass100_466, aClass100_961});
+        } else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && size > 2) {
+            local32 = getOp(size - 2);
+        } else {
+            local32 = getOp(size - 1);
+        }
+        if (size > 2) {
+            local32 = JagString.concatenate(new JagString[] { local32, aClass100_2, JagString.parseInt(size - 2), LocalizedText.MOREOPTIONS});
+        }
+        return local32;
+    }
+
+    @OriginalMember(owner = "client!wk", name = "a", descriptor = "(I[Lclient!na;)[Lclient!na;")
+    public static JagString[] annotateOps(@OriginalArg(1) JagString[] ops) {
+        @Pc(8) JagString[] annotatedOps = new JagString[5];
+        for (@Pc(15) int i = 0; i < 5; i++) {
+            annotatedOps[i] = JagString.concatenate(new JagString[] { JagString.parseInt(i), aClass100_168 });
+            if (ops != null && ops[i] != null) {
+                annotatedOps[i] = JagString.concatenate(new JagString[] { annotatedOps[i], ops[i] });
+            }
+        }
+        return annotatedOps;
+    }
+
+    @OriginalMember(owner = "client!u", name = "a", descriptor = "(Lclient!me;IIII)V")
+    public static void addNpcEntries(@OriginalArg(0) NpcType arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
+        if (size >= 400) {
+            return;
+        }
+        if (arg0.multiNpcs != null) {
+            arg0 = arg0.getMultiNpc();
+        }
+        if (arg0 == null || !arg0.aBoolean183) {
+            return;
+        }
+        @Pc(35) JagString local35 = arg0.name;
+        if (arg0.combatLevel != 0) {
+            @Pc(47) JagString local47 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
+            local35 = JagString.concatenate(new JagString[] { local35, getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), Static70.aClass100_593, local47, JagString.parseInt(arg0.combatLevel), aClass100_448 });
+        }
+        if (anInt5014 == 1) {
+            add(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] {aClass100_203, aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
+        } else if (Static241.aBoolean302) {
+            @Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
+            if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) {
+                add(Static246.anInt5393, (long) arg2, JagString.concatenate(new JagString[] {aClass100_466, aClass100_407, local35 }), arg1, (short) 45, aClass100_545, arg3);
+            }
+        } else {
+            @Pc(129) JagString[] local129 = arg0.ops;
+            if (aBoolean237) {
+                local129 = annotateOps(local129);
+            }
+            @Pc(140) int local140;
+            if (local129 != null) {
+                for (local140 = 4; local140 >= 0; local140--) {
+                    if (local129[local140] != null && (client.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) {
+                        @Pc(161) byte local161 = 0;
+                        if (local140 == 0) {
+                            local161 = 17;
+                        }
+                        if (local140 == 1) {
+                            local161 = 16;
+                        }
+                        @Pc(176) int local176 = -1;
+                        if (local140 == 2) {
+                            local161 = 4;
+                        }
+                        if (local140 == 3) {
+                            local161 = 19;
+                        }
+                        if (arg0.cursor1Op == local140) {
+                            local176 = arg0.cursor1;
+                        }
+                        if (local140 == arg0.cursor2Op) {
+                            local176 = arg0.cursor2;
+                        }
+                        if (local140 == 4) {
+                            local161 = 2;
+                        }
+                        add(local176, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
+                    }
+                }
+            }
+            if (client.game == 0 && local129 != null) {
+                for (local140 = 4; local140 >= 0; local140--) {
+                    if (local129[local140] != null && local129[local140].equalsIgnoreCase(LocalizedText.ATTACK)) {
+                        @Pc(271) short local271 = 0;
+                        if (arg0.combatLevel > PlayerList.self.combatLevel) {
+                            local271 = 2000;
+                        }
+                        @Pc(281) short local281 = 0;
+                        if (local140 == 0) {
+                            local281 = 17;
+                        }
+                        if (local140 == 1) {
+                            local281 = 16;
+                        }
+                        if (local140 == 2) {
+                            local281 = 4;
+                        }
+                        if (local140 == 3) {
+                            local281 = 19;
+                        }
+                        if (local140 == 4) {
+                            local281 = 2;
+                        }
+                        if (local281 != 0) {
+                            local281 += local271;
+                        }
+                        add(arg0.anInt3752, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
+                    }
+                }
+            }
+            add(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] {aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
+        }
+    }
+
+    @OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V")
+    public static void addPlayerEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) {
+        if (PlayerList.self == arg2 || size >= 400) {
+            return;
+        }
+        @Pc(158) JagString local158;
+        if (arg2.anInt1671 == 0) {
+            @Pc(22) boolean local22 = true;
+            if (PlayerList.self.anInt1667 != -1 && arg2.anInt1667 != -1) {
+                @Pc(43) int local43 = arg2.combatLevel < PlayerList.self.combatLevel ? PlayerList.self.combatLevel : arg2.combatLevel;
+                @Pc(58) int local58 = PlayerList.self.anInt1667 < arg2.anInt1667 ? PlayerList.self.anInt1667 : arg2.anInt1667;
+                @Pc(69) int local69 = local43 * 10 / 100 + local58 + 5;
+                @Pc(76) int local76 = PlayerList.self.combatLevel - arg2.combatLevel;
+                if (local76 < 0) {
+                    local76 = -local76;
+                }
+                if (local69 < local76) {
+                    local22 = false;
+                }
+            }
+            @Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
+            if (arg2.combatLevel < arg2.anInt1656) {
+                local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static70.aClass100_593, local95, JagString.parseInt(arg2.combatLevel), Static78.aClass100_465, JagString.parseInt(arg2.anInt1656 - arg2.combatLevel), aClass100_448 });
+            } else {
+                local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static70.aClass100_593, local95, JagString.parseInt(arg2.combatLevel), aClass100_448 });
+            }
+        } else {
+            local158 = JagString.concatenate(new JagString[] { arg2.getName(), Static70.aClass100_593, LocalizedText.SKILL, JagString.parseInt(arg2.anInt1671), aClass100_448 });
+        }
+        @Pc(275) int local275;
+        if (anInt5014 == 1) {
+            add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
+        } else if (!Static241.aBoolean302) {
+            for (local275 = 7; local275 >= 0; local275--) {
+                if (Player.options[local275] != null) {
+                    @Pc(291) short local291 = 0;
+                    if (client.game == 0 && Player.options[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
+                        if (arg2.combatLevel > PlayerList.self.combatLevel) {
+                            local291 = 2000;
+                        }
+                        if (PlayerList.self.anInt1650 != 0 && arg2.anInt1650 != 0) {
+                            if (PlayerList.self.anInt1650 == arg2.anInt1650) {
+                                local291 = 2000;
+                            } else {
+                                local291 = 0;
+                            }
+                        }
+                    } else if (Player.secondaryOptions[local275]) {
+                        local291 = 2000;
+                    }
+                    @Pc(353) short local353 = Static5.aShortArray2[local275];
+                    @Pc(358) short local358 = (short) (local353 + local291);
+                    add(Player.cursors[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Player.options[local275], arg1);
+                }
+            }
+        } else if ((anInt4999 & 0x8) != 0) {
+            add(Static246.anInt5393, (long) arg0, JagString.concatenate(new JagString[] {aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, aClass100_545, arg1);
+        }
+        for (local275 = 0; local275 < size; local275++) {
+            if (actions[local275] == 60) {
+                opBases[local275] = JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 });
+                break;
+            }
+        }
+    }
+
+    @OriginalMember(owner = "client!aj", name = "a", descriptor = "(BILclient!be;)I")
+    public static int getOpCursor(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
+        if (!InterfaceList.getServerActiveProperties(arg1).method503(arg0) && arg1.anObjectArray29 == null) {
+            return -1;
+        } else if (arg1.anIntArray39 == null || arg0 >= arg1.anIntArray39.length) {
+            return -1;
+        } else {
+            return arg1.anIntArray39[arg0];
+        }
+    }
+
+    @OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
+	public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+		aBoolean187 = true;
+		anInt3902 = arg0;
+		anInt2388 = arg1;
+		anInt3259 = arg2;
+		anInt1742 = -1;
+		anInt2954 = -1;
+	}
 }
diff --git a/client/src/main/java/rt4/MixerPcmStream.java b/client/src/main/java/rt4/MixerPcmStream.java
index 8918511..3663dfe 100644
--- a/client/src/main/java/rt4/MixerPcmStream.java
+++ b/client/src/main/java/rt4/MixerPcmStream.java
@@ -20,6 +20,17 @@ public final class MixerPcmStream extends PcmStream {
 	@OriginalMember(owner = "client!ei", name = "w", descriptor = "I")
 	private int anInt1781 = -1;
 
+	@OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V")
+	public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) {
+		if (arg0.aClass3_223 != null) {
+			arg0.unlink();
+		}
+		arg0.aClass3_222 = arg1;
+		arg0.aClass3_223 = arg1.aClass3_223;
+		arg0.aClass3_223.aClass3_222 = arg0;
+		arg0.aClass3_222.aClass3_223 = arg0;
+	}
+
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!cc;)V")
 	private void method1342(@OriginalArg(0) MixerListener arg0) {
 		arg0.unlink();
@@ -156,7 +167,7 @@ public final class MixerPcmStream extends PcmStream {
 		while (arg0 != this.aClass69_44.aClass3_109 && ((MixerListener) arg0).anInt905 <= arg1.anInt905) {
 			arg0 = arg0.aClass3_222;
 		}
-		Static183.method3331(arg1, arg0);
+		method3331(arg1, arg0);
 		this.anInt1781 = ((MixerListener) this.aClass69_44.aClass3_109.aClass3_222).anInt905;
 	}
 }
diff --git a/client/src/main/java/rt4/MonochromeImageCache.java b/client/src/main/java/rt4/MonochromeImageCache.java
index 78fc06f..b37eebf 100644
--- a/client/src/main/java/rt4/MonochromeImageCache.java
+++ b/client/src/main/java/rt4/MonochromeImageCache.java
@@ -13,6 +13,8 @@ public final class MonochromeImageCache {
 
     @OriginalMember(owner = "client!a", name = "b", descriptor = "[I")
     public static final int[] anIntArray1 = new int[4096];
+    @OriginalMember(owner = "client!bc", name = "N", descriptor = "Lclient!lb;")
+    public static final MonochromeImageCache_Class3_Sub23 aClass3_Sub23_1 = new MonochromeImageCache_Class3_Sub23(0, 0);
 
     @OriginalMember(owner = "client!nd", name = "f", descriptor = "I")
 	private int anInt4062 = -1;
@@ -47,7 +49,7 @@ public final class MonochromeImageCache {
 		}
 
 		for (@Pc(4) int local4 = 0; local4 < 4096; local4++) {
-			anIntArray1[local4] = Static273.method3211(local4);
+			anIntArray1[local4] = method3211(local4);
 		}
 	}
 
@@ -59,13 +61,21 @@ public final class MonochromeImageCache {
 		this.anIntArrayArrayArray13 = new int[this.anInt4064][3][arg2];
 	}
 
+	@OriginalMember(owner = "client!we", name = "a", descriptor = "(BI)I")
+	public static int method3211(@OriginalArg(1) int arg0) {
+		@Pc(13) int local13 = arg0 * (arg0 * arg0 >> 12) >> 12;
+		@Pc(26) int local26 = arg0 * 6 - 61440;
+		@Pc(34) int local34 = (arg0 * local26 >> 12) + 40960;
+		return local13 * local34 >> 12;
+	}
+
 	@OriginalMember(owner = "client!nd", name = "a", descriptor = "(B)[[[I")
 	public final int[][][] method3168() {
 		if (this.anInt4067 != this.anInt4064) {
 			throw new RuntimeException("Can only retrieve a full image cache");
 		}
 		for (@Pc(27) int local27 = 0; local27 < this.anInt4064; local27++) {
-			this.aClass3_Sub23Array1[local27] = Static13.aClass3_Sub23_1;
+			this.aClass3_Sub23Array1[local27] = aClass3_Sub23_1;
 		}
 		return this.anIntArrayArrayArray13;
 	}
@@ -88,7 +98,7 @@ public final class MonochromeImageCache {
 	public final int[][] method3173(@OriginalArg(1) int arg0) {
 		if (this.anInt4064 == this.anInt4067) {
 			this.aBoolean195 = this.aClass3_Sub23Array1[arg0] == null;
-			this.aClass3_Sub23Array1[arg0] = Static13.aClass3_Sub23_1;
+			this.aClass3_Sub23Array1[arg0] = aClass3_Sub23_1;
 			return this.anIntArrayArrayArray13[arg0];
 		} else if (this.anInt4064 == 1) {
 			this.aBoolean195 = this.anInt4062 != arg0;
@@ -102,7 +112,7 @@ public final class MonochromeImageCache {
 					local44 = new MonochromeImageCache_Class3_Sub23(arg0, this.anInt4066);
 					this.anInt4066++;
 				} else {
-					@Pc(80) MonochromeImageCache_Class3_Sub23 local80 = (MonochromeImageCache_Class3_Sub23) this.aClass69_96.method2279();
+					@Pc(80) MonochromeImageCache_Class3_Sub23 local80 = (MonochromeImageCache_Class3_Sub23) this.aClass69_96.tail();
 					local44 = new MonochromeImageCache_Class3_Sub23(arg0, local80.anInt3468);
 					this.aClass3_Sub23Array1[local80.anInt3476] = null;
 					local80.unlink();
diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java
index 56be9b2..310aff5 100644
--- a/client/src/main/java/rt4/Mouse.java
+++ b/client/src/main/java/rt4/Mouse.java
@@ -97,6 +97,14 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
         return anInt2467;
     }
 
+    @OriginalMember(owner = "client!dl", name = "a", descriptor = "(II)V")
+    public static void setIdleLoops(@OriginalArg(1) int arg0) {
+        @Pc(10) Mouse local10 = instance;
+        synchronized (instance) {
+            anInt2467 = arg0;
+        }
+    }
+
     @OriginalMember(owner = "client!ug", name = "mouseMoved", descriptor = "(Ljava/awt/event/MouseEvent;)V")
 	@Override
 	public final synchronized void mouseMoved(@OriginalArg(0) MouseEvent arg0) {
diff --git a/client/src/main/java/rt4/MouseRecorder.java b/client/src/main/java/rt4/MouseRecorder.java
index cfec966..8eba383 100644
--- a/client/src/main/java/rt4/MouseRecorder.java
+++ b/client/src/main/java/rt4/MouseRecorder.java
@@ -11,6 +11,8 @@ public final class MouseRecorder implements Runnable {
     public static MouseRecorder instance;
     @OriginalMember(owner = "client!tm", name = "e", descriptor = "Z")
     public static boolean enabled = false;
+    @OriginalMember(owner = "client!oe", name = "a", descriptor = "I")
+    public static int mouseRecorderPrevY = 0;
     @OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
 	public boolean running = true;
 
diff --git a/client/src/main/java/rt4/NpcList.java b/client/src/main/java/rt4/NpcList.java
index abda64f..d451030 100644
--- a/client/src/main/java/rt4/NpcList.java
+++ b/client/src/main/java/rt4/NpcList.java
@@ -5,4 +5,8 @@ import org.openrs2.deob.annotation.OriginalMember;
 public class NpcList {
     @OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
     public static final Npc[] npcs = new Npc[32768];
+    @OriginalMember(owner = "client!cj", name = "i", descriptor = "[I")
+    public static final int[] ids = new int[32768];
+    @OriginalMember(owner = "client!wd", name = "g", descriptor = "I")
+	public static int size = 0;
 }
diff --git a/client/src/main/java/rt4/ObjStack.java b/client/src/main/java/rt4/ObjStack.java
index 22b1c31..b7fe4fe 100644
--- a/client/src/main/java/rt4/ObjStack.java
+++ b/client/src/main/java/rt4/ObjStack.java
@@ -12,7 +12,7 @@ public final class ObjStack extends Entity {
 	public int anInt5550;
 
 	@OriginalMember(owner = "client!uj", name = "D", descriptor = "I")
-	public int anInt5555;
+	public int type;
 
 	@OriginalMember(owner = "client!uj", name = "z", descriptor = "I")
 	private int anInt5553 = -32768;
@@ -25,7 +25,7 @@ public final class ObjStack extends Entity {
 	@OriginalMember(owner = "client!uj", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
 	@Override
 	public final void render(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) long arg8, @OriginalArg(9) int arg9, @OriginalArg(10) ParticleSystem arg10) {
-		@Pc(16) Model local16 = ObjTypeList.get(this.anInt5555).getModel(-1, 0, null, this.anInt5550, 0);
+		@Pc(16) Model local16 = ObjTypeList.get(this.type).getModel(-1, 0, null, this.anInt5550, 0);
 		if (local16 != null) {
 			local16.render(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 			this.anInt5553 = local16.getMaxY();
diff --git a/client/src/main/java/rt4/ObjStackNode.java b/client/src/main/java/rt4/ObjStackNode.java
index 5fa4ff0..87b8911 100644
--- a/client/src/main/java/rt4/ObjStackNode.java
+++ b/client/src/main/java/rt4/ObjStackNode.java
@@ -8,10 +8,10 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class ObjStackNode extends SecondaryNode {
 
 	@OriginalMember(owner = "client!pa", name = "T", descriptor = "Lclient!uj;")
-	public final ObjStack aClass8_Sub7_1;
+	public final ObjStack value;
 
 	@OriginalMember(owner = "client!pa", name = "<init>", descriptor = "(Lclient!uj;)V")
 	public ObjStackNode(@OriginalArg(0) ObjStack arg0) {
-		this.aClass8_Sub7_1 = arg0;
+		this.value = arg0;
 	}
 }
diff --git a/client/src/main/java/rt4/OverheadChat.java b/client/src/main/java/rt4/OverheadChat.java
index f8bff27..31c9dde 100644
--- a/client/src/main/java/rt4/OverheadChat.java
+++ b/client/src/main/java/rt4/OverheadChat.java
@@ -22,8 +22,8 @@ public class OverheadChat {
                 }
             }
         }
-        for (local11 = 0; local11 < Static272.anInt5214; local11++) {
-            @Pc(68) int local68 = Static33.anIntArray79[local11];
+        for (local11 = 0; local11 < NpcList.size; local11++) {
+            @Pc(68) int local68 = NpcList.ids[local11];
             @Pc(72) Npc local72 = NpcList.npcs[local68];
             if (local72 != null && local72.chatLoops > 0) {
                 local72.chatLoops--;
diff --git a/client/src/main/java/rt4/PathingEntity.java b/client/src/main/java/rt4/PathingEntity.java
index e3d60f9..c96d97e 100644
--- a/client/src/main/java/rt4/PathingEntity.java
+++ b/client/src/main/java/rt4/PathingEntity.java
@@ -10,7 +10,9 @@ public abstract class PathingEntity extends Entity {
 
     @OriginalMember(owner = "client!ef", name = "a", descriptor = "[I")
 	public static final int[] ANGLES = new int[] { 768, 1024, 1280, 512, 1536, 256, 0, 1792 };
-    @OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
+	@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
+	public static final BasType aClass20_1 = new BasType();
+	@OriginalMember(owner = "client!fe", name = "A", descriptor = "I")
 	public int spotAnimStart;
 
 	@OriginalMember(owner = "client!fe", name = "S", descriptor = "I")
@@ -259,7 +261,7 @@ public abstract class PathingEntity extends Entity {
 	@OriginalMember(owner = "client!fe", name = "b", descriptor = "(Z)Lclient!ck;")
 	public final BasType getBasType() {
 		@Pc(7) int local7 = this.method2688();
-		return local7 == -1 ? Static4.aClass20_1 : BasTypeList.get(local7);
+		return local7 == -1 ? aClass20_1 : BasTypeList.get(local7);
 	}
 
 	@OriginalMember(owner = "client!fe", name = "a", descriptor = "(B)Z")
diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java
index 71cabd9..d130b43 100644
--- a/client/src/main/java/rt4/Player.java
+++ b/client/src/main/java/rt4/Player.java
@@ -177,6 +177,22 @@ public final class Player extends PathingEntity {
         return local14;
     }
 
+    @OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
+    public static void setTutorialIsland() {
+        inTutorialIsland = 0;
+        @Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7);
+        @Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ;
+        if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
+            inTutorialIsland = 1;
+        }
+        if (local17 >= 3072 && local17 <= 3118 && local25 >= 9492 && local25 <= 9535) {
+            inTutorialIsland = 1;
+        }
+        if (inTutorialIsland == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) {
+            inTutorialIsland = 0;
+        }
+    }
+
     @OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
 	@Override
 	public final int getSize() {
diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java
index 214f03e..442346d 100644
--- a/client/src/main/java/rt4/Protocol.java
+++ b/client/src/main/java/rt4/Protocol.java
@@ -19,6 +19,12 @@ public class Protocol {
     public static final int[] extendedIds = new int[2048];
     @OriginalMember(owner = "client!ta", name = "z", descriptor = "[I")
     public static final int[] PACKET_LENGTHS = new int[] { -1, 0, 8, 0, 2, 0, 0, 0, 0, 12, 0, 1, 0, 3, 7, 0, 15, 6, 0, 0, 4, 7, -2, -1, 2, 0, 2, 8, 0, 0, 0, 0, -2, 5, 0, 0, 8, 3, 6, 0, 0, 0, -1, 0, -1, 0, 0, 6, -2, 0, 12, 0, 0, 0, -1, -2, 10, 0, 0, 0, 3, 0, -1, 0, 0, 5, 6, 0, 0, 8, -1, -1, 0, 8, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 6, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, -2, 0, 0, 0, 0, 0, 12, 2, 0, -2, -2, 20, 0, 0, 10, 0, 15, 0, -1, 0, 8, -2, 0, 0, 0, 8, 0, 12, 0, 0, 7, 0, 0, 0, 0, 0, -1, -1, 0, 4, 5, 0, 0, 0, 6, 0, 0, 0, 0, 8, 9, 0, 0, 0, 2, -1, 0, -2, 0, 4, 14, 0, 0, 0, 24, 0, -2, 5, 0, 0, 0, 10, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 2, 1, 0, 0, 2, -1, 1, 0, 0, 0, 0, 14, 0, 0, 0, 0, 10, 5, 0, 0, 0, 0, 0, -2, 0, 0, 9, 0, 0, 8, 0, 0, 0, 0, -2, 6, 0, 0, 0, -2, 0, 3, 0, 1, 7, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 3, 0, 0 };
+    @OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;")
+	public static final JagString ASSIST = JagString.parse(":assist:");
+    @OriginalMember(owner = "client!pl", name = "f", descriptor = "Lclient!na;")
+    public static final JagString TRADEREQ = JagString.parse(":tradereq:");
+    @OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
+	public static final JagString CLAN = JagString.parse(":clan:");
     @OriginalMember(owner = "client!jk", name = "B", descriptor = "Lclient!ma;")
     public static BufferedSocket socket;
     @OriginalMember(owner = "client!fl", name = "C", descriptor = "Lsignlink!im;")
@@ -66,11 +72,11 @@ public class Protocol {
             if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104) {
                 @Pc(122) ObjStack local122 = new ObjStack();
                 local122.anInt5550 = local31;
-                local122.anInt5555 = local15;
-                if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) {
-                    Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList();
+                local122.type = local15;
+                if (Static159.objStacks[Player.level][local19][local27] == null) {
+                    Static159.objStacks[Player.level][local19][local27] = new LinkedList();
                 }
-                Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local122));
+                Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local122));
                 Static220.spawnGroundObject(local27, local19);
             }
         } else if (opcode == ServerProt.LOCATION_PACKET_121) {
@@ -163,11 +169,11 @@ public class Protocol {
             int local31 = inboundBuffer.g2();
             int local39 = inboundBuffer.g2();
             if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
-                @Pc(710) LinkedList local710 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19];
+                @Pc(710) LinkedList local710 = Static159.objStacks[Player.level][local23][local19];
                 if (local710 != null) {
                     for (@Pc(718) ObjStackNode local718 = (ObjStackNode) local710.head(); local718 != null; local718 = (ObjStackNode) local710.next()) {
-                        @Pc(723) ObjStack local723 = local718.aClass8_Sub7_1;
-                        if ((local27 & 0x7FFF) == local723.anInt5555 && local31 == local723.anInt5550) {
+                        @Pc(723) ObjStack local723 = local718.value;
+                        if ((local27 & 0x7FFF) == local723.type && local31 == local723.anInt5550) {
                             local723.anInt5550 = local39;
                             break;
                         }
@@ -185,11 +191,11 @@ public class Protocol {
             if (local19 >= 0 && local27 >= 0 && local19 < 104 && local27 < 104 && PlayerList.selfId != local15) {
                 @Pc(812) ObjStack local812 = new ObjStack();
                 local812.anInt5550 = local31;
-                local812.anInt5555 = local39;
-                if (Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] == null) {
-                    Static159.aClass69ArrayArrayArray1[Player.level][local19][local27] = new LinkedList();
+                local812.type = local39;
+                if (Static159.objStacks[Player.level][local19][local27] == null) {
+                    Static159.objStacks[Player.level][local19][local27] = new LinkedList();
                 }
-                Static159.aClass69ArrayArrayArray1[Player.level][local19][local27].addTail(new ObjStackNode(local812));
+                Static159.objStacks[Player.level][local19][local27].addTail(new ObjStackNode(local812));
                 Static220.spawnGroundObject(local27, local19);
             }
         } else if (opcode == ServerProt.LOCATION_PACKET_16) {
@@ -309,16 +315,16 @@ public class Protocol {
             int local23 = (local15 >> 4 & 0x7) + Static115.currentChunkX;
             int local27 = inboundBuffer.g2();
             if (local23 >= 0 && local19 >= 0 && local23 < 104 && local19 < 104) {
-                @Pc(1565) LinkedList local1565 = Static159.aClass69ArrayArrayArray1[Player.level][local23][local19];
+                @Pc(1565) LinkedList local1565 = Static159.objStacks[Player.level][local23][local19];
                 if (local1565 != null) {
                     for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.head(); local1572 != null; local1572 = (ObjStackNode) local1565.next()) {
-                        if (local1572.aClass8_Sub7_1.anInt5555 == (local27 & 0x7FFF)) {
+                        if (local1572.value.type == (local27 & 0x7FFF)) {
                             local1572.unlink();
                             break;
                         }
                     }
                     if (local1565.head() == null) {
-                        Static159.aClass69ArrayArrayArray1[Player.level][local23][local19] = null;
+                        Static159.objStacks[Player.level][local23][local19] = null;
                     }
                     Static220.spawnGroundObject(local19, local23);
                 }
@@ -381,10 +387,10 @@ public class Protocol {
                         Static35.underWaterLocationsMapFileIds[local20] = -1;
                     } else {
                         Static238.regionBitPacked[local20] = local169;
-                        Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) }));
-                        Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) }));
-                        Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) }));
-                        Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local138), Static86.aClass100_488, Static123.parseInt(local151) }));
+                        Static36.mapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
+                        Static172.locationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
+                        Static99.underWaterMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
+                        Static35.underWaterLocationsMapFileIds[local20] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local138), Static86.aClass100_488, JagString.parseInt(local151) }));
                     }
                     local20++;
                 }
@@ -450,10 +456,10 @@ public class Protocol {
                             Static238.regionBitPacked[local60] = local571;
                             @Pc(609) int local609 = local571 & 0xFF;
                             local573 = local571 >> 8 & 0xFF;
-                            Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) }));
-                            Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) }));
-                            Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) }));
-                            Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local573), Static86.aClass100_488, Static123.parseInt(local609) }));
+                            Static36.mapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
+                            Static172.locationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
+                            Static99.underWaterMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
+                            Static35.underWaterLocationsMapFileIds[local60] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local573), Static86.aClass100_488, JagString.parseInt(local609) }));
                             local60++;
                         }
                     }
@@ -895,7 +901,7 @@ public class Protocol {
             return true;
         } else if (opcode == ServerProt.MESSAGE_GAME) {
             @Pc(245) JagString message = inboundBuffer.gjstr();
-            if (message.endsWith(Static196.TRADEREQ)) {
+            if (message.endsWith(TRADEREQ)) {
                 JagString name = message.substring(message.indexOf(Static264.COLON), 0);
                 long name37 = name.encode37();
                 boolean ignored = false;
@@ -935,16 +941,16 @@ public class Protocol {
                 if (!ignored && Player.inTutorialIsland == 0) {
                     Chat.add(name, 10, JagString.EMPTY);
                 }
-            } else if (message.endsWith(Static141.CLAN)) {
-                JagString name = message.substring(message.indexOf(Static141.CLAN), 0);
+            } else if (message.endsWith(CLAN)) {
+                JagString name = message.substring(message.indexOf(CLAN), 0);
                 Chat.add(JagString.EMPTY, 11, name);
             } else if (message.endsWith(Static138.TRADE)) {
                 JagString name = message.substring(message.indexOf(Static138.TRADE), 0);
                 if (Player.inTutorialIsland == 0) {
                     Chat.add(JagString.EMPTY, 12, name);
                 }
-            } else if (message.endsWith(Static244.ASSIST)) {
-                JagString name = message.substring(message.indexOf(Static244.ASSIST), 0);
+            } else if (message.endsWith(ASSIST)) {
+                JagString name = message.substring(message.indexOf(ASSIST), 0);
                 if (Player.inTutorialIsland == 0) {
                     Chat.add(JagString.EMPTY, 13, name);
                 }
@@ -1032,7 +1038,7 @@ public class Protocol {
             int pos = inboundBuffer.g2le();
             int tracknum = inboundBuffer.g2();
             setVerifyId(tracknum);
-            Static229.method3938(pos, id);
+            DelayedStateChange.method3938(pos, id);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.CLAN_QUICK_CHAT) {
@@ -1198,7 +1204,7 @@ public class Protocol {
             int tracknum = inboundBuffer.g2leadd();
             setVerifyId(tracknum);
             if (reset == 2) {
-                Static5.resetWorldMap();
+                WorldMap.reset();
             }
             InterfaceList.topLevelInterface = parent;
             Static81.method1753(parent);
@@ -1229,7 +1235,7 @@ public class Protocol {
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.RESET_CLIENT_VARCACHE) {
-            Static8.resetTransientVars();
+            VarpDomain.reset();
             InterfaceList.redrawActiveInterfaces();
             VarpDomain.updatedVarpsWriterIndex += 32;
             opcode = -1;
@@ -1438,8 +1444,8 @@ public class Protocol {
             Static180.currentChunkZ = inboundBuffer.g1neg();
             for (int x = Static115.currentChunkX; x < Static115.currentChunkX + 8; x++) {
                 for (int z = Static180.currentChunkZ; z < Static180.currentChunkZ + 8; z++) {
-                    if (Static159.aClass69ArrayArrayArray1[Player.level][x][z] != null) {
-                        Static159.aClass69ArrayArrayArray1[Player.level][x][z] = null;
+                    if (Static159.objStacks[Player.level][x][z] != null) {
+                        Static159.objStacks[Player.level][x][z] = null;
                         Static220.spawnGroundObject(z, x);
                     }
                 }
@@ -1473,7 +1479,7 @@ public class Protocol {
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.SET_MINIMAP_STATE) {
-            Static270.minimapState = inboundBuffer.g1();
+            MiniMap.state = inboundBuffer.g1();
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.TELEPORT_LOCAL_PLAYER) {
@@ -1512,7 +1518,7 @@ public class Protocol {
                     FriendsList.worldNames[i] = worldName;
                     FriendsList.ranks[i] = x;
                     name = null;
-                    Static3.aBooleanArray135[i] = ignored;
+                    FriendsList.aBooleanArray135[i] = ignored;
                     break;
                 }
             }
@@ -1522,7 +1528,7 @@ public class Protocol {
                 FriendsList.worlds[FriendsList.size] = worldId;
                 FriendsList.worldNames[FriendsList.size] = worldName;
                 FriendsList.ranks[FriendsList.size] = x;
-                Static3.aBooleanArray135[FriendsList.size] = ignored;
+                FriendsList.aBooleanArray135[FriendsList.size] = ignored;
                 FriendsList.size++;
             }
             FriendsList.transmitAt = InterfaceList.transmitTimer;
@@ -1548,9 +1554,9 @@ public class Protocol {
                         @Pc(3074) int local3074 = FriendsList.ranks[i];
                         FriendsList.ranks[i] = FriendsList.ranks[i + 1];
                         FriendsList.ranks[i + 1] = local3074;
-                        @Pc(3092) boolean local3092 = Static3.aBooleanArray135[i];
-                        Static3.aBooleanArray135[i] = Static3.aBooleanArray135[i + 1];
-                        Static3.aBooleanArray135[i + 1] = local3092;
+                        @Pc(3092) boolean local3092 = FriendsList.aBooleanArray135[i];
+                        FriendsList.aBooleanArray135[i] = FriendsList.aBooleanArray135[i + 1];
+                        FriendsList.aBooleanArray135[i + 1] = local3092;
                     }
                 }
                 if (sorting) {
@@ -1690,7 +1696,7 @@ public class Protocol {
             InterfaceList.miscTransmitAt = InterfaceList.transmitTimer;
             return true;
         } else if (opcode == ServerProt.REFLECTION_CHEAT_CHECK) {
-            Static202.method3654(GameShell.signLink, inboundBuffer, length);
+            ReflectionCheck.method3654(GameShell.signLink, inboundBuffer, length);
             opcode = -1;
             return true;
         } else if (opcode == ServerProt.CLIENT_SETVARC_SMALL) {
@@ -1747,7 +1753,7 @@ public class Protocol {
             }
             @Pc(3848) byte[] data = new byte[length];
             inboundBuffer.gBytesIsaac(data, length);
-            JagString url = Static10.decodeString(data, length, 0);
+            JagString url = JagString.decodeString(data, length, 0);
             if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || client.haveIe6)) {
                 Static169.openUrl(url, true);
             } else {
@@ -1847,7 +1853,7 @@ public class Protocol {
             IgnoreList.size = length / 8;
             for (int i = 0; i < IgnoreList.size; i++) {
                 IgnoreList.encodedUsernames[i] = inboundBuffer.g8();
-                Static193.aClass100Array134[i] = Base37.decode37(IgnoreList.encodedUsernames[i]);
+                IgnoreList.aClass100Array134[i] = Base37.decode37(IgnoreList.encodedUsernames[i]);
             }
             FriendsList.transmitAt = InterfaceList.transmitTimer;
             opcode = -1;
@@ -2199,10 +2205,10 @@ public class Protocol {
             @Pc(5603) Component component = InterfaceList.getComponent(id);
             @Pc(5615) ObjType objType;
             if (component.usingScripts) {
-                Static209.method3707(id, slot, itemId);
+                DelayedStateChange.method3707(id, slot, itemId);
                 objType = ObjTypeList.get(itemId);
                 DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2d, objType.xAngle2d);
-                Static145.method2745(id, objType.zAngle2d, objType.yOffset2d, objType.xOffset2d);
+                DelayedStateChange.method2745(id, objType.zAngle2d, objType.yOffset2d, objType.xOffset2d);
             } else if (itemId == -1) {
                 component.modelType = 0;
                 opcode = -1;
@@ -2365,11 +2371,11 @@ public class Protocol {
                         y = -1;
                         x = -1;
                     }
-                    if (Static264.mouseRecorderPrevX != x || y != Static179.mouseRecorderPrevY) {
+                    if (Static264.mouseRecorderPrevX != x || y != MouseRecorder.mouseRecorderPrevY) {
                         dx = x - Static264.mouseRecorderPrevX;
                         Static264.mouseRecorderPrevX = x;
-                        dy = y - Static179.mouseRecorderPrevY;
-                        Static179.mouseRecorderPrevY = y;
+                        dy = y - MouseRecorder.mouseRecorderPrevY;
+                        MouseRecorder.mouseRecorderPrevY = y;
                         if (anInt4762 < 8 && dx >= -32 && dx <= 31 && dy >= -32 && dy <= 31) {
                             dy += 32;
                             dx += 32;
@@ -2493,7 +2499,7 @@ public class Protocol {
         Static109.method2274();
         OverheadChat.loop();
         if (WorldMap.component != null) {
-            Static12.method447();
+            WorldMap.method447();
         }
         // VarpDomain
         for (i = Static38.poll(true); i != -1; i = Static38.poll(false)) {
@@ -2502,7 +2508,7 @@ public class Protocol {
         }
         @Pc(782) int modelId;
         // DelayedStateChange
-        for (@Pc(709) DelayedStateChange change = Static127.poll(); change != null; change = Static127.poll()) {
+        for (@Pc(709) DelayedStateChange change = DelayedStateChange.poll(); change != null; change = DelayedStateChange.poll()) {
             type = change.getType();
             i = change.getId();
             if (type == 1) {
@@ -2622,11 +2628,11 @@ public class Protocol {
             }
         }
         Static178.anInt4247++;
-        if (Static257.aClass13_7 != null) {
-            Static72.anInt2043++;
-            if (Static72.anInt2043 >= 15) {
-                InterfaceList.redraw(Static257.aClass13_7);
-                Static257.aClass13_7 = null;
+        if (MiniMenu.aClass13_7 != null) {
+            MiniMenu.anInt2043++;
+            if (MiniMenu.anInt2043 >= 15) {
+                InterfaceList.redraw(MiniMenu.aClass13_7);
+                MiniMenu.aClass13_7 = null;
             }
         }
         @Pc(1361) Component local1361;
@@ -2681,7 +2687,7 @@ public class Protocol {
                     Static59.method1372();
                 }
                 Mouse.clickButton = 0;
-                Static72.anInt2043 = 10;
+                MiniMenu.anInt2043 = 10;
                 Static118.aClass13_15 = null;
             }
         }
@@ -2735,18 +2741,18 @@ public class Protocol {
                                                 Cheat.teleport(PlayerList.self.movementQueueX[0] + Static225.originX, PlayerList.self.movementQueueZ[0] + Static142.originZ, y);
                                             }
                                             if (LoginManager.staffModLevel > 0 && Keyboard.pressedKeys[Keyboard.KEY_CTRL] && Keyboard.pressedKeys[Keyboard.KEY_SHIFT]) {
-                                                if (Static56.anInt1742 != -1) {
-                                                    Cheat.teleport(Static225.originX + Static56.anInt1742, Static142.originZ - -Static116.anInt2954, Player.level);
+                                                if (MiniMenu.anInt1742 != -1) {
+                                                    Cheat.teleport(Static225.originX + MiniMenu.anInt1742, Static142.originZ - -MiniMenu.anInt2954, Player.level);
                                                 }
                                                 Static187.anInt4422 = 0;
                                                 Static125.anInt3096 = 0;
                                             } else if (Static125.anInt3096 == 2) {
-                                                if (Static56.anInt1742 != -1) {
+                                                if (MiniMenu.anInt1742 != -1) {
                                                     outboundBuffer.p1isaac(131);
-                                                    outboundBuffer.p4me(Static98.anInt2512);
-                                                    outboundBuffer.p2add(Static225.originX + Static56.anInt1742);
-                                                    outboundBuffer.p2leadd(Static15.anInt506);
-                                                    outboundBuffer.p2add(Static116.anInt2954 + Static142.originZ);
+                                                    outboundBuffer.p4me(MiniMenu.anInt2512);
+                                                    outboundBuffer.p2add(Static225.originX + MiniMenu.anInt1742);
+                                                    outboundBuffer.p2leadd(MiniMenu.anInt506);
+                                                    outboundBuffer.p2add(MiniMenu.anInt2954 + Static142.originZ);
                                                     Cross.type = 1;
                                                     Cross.milliseconds = 0;
                                                     Cross.y = Mouse.clickY;
@@ -2754,18 +2760,18 @@ public class Protocol {
                                                 }
                                                 Static125.anInt3096 = 0;
                                             } else if (Static187.anInt4422 == 2) {
-                                                if (Static56.anInt1742 != -1) {
+                                                if (MiniMenu.anInt1742 != -1) {
                                                     outboundBuffer.p1isaac(179);
-                                                    outboundBuffer.p2(Static142.originZ + Static116.anInt2954);
-                                                    outboundBuffer.p2(Static56.anInt1742 + Static225.originX);
+                                                    outboundBuffer.p2(Static142.originZ + MiniMenu.anInt2954);
+                                                    outboundBuffer.p2(MiniMenu.anInt1742 + Static225.originX);
                                                     Cross.milliseconds = 0;
                                                     Cross.type = 1;
                                                     Cross.x = Mouse.clickX;
                                                     Cross.y = Mouse.clickY;
                                                 }
                                                 Static187.anInt4422 = 0;
-                                            } else if (Static56.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) {
-                                                @Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, Static56.anInt1742, 0, 0, 0, Static116.anInt2954, PlayerList.self.movementQueueX[0]);
+                                            } else if (MiniMenu.anInt1742 != -1 && Static125.anInt3096 == 0 && Static187.anInt4422 == 0) {
+                                                @Pc(1871) boolean local1871 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, MiniMenu.anInt1742, 0, 0, 0, MiniMenu.anInt2954, PlayerList.self.movementQueueX[0]);
                                                 if (local1871) {
                                                     Cross.y = Mouse.clickY;
                                                     Cross.milliseconds = 0;
@@ -2773,7 +2779,7 @@ public class Protocol {
                                                     Cross.type = 1;
                                                 }
                                             }
-                                            Static56.anInt1742 = -1;
+                                            MiniMenu.anInt1742 = -1;
                                             Static7.method843();
                                             if (Static180.aClass13_22 != local1361) {
                                                 if (local1361 != null) {
@@ -2815,7 +2821,7 @@ public class Protocol {
                                             x = Keyboard.getIdleLoops();
                                             if (y > 15000 && x > 15000) {
                                                 Static267.anInt5775 = 250;
-                                                Static48.setIdleLoops(14500);
+                                                Mouse.setIdleLoops(14500);
                                                 outboundBuffer.p1isaac(245);
                                             }
                                             if (Static33.openUrlRequest != null && Static33.openUrlRequest.status == 1) {
@@ -2849,7 +2855,7 @@ public class Protocol {
                                                     Static59.anInt1814 += Static263.anInt5755;
                                                 }
                                                 if ((modelId & 0x2) == 2) {
-                                                    Static273.anInt4130 += Static179.anInt4262;
+                                                    MiniMap.anInt4130 += Static179.anInt4262;
                                                 }
                                             }
                                             if (Static132.anInt3291 < -50) {
@@ -2858,7 +2864,7 @@ public class Protocol {
                                             if (Static59.anInt1814 < -60) {
                                                 Static263.anInt5755 = 2;
                                             }
-                                            if (Static273.anInt4130 < -20) {
+                                            if (MiniMap.anInt4130 < -20) {
                                                 Static179.anInt4262 = 1;
                                             }
                                             if (Static206.anInt4774 < -55) {
@@ -2876,7 +2882,7 @@ public class Protocol {
                                             if (Static230.anInt5161 > 40) {
                                                 Static220.anInt4941 = -1;
                                             }
-                                            if (Static273.anInt4130 > 10) {
+                                            if (MiniMap.anInt4130 > 10) {
                                                 Static179.anInt4262 = -1;
                                             }
                                             if (Static59.anInt1814 > 60) {
@@ -3055,9 +3061,9 @@ public class Protocol {
         if (length != inboundBuffer.offset) {
             throw new RuntimeException("gnp1 pos:" + inboundBuffer.offset + " psize:" + length);
         }
-        for (local19 = 0; local19 < Static272.anInt5214; local19++) {
-            if (NpcList.npcs[Static33.anIntArray79[local19]] == null) {
-                throw new RuntimeException("gnp2 pos:" + local19 + " size:" + Static272.anInt5214);
+        for (local19 = 0; local19 < NpcList.size; local19++) {
+            if (NpcList.npcs[NpcList.ids[local19]] == null) {
+                throw new RuntimeException("gnp2 pos:" + local19 + " size:" + NpcList.size);
             }
         }
     }
@@ -3067,33 +3073,33 @@ public class Protocol {
         inboundBuffer.accessBits();
         @Pc(13) int local13 = inboundBuffer.gBits(8);
         @Pc(22) int local22;
-        if (Static272.anInt5214 > local13) {
-            for (local22 = local13; local22 < Static272.anInt5214; local22++) {
-                removedIds[removedCount++] = Static33.anIntArray79[local22];
+        if (NpcList.size > local13) {
+            for (local22 = local13; local22 < NpcList.size; local22++) {
+                removedIds[removedCount++] = NpcList.ids[local22];
             }
         }
-        if (Static272.anInt5214 < local13) {
+        if (NpcList.size < local13) {
             throw new RuntimeException("gnpov1");
         }
-        Static272.anInt5214 = 0;
+        NpcList.size = 0;
         for (local22 = 0; local22 < local13; local22++) {
-            @Pc(61) int local61 = Static33.anIntArray79[local22];
+            @Pc(61) int local61 = NpcList.ids[local22];
             @Pc(65) Npc local65 = NpcList.npcs[local61];
             @Pc(70) int local70 = inboundBuffer.gBits(1);
             if (local70 == 0) {
-                Static33.anIntArray79[Static272.anInt5214++] = local61;
+                NpcList.ids[NpcList.size++] = local61;
                 local65.lastSeenLoop = client.loop;
             } else {
                 @Pc(92) int local92 = inboundBuffer.gBits(2);
                 if (local92 == 0) {
-                    Static33.anIntArray79[Static272.anInt5214++] = local61;
+                    NpcList.ids[NpcList.size++] = local61;
                     local65.lastSeenLoop = client.loop;
                     extendedIds[extendedCount++] = local61;
                 } else {
                     @Pc(139) int local139;
                     @Pc(149) int local149;
                     if (local92 == 1) {
-                        Static33.anIntArray79[Static272.anInt5214++] = local61;
+                        NpcList.ids[NpcList.size++] = local61;
                         local65.lastSeenLoop = client.loop;
                         local139 = inboundBuffer.gBits(3);
                         local65.move(1, local139);
@@ -3102,7 +3108,7 @@ public class Protocol {
                             extendedIds[extendedCount++] = local61;
                         }
                     } else if (local92 == 2) {
-                        Static33.anIntArray79[Static272.anInt5214++] = local61;
+                        NpcList.ids[NpcList.size++] = local61;
                         local65.lastSeenLoop = client.loop;
                         if (inboundBuffer.gBits(1) == 1) {
                             local139 = inboundBuffer.gBits(3);
@@ -3137,7 +3143,7 @@ public class Protocol {
                         NpcList.npcs[local14] = new Npc();
                     }
                     @Pc(37) Npc local37 = NpcList.npcs[local14];
-                    Static33.anIntArray79[Static272.anInt5214++] = local14;
+                    NpcList.ids[NpcList.size++] = local14;
                     local37.lastSeenLoop = client.loop;
                     if (local37.type != null && local37.type.hasAreaSound()) {
                         AreaSoundManager.remove(local37);
diff --git a/client/src/main/java/rt4/QuickChatCatType.java b/client/src/main/java/rt4/QuickChatCatType.java
index 9b3f719..33c9c01 100644
--- a/client/src/main/java/rt4/QuickChatCatType.java
+++ b/client/src/main/java/rt4/QuickChatCatType.java
@@ -23,7 +23,12 @@ public final class QuickChatCatType extends SecondaryNode {
 	@OriginalMember(owner = "client!bc", name = "ab", descriptor = "[I")
 	public int[] phrases;
 
-	@OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V")
+    @OriginalMember(owner = "client!si", name = "a", descriptor = "(ZB)I")
+    public static int method3933(@OriginalArg(1) byte arg0) {
+        return arg0 & 0xFF;
+    }
+
+    @OriginalMember(owner = "client!bc", name = "d", descriptor = "(I)V")
 	public final void method465() {
 		@Pc(8) int local8;
 		if (this.phrases != null) {
@@ -65,7 +70,7 @@ public final class QuickChatCatType extends SecondaryNode {
 			this.subcategoryShortcuts = new int[local28];
 			for (local38 = 0; local38 < local28; local38++) {
 				this.subcategories[local38] = arg0.g2();
-				this.subcategoryShortcuts[local38] = Static229.method3933(arg0.g1s());
+				this.subcategoryShortcuts[local38] = method3933(arg0.g1s());
 			}
 		} else if (arg1 == 3) {
 			local28 = arg0.g1();
@@ -73,7 +78,7 @@ public final class QuickChatCatType extends SecondaryNode {
 			this.phraseShortcuts = new int[local28];
 			for (local38 = 0; local38 < local28; local38++) {
 				this.phrases[local38] = arg0.g2();
-				this.phraseShortcuts[local38] = Static229.method3933(arg0.g1s());
+				this.phraseShortcuts[local38] = method3933(arg0.g1s());
 			}
 		} else if (arg1 == 4) {
 		}
diff --git a/client/src/main/java/rt4/QuickChatPhraseType.java b/client/src/main/java/rt4/QuickChatPhraseType.java
index 728488a..f431962 100644
--- a/client/src/main/java/rt4/QuickChatPhraseType.java
+++ b/client/src/main/java/rt4/QuickChatPhraseType.java
@@ -10,7 +10,13 @@ public final class QuickChatPhraseType extends SecondaryNode {
 
     @OriginalMember(owner = "client!ld", name = "a", descriptor = "[I")
 	public static final int[] DYNAMIC_COMMAND_ENCODE_BYTES = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 };
-    @OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
+	@OriginalMember(owner = "client!rc", name = "I", descriptor = "Lclient!na;")
+	public static final JagString aClass100_231 = JagString.parse(")3)3)3");
+	@OriginalMember(owner = "client!bf", name = "C", descriptor = "[I")
+	public static final int[] anIntArray51 = new int[] { 2, 2, 4, 2, 1, 8, 4, 1, 4, 4, 2, 1, 1, 1, 4, 1 };
+	@OriginalMember(owner = "client!qg", name = "U", descriptor = "Lclient!na;")
+	public static final JagString aClass100_891 = JagString.parse("");
+	@OriginalMember(owner = "client!cb", name = "L", descriptor = "[I")
 	private int[] anIntArray71;
 
 	@OriginalMember(owner = "client!cb", name = "M", descriptor = "[I")
@@ -114,11 +120,11 @@ public final class QuickChatPhraseType extends SecondaryNode {
 	public final JagString getText() {
 		@Pc(15) JagString local15 = Static87.allocate(80);
 		if (this.aClass100Array35 == null) {
-			return Static202.aClass100_891;
+			return aClass100_891;
 		}
 		local15.method3113(this.aClass100Array35[0]);
 		for (@Pc(31) int local31 = 1; local31 < this.aClass100Array35.length; local31++) {
-			local15.method3113(Static211.aClass100_231);
+			local15.method3113(aClass100_231);
 			local15.method3113(this.aClass100Array35[local31]);
 		}
 		return local15.method3156();
@@ -130,7 +136,7 @@ public final class QuickChatPhraseType extends SecondaryNode {
 		if (this.anIntArray71 != null) {
 			for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {
 				local17.method3113(this.aClass100Array35[local22]);
-				local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(Static16.anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22]));
+				local17.method3113(Static89.method1838(this.anIntArrayArray5[local22], arg0.gVarLong(anIntArray51[this.anIntArray71[local22]]), this.anIntArray71[local22]));
 			}
 		}
 		local17.method3113(this.aClass100Array35[this.aClass100Array35.length - 1]);
diff --git a/client/src/main/java/rt4/ReflectionCheck.java b/client/src/main/java/rt4/ReflectionCheck.java
index 0e942b0..5a6b672 100644
--- a/client/src/main/java/rt4/ReflectionCheck.java
+++ b/client/src/main/java/rt4/ReflectionCheck.java
@@ -153,4 +153,71 @@ public final class ReflectionCheck extends Node {
             local18.unlink();
         }
     }
+
+    @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V")
+	public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
+		@Pc(17) ReflectionCheck local17 = new ReflectionCheck();
+		local17.anInt1725 = arg1.g1();
+		local17.anInt1732 = arg1.g4();
+		local17.aClass212Array1 = new PrivilegedRequest[local17.anInt1725];
+		local17.anIntArray138 = new int[local17.anInt1725];
+		local17.aByteArrayArrayArray6 = new byte[local17.anInt1725][][];
+		local17.aClass212Array2 = new PrivilegedRequest[local17.anInt1725];
+		local17.anIntArray139 = new int[local17.anInt1725];
+		local17.anIntArray137 = new int[local17.anInt1725];
+		for (@Pc(59) int local59 = 0; local59 < local17.anInt1725; local59++) {
+			try {
+				@Pc(71) int local71 = arg1.g1();
+				@Pc(93) String local93;
+				@Pc(104) String local104;
+				@Pc(95) int local95;
+				if (local71 == 0 || local71 == 1 || local71 == 2) {
+					local93 = new String(arg1.gjstr().method3148());
+					local95 = 0;
+					local104 = new String(arg1.gjstr().method3148());
+					if (local71 == 1) {
+						local95 = arg1.g4();
+					}
+					local17.anIntArray139[local59] = local71;
+					local17.anIntArray137[local59] = local95;
+					local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, Static6.method85(local93));
+				} else if (local71 == 3 || local71 == 4) {
+					local93 = new String(arg1.gjstr().method3148());
+					local104 = new String(arg1.gjstr().method3148());
+					local95 = arg1.g1();
+					@Pc(171) String[] local171 = new String[local95];
+					for (@Pc(173) int local173 = 0; local173 < local95; local173++) {
+						local171[local173] = new String(arg1.gjstr().method3148());
+					}
+					@Pc(193) byte[][] local193 = new byte[local95][];
+					@Pc(210) int local210;
+					if (local71 == 3) {
+						for (@Pc(199) int local199 = 0; local199 < local95; local199++) {
+							local210 = arg1.g4();
+							local193[local199] = new byte[local210];
+							arg1.gBytes(local210, local193[local199]);
+						}
+					}
+					local17.anIntArray139[local59] = local71;
+					@Pc(234) Class[] local234 = new Class[local95];
+					for (local210 = 0; local210 < local95; local210++) {
+						local234[local210] = Static6.method85(local171[local210]);
+					}
+					local17.aClass212Array1[local59] = arg0.getDeclaredMethod(Static6.method85(local93), local234, local104);
+					local17.aByteArrayArrayArray6[local59] = local193;
+				}
+			} catch (@Pc(269) ClassNotFoundException local269) {
+				local17.anIntArray138[local59] = -1;
+			} catch (@Pc(276) SecurityException local276) {
+				local17.anIntArray138[local59] = -2;
+			} catch (@Pc(283) NullPointerException local283) {
+				local17.anIntArray138[local59] = -3;
+			} catch (@Pc(290) Exception local290) {
+				local17.anIntArray138[local59] = -4;
+			} catch (@Pc(297) Throwable local297) {
+				local17.anIntArray138[local59] = -5;
+			}
+		}
+		Static204.aClass69_113.addTail(local17);
+	}
 }
diff --git a/client/src/main/java/rt4/SceneGraph.java b/client/src/main/java/rt4/SceneGraph.java
index b1b69a9..483d8cd 100644
--- a/client/src/main/java/rt4/SceneGraph.java
+++ b/client/src/main/java/rt4/SceneGraph.java
@@ -22,6 +22,48 @@ public class SceneGraph {
     public static byte[][][] tileAngles;
     @OriginalMember(owner = "client!ui", name = "eb", descriptor = "[[[B")
     public static byte[][][] tileUnderlays;
+    @OriginalMember(owner = "client!em", name = "t", descriptor = "[[[I")
+    public static int[][][] anIntArrayArrayArray6;
+    @OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
+    public static int[] anIntArray293;
+    @OriginalMember(owner = "client!lg", name = "k", descriptor = "I")
+    public static int firstVisibleLevel = 99;
+    @OriginalMember(owner = "client!ug", name = "d", descriptor = "[I")
+    public static int[] anIntArray479;
+    @OriginalMember(owner = "client!l", name = "l", descriptor = "[I")
+    public static int[] anIntArray325;
+    @OriginalMember(owner = "client!s", name = "i", descriptor = "[I")
+    public static int[] anIntArray376;
+    @OriginalMember(owner = "client!jd", name = "d", descriptor = "[[[B")
+    public static byte[][][] aByteArrayArrayArray9;
+    @OriginalMember(owner = "client!wk", name = "v", descriptor = "[I")
+    public static int[] anIntArray568;
+    @OriginalMember(owner = "client!ub", name = "h", descriptor = "[Lclient!pe;")
+    public static Class120[] aClass120Array2;
+    @OriginalMember(owner = "client!rh", name = "k", descriptor = "I")
+    public static int anInt4870 = 0;
+    @OriginalMember(owner = "client!bl", name = "T", descriptor = "I")
+	public static int anInt726 = 0;
+    @OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;")
+    public static Tile[][][] surfaceGroundTiles;
+    @OriginalMember(owner = "client!client", name = "kb", descriptor = "[[Lclient!hg;")
+    public static GlTile[][] surfaceHdTiles;
+    @OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;")
+    public static Tile[][][] underWaterGroundTiles;
+    @OriginalMember(owner = "client!pk", name = "R", descriptor = "[[Lclient!hg;")
+    public static GlTile[][] underWaterHdTiles;
+    @OriginalMember(owner = "client!hc", name = "O", descriptor = "[Lclient!pe;")
+    public static Class120[] aClass120Array1;
+    @OriginalMember(owner = "client!ma", name = "i", descriptor = "I")
+    public static int mapSizeX;
+    @OriginalMember(owner = "client!hk", name = "Y", descriptor = "I")
+    public static int mapSizeZ;
+    @OriginalMember(owner = "client!cd", name = "s", descriptor = "I")
+    public static int anInt917;
+    @OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;")
+	public static Scenery[] aClass31Array3;
+    @OriginalMember(owner = "client!c", name = "bb", descriptor = "[Lclient!ec;")
+    public static Scenery[] aClass31Array2;
 
     @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z")
     public static boolean allLevelsAreVisible() {
@@ -55,8 +97,8 @@ public class SceneGraph {
         if (local7 == null) {
             return null;
         } else {
-            @Pc(14) Wall local14 = local7.aClass77_1;
-            local7.aClass77_1 = null;
+            @Pc(14) Wall local14 = local7.wall;
+            local7.wall = null;
             return local14;
         }
     }
@@ -66,41 +108,41 @@ public class SceneGraph {
         @Pc(3) int local3;
         @Pc(9) int local9;
         @Pc(14) int local14;
-        if (Static197.surfaceGroundTiles != null) {
-            for (local3 = 0; local3 < Static197.surfaceGroundTiles.length; local3++) {
-                for (local9 = 0; local9 < Static152.mapSizeX; local9++) {
-                    for (local14 = 0; local14 < Static99.mapSizeZ; local14++) {
-                        Static197.surfaceGroundTiles[local3][local9][local14] = null;
+        if (surfaceGroundTiles != null) {
+            for (local3 = 0; local3 < surfaceGroundTiles.length; local3++) {
+                for (local9 = 0; local9 < mapSizeX; local9++) {
+                    for (local14 = 0; local14 < mapSizeZ; local14++) {
+                        surfaceGroundTiles[local3][local9][local14] = null;
                     }
                 }
             }
         }
-        Static36.surfaceHdTiles = null;
-        if (Static276.underWaterGroundTiles != null) {
-            for (local3 = 0; local3 < Static276.underWaterGroundTiles.length; local3++) {
-                for (local9 = 0; local9 < Static152.mapSizeX; local9++) {
-                    for (local14 = 0; local14 < Static99.mapSizeZ; local14++) {
-                        Static276.underWaterGroundTiles[local3][local9][local14] = null;
+        surfaceHdTiles = null;
+        if (underWaterGroundTiles != null) {
+            for (local3 = 0; local3 < underWaterGroundTiles.length; local3++) {
+                for (local9 = 0; local9 < mapSizeX; local9++) {
+                    for (local14 = 0; local14 < mapSizeZ; local14++) {
+                        underWaterGroundTiles[local3][local9][local14] = null;
                     }
                 }
             }
         }
-        Static195.underWaterHdTiles = null;
-        Static28.anInt917 = 0;
-        if (Static91.aClass120Array1 != null) {
-            for (local3 = 0; local3 < Static28.anInt917; local3++) {
-                Static91.aClass120Array1[local3] = null;
+        underWaterHdTiles = null;
+        anInt917 = 0;
+        if (aClass120Array1 != null) {
+            for (local3 = 0; local3 < anInt917; local3++) {
+                aClass120Array1[local3] = null;
             }
         }
-        if (Static243.aClass31Array3 != null) {
-            for (local3 = 0; local3 < Static22.anInt726; local3++) {
-                Static243.aClass31Array3[local3] = null;
+        if (aClass31Array3 != null) {
+            for (local3 = 0; local3 < anInt726; local3++) {
+                aClass31Array3[local3] = null;
             }
-            Static22.anInt726 = 0;
+            anInt726 = 0;
         }
-        if (Static25.aClass31Array2 != null) {
-            for (local3 = 0; local3 < Static25.aClass31Array2.length; local3++) {
-                Static25.aClass31Array2[local3] = null;
+        if (aClass31Array2 != null) {
+            for (local3 = 0; local3 < aClass31Array2.length; local3++) {
+                aClass31Array2[local3] = null;
             }
         }
     }
@@ -108,13 +150,13 @@ public class SceneGraph {
     @OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;")
     public static Wall getWall(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
         @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
-        return local7 == null ? null : local7.aClass77_1;
+        return local7 == null ? null : local7.wall;
     }
 
     @OriginalMember(owner = "client!gj", name = "a", descriptor = "(III)Lclient!df;")
     public static WallDecor getWallDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
         @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
-        return local7 == null ? null : local7.aClass24_1;
+        return local7 == null ? null : local7.wallDecor;
     }
 
     @OriginalMember(owner = "client!kf", name = "b", descriptor = "(III)Lclient!ec;")
@@ -123,9 +165,9 @@ public class SceneGraph {
         if (local7 == null) {
             return null;
         }
-        for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) {
-            @Pc(22) Scenery local22 = local7.aClass31Array1[local13];
-            if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
+        for (@Pc(13) int local13 = 0; local13 < local7.sceneryLen; local13++) {
+            @Pc(22) Scenery local22 = local7.scenery[local13];
+            if ((local22.key >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
                 return local22;
             }
         }
@@ -135,6 +177,139 @@ public class SceneGraph {
     @OriginalMember(owner = "client!wa", name = "a", descriptor = "(III)Lclient!bm;")
     public static GroundDecor getGroundDecor(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
         @Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
-        return local7 == null || local7.aClass15_1 == null ? null : local7.aClass15_1;
+        return local7 == null || local7.groundDecor == null ? null : local7.groundDecor;
     }
+
+    @OriginalMember(owner = "client!v", name = "a", descriptor = "(IIIJ)Z")
+    public static boolean isLocValid(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
+        @Pc(7) Tile tile = tiles[arg0][arg1][arg2];
+        if (tile == null) {
+            return false;
+        } else if (tile.wall != null && tile.wall.key == arg3) {
+            return true;
+        } else if (tile.wallDecor != null && tile.wallDecor.key == arg3) {
+            return true;
+        } else if (tile.groundDecor != null && tile.groundDecor.key == arg3) {
+            return true;
+        } else {
+            for (@Pc(46) int local46 = 0; local46 < tile.sceneryLen; local46++) {
+                if (tile.scenery[local46].key == arg3) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V")
+    public static void method3535(@OriginalArg(0) boolean arg0) {
+        anIntArray376 = new int[104];
+        anIntArray325 = new int[104];
+        firstVisibleLevel = 99;
+        anIntArray479 = new int[104];
+        @Pc(14) byte plane;
+        if (arg0) {
+            plane = 1;
+        } else {
+            plane = 4;
+        }
+        tileShapes = new byte[plane][104][104];
+        anIntArray293 = new int[104];
+        anIntArrayArrayArray6 = new int[plane][105][105];
+        aByteArrayArrayArray9 = new byte[plane][105][105];
+        tileOverlays = new byte[plane][104][104];
+        anIntArray568 = new int[104];
+        tileAngles = new byte[plane][104][104];
+        tileUnderlays = new byte[plane][104][104];
+    }
+
+    @OriginalMember(owner = "client!ib", name = "b", descriptor = "(I)V")
+    public static void method2255() {
+        anIntArray479 = null;
+        anIntArrayArrayArray6 = null;
+        anIntArray293 = null;
+        tileShapes = null;
+        tileAngles = null;
+        aByteArrayArrayArray9 = null;
+        tileOverlays = null;
+        tileUnderlays = null;
+        anIntArray325 = null;
+        anIntArray376 = null;
+        anIntArray568 = null;
+    }
+
+    @OriginalMember(owner = "client!um", name = "c", descriptor = "(III)Z")
+    public static boolean method4394(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+        for (@Pc(1) int local1 = 0; local1 < anInt4870; local1++) {
+            @Pc(8) Class120 local8 = aClass120Array2[local1];
+            @Pc(17) int local17;
+            @Pc(29) int local29;
+            @Pc(39) int local39;
+            @Pc(49) int local49;
+            @Pc(59) int local59;
+            if (local8.anInt4462 == 1) {
+                local17 = local8.anInt4460 - arg0;
+                if (local17 > 0) {
+                    local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
+                    local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
+                    local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
+                    local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
+                    if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
+                        return true;
+                    }
+                }
+            } else if (local8.anInt4462 == 2) {
+                local17 = arg0 - local8.anInt4460;
+                if (local17 > 0) {
+                    local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
+                    local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
+                    local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
+                    local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
+                    if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
+                        return true;
+                    }
+                }
+            } else if (local8.anInt4462 == 3) {
+                local17 = local8.anInt4458 - arg2;
+                if (local17 > 0) {
+                    local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
+                    local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
+                    local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
+                    local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
+                    if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
+                        return true;
+                    }
+                }
+            } else if (local8.anInt4462 == 4) {
+                local17 = arg2 - local8.anInt4458;
+                if (local17 > 0) {
+                    local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
+                    local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
+                    local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
+                    local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
+                    if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
+                        return true;
+                    }
+                }
+            } else if (local8.anInt4462 == 5) {
+                local17 = arg1 - local8.anInt4444;
+                if (local17 > 0) {
+                    local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
+                    local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
+                    local49 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
+                    local59 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
+                    if (arg0 >= local29 && arg0 <= local39 && arg2 >= local49 && arg2 <= local59) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J")
+	public static long method602(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+		@Pc(7) Tile local7 = tiles[arg0][arg1][arg2];
+		return local7 == null || local7.groundDecor == null ? 0L : local7.groundDecor.key;
+	}
 }
diff --git a/client/src/main/java/rt4/Scenery.java b/client/src/main/java/rt4/Scenery.java
index 76f2e54..55165c1 100644
--- a/client/src/main/java/rt4/Scenery.java
+++ b/client/src/main/java/rt4/Scenery.java
@@ -43,5 +43,5 @@ public final class Scenery {
 	public int anInt1714;
 
 	@OriginalMember(owner = "client!ec", name = "A", descriptor = "J")
-	public long aLong56 = 0L;
+	public long key = 0L;
 }
diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java
index b1cc3e7..d863467 100644
--- a/client/src/main/java/rt4/ScriptRunner.java
+++ b/client/src/main/java/rt4/ScriptRunner.java
@@ -14,8 +14,24 @@ public final class ScriptRunner {
 	public static final int[] intStack = new int[1000];
 	@OriginalMember(owner = "client!fl", name = "Q", descriptor = "Lclient!na;")
 	public static final JagString EMPTY_STRING = JagString.parse("");
+	@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
+	public static final JagString aClass100_74 = JagString.parse("::");
+	@OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;")
+	public static final JagString EVENT_OPBASE = JagString.parse("event_opbase");
+	@OriginalMember(owner = "client!da", name = "O", descriptor = "Lclient!na;")
+	public static final JagString aClass100_253 = JagString.parse("(U0a )2 via: ");
+    @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;")
+	public static final JagString aClass100_446 = JagString.parse("<img=0>");
+	@OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;")
+	public static final JagString aClass100_780 = JagString.parse("Clientscript error in: ");
 	@OriginalMember(owner = "client!jh", name = "n", descriptor = "Lclient!bd;")
 	public static QuickChatPhrase activePhrase;
+	@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
+	public static Component staticActiveComponent1;
+	@OriginalMember(owner = "client!sg", name = "i", descriptor = "Lclient!be;")
+	public static Component staticActiveComponent2;
+	@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
+	public static JagString[] stringLocals;
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BILclient!jl;)V")
 	public static void run(@OriginalArg(1) int maxCycles, @OriginalArg(2) HookRequest request) {
@@ -36,7 +52,7 @@ public final class ScriptRunner {
 		try {
 			Static215.intLocals = new int[script.anInt4667];
 			@Pc(50) int intLocalIndex = 0;
-			Static180.stringLocals = new JagString[script.anInt4671];
+			stringLocals = new JagString[script.anInt4671];
 			@Pc(56) int stringLocalIndex = 0;
 			@Pc(77) int id;
 			@Pc(194) JagString value;
@@ -73,10 +89,10 @@ public final class ScriptRunner {
 					Static215.intLocals[intLocalIndex++] = id;
 				} else if (local4[cycles] instanceof JagString) {
 					value = (JagString) local4[cycles];
-					if (value.strEquals(Static15.EVENT_OPBASE)) {
+					if (value.strEquals(EVENT_OPBASE)) {
 						value = request.opBase;
 					}
-					Static180.stringLocals[stringLocalIndex++] = value;
+					stringLocals[stringLocalIndex++] = value;
 				}
 			}
 			cycles = 0;
@@ -152,7 +168,7 @@ public final class ScriptRunner {
 						Static215.intLocals = frame.intLocals;
 						opcodes = script.opcodes;
 						pc = frame.pc;
-						Static180.stringLocals = frame.stringLocals;
+						stringLocals = frame.stringLocals;
 						intOperands = script.intOperands;
 						continue;
 					}
@@ -193,13 +209,13 @@ public final class ScriptRunner {
 						continue;
 					}
 					if (opcode == 35) {
-						stringStack[ssp++] = Static180.stringLocals[intOperands[pc]];
+						stringStack[ssp++] = stringLocals[intOperands[pc]];
 						continue;
 					}
 					if (opcode == 36) {
 						local = intOperands[pc];
 						ssp--;
-						Static180.stringLocals[local] = stringStack[ssp];
+						stringLocals[local] = stringStack[ssp];
 						continue;
 					}
 					if (opcode == 37) {
@@ -231,7 +247,7 @@ public final class ScriptRunner {
 						isp -= local642.anInt4665;
 						ssp -= local642.anInt4669;
 						@Pc(705) GoSubFrame local705 = new GoSubFrame();
-						local705.stringLocals = Static180.stringLocals;
+						local705.stringLocals = stringLocals;
 						local705.intLocals = Static215.intLocals;
 						local705.pc = pc;
 						local705.script = script;
@@ -244,7 +260,7 @@ public final class ScriptRunner {
 						Static215.intLocals = local646;
 						intOperands = local642.intOperands;
 						opcodes = local642.opcodes;
-						Static180.stringLocals = local650;
+						stringLocals = local650;
 						continue;
 					}
 					if (opcode == 42) {
@@ -255,7 +271,7 @@ public final class ScriptRunner {
 						id = intOperands[pc];
 						isp--;
 						VarcDomain.varcs[id] = intStack[isp];
-						Static4.method24(id);
+						DelayedStateChange.method24(id);
 						continue;
 					}
 					if (opcode == 44) {
@@ -312,7 +328,7 @@ public final class ScriptRunner {
 						id = intOperands[pc];
 						ssp--;
 						VarcDomain.varcstrs[id] = stringStack[ssp];
-						Static89.method1840(id);
+						DelayedStateChange.method1840(id);
 						continue;
 					}
 					if (opcode == 51) {
@@ -364,9 +380,9 @@ public final class ScriptRunner {
 							local1137.type = int3;
 							local1063.createdComponents[int2] = local1137;
 							if (local1020) {
-								Static274.staticActiveComponent1 = local1137;
+								staticActiveComponent1 = local1137;
 							} else {
-								Static227.staticActiveComponent2 = local1137;
+								staticActiveComponent2 = local1137;
 							}
 							InterfaceList.redraw(local1063);
 							continue;
@@ -375,7 +391,7 @@ public final class ScriptRunner {
 					}
 					@Pc(1204) Component local1204;
 					if (opcode == 101) {
-						component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+						component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 						if (component.createdComponentId == -1) {
 							if (!local1020) {
 								throw new RuntimeException("Tried to cc_delete static active-component!");
@@ -402,9 +418,9 @@ public final class ScriptRunner {
 						if (local1256 != null && int3 != -1) {
 							intStack[isp++] = 1;
 							if (local1020) {
-								Static274.staticActiveComponent1 = local1256;
+								staticActiveComponent1 = local1256;
 							} else {
-								Static227.staticActiveComponent2 = local1256;
+								staticActiveComponent2 = local1256;
 							}
 							continue;
 						}
@@ -420,9 +436,9 @@ public final class ScriptRunner {
 						} else {
 							intStack[isp++] = 1;
 							if (local1020) {
-								Static274.staticActiveComponent1 = local1204;
+								staticActiveComponent1 = local1204;
 							} else {
-								Static227.staticActiveComponent2 = local1204;
+								staticActiveComponent2 = local1204;
 							}
 						}
 						continue;
@@ -471,7 +487,7 @@ public final class ScriptRunner {
 							@Pc(2522) JagString local2522;
 							if (opcode >= 1100 && opcode < 1200 || !(opcode < 2100 || opcode >= 2200)) {
 								if (opcode < 2000) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 								} else {
 									opcode -= 1000;
 									isp--;
@@ -495,7 +511,7 @@ public final class ScriptRunner {
 									}
 									InterfaceList.redraw(component);
 									if (component.createdComponentId == -1) {
-										Static118.method2353(component.id);
+										DelayedStateChange.method2353(component.id);
 									}
 									continue;
 								}
@@ -504,7 +520,7 @@ public final class ScriptRunner {
 									component.color = intStack[isp];
 									InterfaceList.redraw(component);
 									if (component.createdComponentId == -1) {
-										Static245.method4224(component.id);
+										DelayedStateChange.method4224(component.id);
 									}
 									continue;
 								}
@@ -550,7 +566,7 @@ public final class ScriptRunner {
 									component.modelId = intStack[isp];
 									InterfaceList.redraw(component);
 									if (component.createdComponentId == -1) {
-										Static271.method4600(component.id);
+										DelayedStateChange.method4600(component.id);
 									}
 									continue;
 								}
@@ -580,7 +596,7 @@ public final class ScriptRunner {
 										InterfaceList.redraw(component);
 									}
 									if (component.createdComponentId == -1) {
-										Static181.method3345(component.id);
+										DelayedStateChange.method3345(component.id);
 									}
 									continue;
 								}
@@ -598,7 +614,7 @@ public final class ScriptRunner {
 										InterfaceList.redraw(component);
 									}
 									if (component.createdComponentId == -1) {
-										Static163.method3096(component.id);
+										DelayedStateChange.method3096(component.id);
 									}
 									continue;
 								}
@@ -680,7 +696,7 @@ public final class ScriptRunner {
 								}
 							} else if (opcode >= 1200 && opcode < 1300 || !(opcode < 2200 || opcode >= 2300)) {
 								if (opcode < 2000) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 								} else {
 									isp--;
 									component = InterfaceList.getComponent(intStack[isp]);
@@ -728,7 +744,7 @@ public final class ScriptRunner {
 									isp--;
 									component.modelId = intStack[isp];
 									if (component.createdComponentId == -1) {
-										Static271.method4600(component.id);
+										DelayedStateChange.method4600(component.id);
 									}
 									continue;
 								}
@@ -736,7 +752,7 @@ public final class ScriptRunner {
 									component.modelType = 3;
 									component.modelId = PlayerList.self.appearance.method1952();
 									if (component.createdComponentId == -1) {
-										Static271.method4600(component.id);
+										DelayedStateChange.method4600(component.id);
 									}
 									continue;
 								}
@@ -745,7 +761,7 @@ public final class ScriptRunner {
 									isp--;
 									component.modelId = intStack[isp];
 									if (component.createdComponentId == -1) {
-										Static271.method4600(component.id);
+										DelayedStateChange.method4600(component.id);
 									}
 									continue;
 								}
@@ -754,7 +770,7 @@ public final class ScriptRunner {
 									isp--;
 									component.modelId = intStack[isp];
 									if (component.createdComponentId == -1) {
-										Static271.method4600(component.id);
+										DelayedStateChange.method4600(component.id);
 									}
 									continue;
 								}
@@ -764,7 +780,7 @@ public final class ScriptRunner {
 									component = InterfaceList.getComponent(intStack[isp]);
 									opcode -= 1000;
 								} else {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 								}
 								if (opcode == 1300) {
 									isp--;
@@ -834,7 +850,7 @@ public final class ScriptRunner {
 								@Pc(4859) int c;
 								if (opcode >= 1400 && opcode < 1500 || opcode >= 2400 && opcode < 2500) {
 									if (opcode < 2000) {
-										component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+										component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 									} else {
 										opcode -= 1000;
 										isp--;
@@ -940,7 +956,7 @@ public final class ScriptRunner {
 									continue;
 								}
 								if (opcode < 1600) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 									if (opcode == 1500) {
 										intStack[isp++] = component.x;
 										continue;
@@ -966,7 +982,7 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 1700) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 									if (opcode == 1600) {
 										intStack[isp++] = component.anInt489;
 										continue;
@@ -1020,7 +1036,7 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 1800) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 									if (opcode == 1700) {
 										intStack[isp++] = component.objId;
 										continue;
@@ -1038,7 +1054,7 @@ public final class ScriptRunner {
 										continue;
 									}
 								} else if (opcode < 1900) {
-									component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+									component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 									if (opcode == 1800) {
 										intStack[isp++] = InterfaceList.getServerActiveProperties(component).getTargetMask();
 										continue;
@@ -1289,7 +1305,7 @@ public final class ScriptRunner {
 									if (opcode == 3109) {
 										isp -= 2;
 										int1 = intStack[isp];
-										local1256 = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+										local1256 = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 										int3 = intStack[isp + 1];
 										Static40.method1015(int3, int1, local1256);
 										continue;
@@ -1663,7 +1679,7 @@ public final class ScriptRunner {
 									if (opcode == 3609) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
 											string = string.substring(7);
 										}
 										intStack[isp++] = FriendsList.contains(string) ? 1 : 0;
@@ -1770,7 +1786,7 @@ public final class ScriptRunner {
 									if (opcode == 3623) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
 											string = string.substring(7);
 										}
 										intStack[isp++] = IgnoreList.contains(string) ? 1 : 0;
@@ -1808,7 +1824,7 @@ public final class ScriptRunner {
 										isp--;
 										int1 = intStack[isp];
 										if (FriendsList.state == 2 && int1 >= 0 && int1 < FriendsList.size) {
-											intStack[isp++] = Static3.aBooleanArray135[int1] ? 1 : 0;
+											intStack[isp++] = FriendsList.aBooleanArray135[int1] ? 1 : 0;
 											continue;
 										}
 										intStack[isp++] = 0;
@@ -1817,7 +1833,7 @@ public final class ScriptRunner {
 									if (opcode == 3628) {
 										ssp--;
 										string = stringStack[ssp];
-										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+										if (string.startsWith(aClass100_446) || string.startsWith(Static101.aClass100_537)) {
 											string = string.substring(7);
 										}
 										intStack[isp++] = Static4.method25(string);
@@ -2221,7 +2237,7 @@ public final class ScriptRunner {
 												if (opcode == 5008) {
 													ssp--;
 													string = stringStack[ssp];
-													if (!string.startsWith(Static12.aClass100_74)) {
+													if (!string.startsWith(aClass100_74)) {
 														if (LoginManager.staffModLevel == 0 && (LoginManager.playerUnderage && !LoginManager.parentalChatConsent || LoginManager.mapQuickChat)) {
 															continue;
 														}
@@ -2962,7 +2978,7 @@ public final class ScriptRunner {
 															try {
 																if (Player.lastLogAddress.result != null) {
 																	@Pc(8281) byte[] local8281 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
-																	string = Static10.decodeString(local8281, local8281.length, 0);
+																	string = JagString.decodeString(local8281, local8281.length, 0);
 																}
 															} catch (@Pc(8290) UnsupportedEncodingException local8290) {
 															}
@@ -3822,7 +3838,7 @@ public final class ScriptRunner {
 										string = stringStack[ssp];
 										isp--;
 										int3 = intStack[isp];
-										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, Static123.parseInt(int3) });
+										stringStack[ssp++] = JagString.concatenate(new JagString[] { string, JagString.parseInt(int3) });
 										continue;
 									}
 									if (opcode == 4101) {
@@ -3854,7 +3870,7 @@ public final class ScriptRunner {
 										local652 = Static102.aCalendar2.get(5);
 										c = Static102.aCalendar2.get(2);
 										local1087 = Static102.aCalendar2.get(1);
-										stringStack[ssp++] = JagString.concatenate(new JagString[] { Static123.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, Static123.parseInt(local1087) });
+										stringStack[ssp++] = JagString.concatenate(new JagString[] { JagString.parseInt(local652), Static163.aClass100_767, Static34.aClass100Array40[c], Static163.aClass100_767, JagString.parseInt(local1087) });
 										continue;
 									}
 									if (opcode == 4105) {
@@ -3871,7 +3887,7 @@ public final class ScriptRunner {
 									if (opcode == 4106) {
 										isp--;
 										int1 = intStack[isp];
-										stringStack[ssp++] = Static123.parseInt(int1);
+										stringStack[ssp++] = JagString.parseInt(int1);
 										continue;
 									}
 									if (opcode == 4107) {
@@ -3929,7 +3945,7 @@ public final class ScriptRunner {
 									if (opcode == 4113) {
 										isp--;
 										int1 = intStack[isp];
-										intStack[isp++] = Static273.method3213(int1) ? 1 : 0;
+										intStack[isp++] = method3213(int1) ? 1 : 0;
 										continue;
 									}
 									if (opcode == 4114) {
@@ -4030,7 +4046,7 @@ public final class ScriptRunner {
 							}
 						} else {
 							if (opcode < 2000) {
-								component = local1020 ? Static274.staticActiveComponent1 : Static227.staticActiveComponent2;
+								component = local1020 ? staticActiveComponent1 : staticActiveComponent2;
 							} else {
 								isp--;
 								component = InterfaceList.getComponent(intStack[isp]);
@@ -4057,7 +4073,7 @@ public final class ScriptRunner {
 								InterfaceList.redraw(component);
 								Static74.update(component);
 								if (component.createdComponentId == -1) {
-									Static280.method4675(component.id);
+									DelayedStateChange.method4675(component.id);
 								}
 								continue;
 							}
@@ -4096,7 +4112,7 @@ public final class ScriptRunner {
 									InterfaceList.redraw(component);
 								}
 								if (component.createdComponentId == -1) {
-									Static93.method1906(component.id);
+									DelayedStateChange.method1906(component.id);
 								}
 								continue;
 							}
@@ -4131,14 +4147,14 @@ public final class ScriptRunner {
 				@Pc(14385) JagString str = Static87.allocate(30);
 				str.method3113(Static219.aClass100_928).method3113(script.name);
 				for (cycles = Static138.fp - 1; cycles >= 0; cycles--) {
-					str.method3113(Static40.aClass100_253).method3113(Static67.callStack[cycles].script.name);
+					str.method3113(aClass100_253).method3113(Static67.callStack[cycles].script.name);
 				}
 				if (op == 40) {
 					cycles = intOperands[pc];
-					str.method3113(Static176.aClass100_802).method3113(Static123.parseInt(cycles));
+					str.method3113(Static176.aClass100_802).method3113(JagString.parseInt(cycles));
 				}
 				if (client.modeWhere != 0) {
-					Chat.add(EMPTY_STRING, 0, JagString.concatenate(new JagString[] { Static167.aClass100_780, script.name}));
+					Chat.add(EMPTY_STRING, 0, JagString.concatenate(new JagString[] { aClass100_780, script.name}));
 				}
 				TracingException.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex);
 			}
@@ -4149,4 +4165,15 @@ public final class ScriptRunner {
 	public static void run(@OriginalArg(1) HookRequest request) {
 		run(200000, request);
 	}
+
+	@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
+	public static boolean method3213(@OriginalArg(1) int arg0) {
+		if (arg0 >= 32 && arg0 <= 126) {
+			return true;
+		} else if (arg0 >= 160 && arg0 <= 255) {
+			return true;
+		} else {
+			return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
+		}
+	}
 }
diff --git a/client/src/main/java/rt4/ShapedTile.java b/client/src/main/java/rt4/ShapedTile.java
index aaef3d2..679d77c 100644
--- a/client/src/main/java/rt4/ShapedTile.java
+++ b/client/src/main/java/rt4/ShapedTile.java
@@ -8,6 +8,10 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!fg")
 public final class ShapedTile {
 
+	@OriginalMember(owner = "client!fg", name = "i", descriptor = "[[I")
+	public static final int[][] anIntArrayArray12 = new int[][] { { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 2, 6 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 13, 14 } };
+	@OriginalMember(owner = "client!fg", name = "j", descriptor = "[[I")
+	public static final int[][] anIntArrayArray13 = new int[][] { { 0, 1, 2, 3, 0, 0, 1, 3 }, { 1, 1, 2, 3, 1, 0, 1, 3 }, { 0, 1, 2, 3, 1, 0, 1, 3 }, { 0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3 }, { 0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4 }, { 0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4 }, { 0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3 }, { 0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3 }, { 0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5 }, { 0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5 }, { 0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3 }, { 1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3 }, { 1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5 } };
 	@OriginalMember(owner = "client!fg", name = "s", descriptor = "Z")
 	public boolean aBoolean113 = true;
 
@@ -66,7 +70,7 @@ public final class ShapedTile {
 		@Pc(34) int local34 = local30 / 2;
 		@Pc(38) int local38 = local30 / 4;
 		@Pc(44) int local44 = local30 * 3 / 4;
-		@Pc(48) int[] local48 = Static68.anIntArrayArray12[arg0];
+		@Pc(48) int[] local48 = anIntArrayArray12[arg0];
 		@Pc(51) int local51 = local48.length;
 		this.anIntArray168 = new int[local51];
 		this.anIntArray160 = new int[local51];
@@ -195,7 +199,7 @@ public final class ShapedTile {
 			local66[local79] = local148;
 			local69[local79] = local150;
 		}
-		@Pc(534) int[] local534 = Static68.anIntArrayArray13[arg0];
+		@Pc(534) int[] local534 = anIntArrayArray13[arg0];
 		local86 = local534.length / 4;
 		this.anIntArray166 = new int[local86];
 		this.anIntArray162 = new int[local86];
diff --git a/client/src/main/java/rt4/SoftwareAlphaSprite.java b/client/src/main/java/rt4/SoftwareAlphaSprite.java
index e5fb7d6..b148fc6 100644
--- a/client/src/main/java/rt4/SoftwareAlphaSprite.java
+++ b/client/src/main/java/rt4/SoftwareAlphaSprite.java
@@ -144,7 +144,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
 
 	@OriginalMember(owner = "client!am", name = "e", descriptor = "(II)V")
 	@Override
-	public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public final void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		arg0 += this.anInt1863;
 		arg1 += this.anInt1861;
 		@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@@ -670,7 +670,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
 
 	@OriginalMember(owner = "client!am", name = "a", descriptor = "(IIIIIIII[I[I)V")
 	@Override
-	public final void drawMinimapRegion(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
+	public final void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
 		try {
 			@Pc(4) int local4 = -w / 2;
 			@Pc(9) int local9 = -h / 2;
@@ -705,7 +705,7 @@ public final class SoftwareAlphaSprite extends SoftwareSprite {
 
 	@OriginalMember(owner = "client!am", name = "b", descriptor = "(IIIIIIII[I[I)V")
 	@Override
-	public final void drawCompass(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
+	public final void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
 		try {
 			@Pc(4) int local4 = -w / 2;
 			@Pc(9) int local9 = -h / 2;
diff --git a/client/src/main/java/rt4/SoftwareModel.java b/client/src/main/java/rt4/SoftwareModel.java
index ec71d76..d5d6518 100644
--- a/client/src/main/java/rt4/SoftwareModel.java
+++ b/client/src/main/java/rt4/SoftwareModel.java
@@ -8,6 +8,100 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!w")
 public final class SoftwareModel extends Model {
 
+	@OriginalMember(owner = "client!w", name = "nb", descriptor = "Lclient!w;")
+	public static final SoftwareModel aClass8_Sub1_Sub2_3 = new SoftwareModel();
+	@OriginalMember(owner = "client!w", name = "ab", descriptor = "Lclient!w;")
+	public static final SoftwareModel aClass8_Sub1_Sub2_1 = new SoftwareModel();
+	@OriginalMember(owner = "client!w", name = "eb", descriptor = "Lclient!w;")
+	public static final SoftwareModel aClass8_Sub1_Sub2_2 = new SoftwareModel();
+	@OriginalMember(owner = "client!w", name = "pb", descriptor = "[Z")
+	public static final boolean[] aBooleanArray132 = new boolean[4096];
+	@OriginalMember(owner = "client!w", name = "qb", descriptor = "[I")
+	public static final int[] anIntArray541 = new int[12];
+	@OriginalMember(owner = "client!w", name = "rb", descriptor = "[I")
+	public static final int[] anIntArray542 = new int[10];
+	@OriginalMember(owner = "client!w", name = "sb", descriptor = "[I")
+	public static final int[] anIntArray543 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "tb", descriptor = "[I")
+	public static final int[] anIntArray544 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "ub", descriptor = "[I")
+	public static final int[] anIntArray545 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "xb", descriptor = "[I")
+	public static final int[] anIntArray547 = new int[10];
+	@OriginalMember(owner = "client!w", name = "Ab", descriptor = "[I")
+	public static final int[] anIntArray548 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "Eb", descriptor = "[I")
+	public static final int[] anIntArray551 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "Ib", descriptor = "[I")
+	public static final int[] anIntArray553 = new int[10];
+	@OriginalMember(owner = "client!w", name = "Jb", descriptor = "[Z")
+	public static final boolean[] aBooleanArray133 = new boolean[4096];
+	@OriginalMember(owner = "client!w", name = "Kb", descriptor = "[[I")
+	public static final int[][] anIntArrayArray45 = new int[12][4096];
+	@OriginalMember(owner = "client!w", name = "Nb", descriptor = "[I")
+	public static final int[] anIntArray555 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "Pb", descriptor = "[I")
+	public static final int[] anIntArray556 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "Qb", descriptor = "[I")
+	public static final int[] anIntArray557 = new int[12];
+	@OriginalMember(owner = "client!w", name = "Ub", descriptor = "[I")
+	public static final int[] anIntArray560 = new int[4096];
+	@OriginalMember(owner = "client!w", name = "Wb", descriptor = "[I")
+	public static final int[] anIntArray561 = new int[8192];
+	@OriginalMember(owner = "client!w", name = "vb", descriptor = "[[I")
+    public static int[][] anIntArrayArray43;
+	@OriginalMember(owner = "client!w", name = "Ob", descriptor = "Z")
+	public static boolean aBoolean307 = false;
+	@OriginalMember(owner = "client!w", name = "Lb", descriptor = "[I")
+	public static int[] anIntArray554 = new int[1];
+	@OriginalMember(owner = "client!w", name = "Vb", descriptor = "[S")
+	public static short[] aShortArray95 = new short[1];
+	@OriginalMember(owner = "client!w", name = "Fb", descriptor = "[B")
+	public static byte[] aByteArray78 = new byte[1];
+	@OriginalMember(owner = "client!w", name = "Tb", descriptor = "[I")
+	public static int[] anIntArray559 = new int[1];
+	@OriginalMember(owner = "client!w", name = "wb", descriptor = "[I")
+	public static int[] anIntArray546 = new int[1];
+	@OriginalMember(owner = "client!w", name = "Mb", descriptor = "I")
+	public static int anInt5792;
+	@OriginalMember(owner = "client!w", name = "Gb", descriptor = "I")
+	public static int anInt5791;
+	@OriginalMember(owner = "client!w", name = "Rb", descriptor = "I")
+	public static int anInt5793;
+	@OriginalMember(owner = "client!w", name = "Db", descriptor = "[I")
+	public static int[] anIntArray550;
+	@OriginalMember(owner = "client!w", name = "Bb", descriptor = "[I")
+	public static int[] anIntArray549;
+	@OriginalMember(owner = "client!w", name = "yb", descriptor = "[[I")
+	public static int[][] anIntArrayArray44;
+	@OriginalMember(owner = "client!w", name = "Sb", descriptor = "[I")
+	public static int[] anIntArray558;
+	@OriginalMember(owner = "client!w", name = "Hb", descriptor = "[I")
+	public static int[] anIntArray552;
+	@OriginalMember(owner = "client!w", name = "cb", descriptor = "[I")
+	public static int[] anIntArray535 = new int[1];
+	@OriginalMember(owner = "client!w", name = "db", descriptor = "[I")
+	public static int[] anIntArray536 = new int[1];
+	@OriginalMember(owner = "client!w", name = "fb", descriptor = "[B")
+	public static byte[] aByteArray76 = new byte[1];
+	@OriginalMember(owner = "client!w", name = "hb", descriptor = "[I")
+	public static int[] anIntArray537 = new int[1];
+	@OriginalMember(owner = "client!w", name = "ib", descriptor = "[S")
+	public static short[] aShortArray93 = new short[1];
+	@OriginalMember(owner = "client!w", name = "jb", descriptor = "[I")
+	public static int[] anIntArray538 = new int[1];
+	@OriginalMember(owner = "client!w", name = "kb", descriptor = "[S")
+	public static short[] aShortArray94 = new short[1];
+	@OriginalMember(owner = "client!w", name = "lb", descriptor = "[I")
+	public static int[] anIntArray539 = new int[1];
+	@OriginalMember(owner = "client!w", name = "mb", descriptor = "[B")
+	public static byte[] aByteArray77 = new byte[1];
+	@OriginalMember(owner = "client!w", name = "ob", descriptor = "[I")
+	public static int[] anIntArray540 = new int[1];
+	@OriginalMember(owner = "client!w", name = "zb", descriptor = "Z")
+	public static boolean aBoolean306 = false;
+	@OriginalMember(owner = "client!w", name = "Cb", descriptor = "I")
+	public static int anInt5790 = 0;
 	@OriginalMember(owner = "client!w", name = "t", descriptor = "[S")
 	private short[] aShortArray89;
 
@@ -114,14 +208,14 @@ public final class SoftwareModel extends Model {
 	private boolean aBoolean304 = false;
 
 	static {
-		if (Static268.aBoolean307) {
-			Static268.anIntArray550 = new int[4096];
-			Static268.anIntArray549 = new int[4096];
+		if (aBoolean307) {
+			anIntArray550 = new int[4096];
+			anIntArray549 = new int[4096];
 		} else {
-			Static268.anIntArray558 = new int[1600];
-			Static268.anIntArrayArray44 = new int[1600][64];
-			Static268.anIntArray552 = new int[32];
-			Static268.anIntArrayArray43 = new int[32][512];
+			anIntArray558 = new int[1600];
+			anIntArrayArray44 = new int[1600][64];
+			anIntArray552 = new int[32];
+			anIntArrayArray43 = new int[32][512];
 		}
 	}
 
@@ -246,25 +340,25 @@ public final class SoftwareModel extends Model {
 						local435 = arg0.aClass57Array2[this.anIntArray534[local133]];
 					}
 					local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432) << 17;
-					this.anIntArray533[local133] = local468 | Static268.method4585(local416, local468 >> 17);
+					this.anIntArray533[local133] = local468 | method4585(local416, local468 >> 17);
 					if (arg0.aClass57Array2 == null || arg0.aClass57Array2[this.anIntArray524[local133]] == null) {
 						local435 = arg0.aClass57Array1[this.anIntArray524[local133]];
 					} else {
 						local435 = arg0.aClass57Array2[this.anIntArray524[local133]];
 					}
 					local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432) << 17;
-					this.anIntArray523[local133] = local468 | Static268.method4585(local416, local468 >> 17);
+					this.anIntArray523[local133] = local468 | method4585(local416, local468 >> 17);
 					if (arg0.aClass57Array2 == null || arg0.aClass57Array2[this.anIntArray529[local133]] == null) {
 						local435 = arg0.aClass57Array1[this.anIntArray529[local133]];
 					} else {
 						local435 = arg0.aClass57Array2[this.anIntArray529[local133]];
 					}
 					local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432) << 17;
-					this.anIntArray532[local133] = local468 | Static268.method4585(local416, local468 >> 17);
+					this.anIntArray532[local133] = local468 | method4585(local416, local468 >> 17);
 				} else if (local366 == 1) {
 					local614 = arg0.aClass126Array1[local133];
 					local468 = arg1 + (arg3 * local614.anInt4769 + arg4 * local614.anInt4770 + arg5 * local614.anInt4767) / (local108 + local108 / 2) << 17;
-					this.anIntArray533[local133] = local468 | Static268.method4585(arg0.aShortArray24[local133] & 0xFFFF, local468 >> 17);
+					this.anIntArray533[local133] = local468 | method4585(arg0.aShortArray24[local133] & 0xFFFF, local468 >> 17);
 					this.anIntArray532[local133] = -1;
 				} else if (local366 == 3) {
 					this.anIntArray533[local133] = 128;
@@ -279,25 +373,25 @@ public final class SoftwareModel extends Model {
 					local435 = arg0.aClass57Array2[this.anIntArray534[local133]];
 				}
 				local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432);
-				this.anIntArray533[local133] = Static268.method4582(local468);
+				this.anIntArray533[local133] = method4582(local468);
 				if (arg0.aClass57Array2 == null || arg0.aClass57Array2[this.anIntArray524[local133]] == null) {
 					local435 = arg0.aClass57Array1[this.anIntArray524[local133]];
 				} else {
 					local435 = arg0.aClass57Array2[this.anIntArray524[local133]];
 				}
 				local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432);
-				this.anIntArray523[local133] = Static268.method4582(local468);
+				this.anIntArray523[local133] = method4582(local468);
 				if (arg0.aClass57Array2 == null || arg0.aClass57Array2[this.anIntArray529[local133]] == null) {
 					local435 = arg0.aClass57Array1[this.anIntArray529[local133]];
 				} else {
 					local435 = arg0.aClass57Array2[this.anIntArray529[local133]];
 				}
 				local468 = arg1 + (arg3 * local435.anInt2437 + arg4 * local435.anInt2431 + arg5 * local435.anInt2436) / (local108 * local435.anInt2432);
-				this.anIntArray532[local133] = Static268.method4582(local468);
+				this.anIntArray532[local133] = method4582(local468);
 			} else if (local366 == 1) {
 				local614 = arg0.aClass126Array1[local133];
 				local468 = arg1 + (arg3 * local614.anInt4769 + arg4 * local614.anInt4770 + arg5 * local614.anInt4767) / (local108 + local108 / 2);
-				this.anIntArray533[local133] = Static268.method4582(local468);
+				this.anIntArray533[local133] = method4582(local468);
 				this.anIntArray532[local133] = -1;
 			} else {
 				this.anIntArray532[local133] = -2;
@@ -422,16 +516,59 @@ public final class SoftwareModel extends Model {
 		}
 	}
 
+	@OriginalMember(owner = "client!w", name = "m", descriptor = "()V")
+	public static void method4580() {
+		aBoolean307 = true;
+		anIntArray550 = new int[4096];
+		anIntArray549 = new int[4096];
+		anIntArray558 = null;
+		anIntArrayArray44 = null;
+		anIntArray552 = null;
+		anIntArrayArray43 = null;
+	}
+
+    @OriginalMember(owner = "client!w", name = "o", descriptor = "()V")
+    public static void method4583() {
+        aBoolean307 = false;
+        anIntArray550 = null;
+        anIntArray549 = null;
+        anIntArray558 = new int[1600];
+        anIntArrayArray44 = new int[1600][64];
+        anIntArray552 = new int[32];
+        anIntArrayArray43 = new int[32][512];
+    }
+
+	@OriginalMember(owner = "client!w", name = "f", descriptor = "(I)I")
+	public static int method4582(@OriginalArg(0) int arg0) {
+		if (arg0 < 2) {
+			arg0 = 2;
+		} else if (arg0 > 126) {
+			arg0 = 126;
+		}
+		return arg0;
+	}
+
+	@OriginalMember(owner = "client!w", name = "a", descriptor = "(II)I")
+	public static int method4585(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+		arg1 = arg1 * (arg0 & 0x7F) >> 7;
+		if (arg1 < 2) {
+			arg1 = 2;
+		} else if (arg1 > 126) {
+			arg1 = 126;
+		}
+		return (arg0 & 0xFF80) + arg1;
+	}
+
 	@OriginalMember(owner = "client!w", name = "e", descriptor = "(I)V")
 	private void method4579(@OriginalArg(0) int arg0) {
-		if (Static268.aBooleanArray132[arg0]) {
+		if (aBooleanArray132[arg0]) {
 			this.method4587(arg0);
 			return;
 		}
 		@Pc(12) int local12 = this.anIntArray534[arg0];
 		@Pc(17) int local17 = this.anIntArray524[arg0];
 		@Pc(22) int local22 = this.anIntArray529[arg0];
-		Rasteriser.testX = Static268.aBooleanArray133[arg0];
+		Rasteriser.testX = aBooleanArray133[arg0];
 		if (this.aByteArray75 == null) {
 			Rasteriser.alpha = 0;
 		} else {
@@ -452,14 +589,14 @@ public final class SoftwareModel extends Model {
 				local151 = this.anIntArray525[local136];
 			}
 			if (this.anIntArray532[arg0] == -1) {
-				Rasteriser.fillTexturedAlphaTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]);
+				Rasteriser.fillTexturedAlphaTriangle(anIntArray551[local12], anIntArray551[local17], anIntArray551[local22], anIntArray556[local12], anIntArray556[local17], anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], anIntArray560[local141], anIntArray560[local146], anIntArray560[local151], anIntArray548[local141], anIntArray548[local146], anIntArray548[local151], anIntArray544[local141], anIntArray544[local146], anIntArray544[local151], this.aShortArray92[arg0]);
 			} else {
-				Rasteriser.fillTexturedAlphaTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]);
+				Rasteriser.fillTexturedAlphaTriangle(anIntArray551[local12], anIntArray551[local17], anIntArray551[local22], anIntArray556[local12], anIntArray556[local17], anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], anIntArray560[local141], anIntArray560[local146], anIntArray560[local151], anIntArray548[local141], anIntArray548[local146], anIntArray548[local151], anIntArray544[local141], anIntArray544[local146], anIntArray544[local151], this.aShortArray92[arg0]);
 			}
 		} else if (this.anIntArray532[arg0] == -1) {
-			Rasteriser.fillTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF]);
+			Rasteriser.fillTriangle(anIntArray551[local12], anIntArray551[local17], anIntArray551[local22], anIntArray556[local12], anIntArray556[local17], anIntArray556[local22], Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF]);
 		} else {
-			Rasteriser.fillGouraudTriangle(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF);
+			Rasteriser.fillGouraudTriangle(anIntArray551[local12], anIntArray551[local17], anIntArray551[local22], anIntArray556[local12], anIntArray556[local17], anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF);
 		}
 	}
 
@@ -482,14 +619,14 @@ public final class SoftwareModel extends Model {
 				@Pc(38) int local38;
 				if (this.anIntArray532[local1] == -1) {
 					local38 = this.anIntArray533[local1] & 0xFFFE0000;
-					this.anIntArray533[local1] = local38 | Static268.method4585(local25, local38 >> 17);
+					this.anIntArray533[local1] = local38 | method4585(local25, local38 >> 17);
 				} else if (this.anIntArray532[local1] != -2) {
 					local38 = this.anIntArray533[local1] & 0xFFFE0000;
-					this.anIntArray533[local1] = local38 | Static268.method4585(local25, local38 >> 17);
+					this.anIntArray533[local1] = local38 | method4585(local25, local38 >> 17);
 					local38 = this.anIntArray523[local1] & 0xFFFE0000;
-					this.anIntArray523[local1] = local38 | Static268.method4585(local25, local38 >> 17);
+					this.anIntArray523[local1] = local38 | method4585(local25, local38 >> 17);
 					local38 = this.anIntArray532[local1] & 0xFFFE0000;
-					this.anIntArray532[local1] = local38 | Static268.method4585(local25, local38 >> 17);
+					this.anIntArray532[local1] = local38 | method4585(local25, local38 >> 17);
 				}
 			}
 		}
@@ -598,9 +735,9 @@ public final class SoftwareModel extends Model {
 		if (this.anIntArrayArray41 == null) {
 			return false;
 		} else {
-			Static268.anInt5793 = 0;
-			Static268.anInt5791 = 0;
-			Static268.anInt5792 = 0;
+			anInt5793 = 0;
+			anInt5791 = 0;
+			anInt5792 = 0;
 			return true;
 		}
 	}
@@ -750,18 +887,18 @@ public final class SoftwareModel extends Model {
 			local223 = local577;
 			local577 = local208 * arg2 - local227 * arg1 >> 16;
 			local227 = local208 * arg1 + local227 * arg2 >> 16;
-			Static268.anIntArray543[local204] = local227 - local24;
+			anIntArray543[local204] = local227 - local24;
 			if (local227 >= 50) {
-				Static268.anIntArray556[local204] = local172 + (local223 << 9) / local227;
-				Static268.anIntArray551[local204] = local174 + (local577 << 9) / local227;
+				anIntArray556[local204] = local172 + (local223 << 9) / local227;
+				anIntArray551[local204] = local174 + (local577 << 9) / local227;
 			} else {
-				Static268.anIntArray556[local204] = -5000;
+				anIntArray556[local204] = -5000;
 				local154 = true;
 			}
 			if (local170) {
-				Static268.anIntArray560[local204] = local223;
-				Static268.anIntArray548[local204] = local577;
-				Static268.anIntArray544[local204] = local227;
+				anIntArray560[local204] = local223;
+				anIntArray548[local204] = local577;
+				anIntArray544[local204] = local227;
 			}
 		}
 		try {
@@ -971,13 +1108,13 @@ public final class SoftwareModel extends Model {
 				local71 += arg5;
 				local83 = local66 * local40 - local71 * local36 >> 16;
 				local71 = local66 * local36 + local71 * local40 >> 16;
-				Static268.anIntArray543[local52] = local71 - local50;
-				Static268.anIntArray556[local52] = local6 + (local61 << 9) / local71;
-				Static268.anIntArray551[local52] = local8 + (local83 << 9) / local71;
+				anIntArray543[local52] = local71 - local50;
+				anIntArray556[local52] = local6 + (local61 << 9) / local71;
+				anIntArray551[local52] = local8 + (local83 << 9) / local71;
 				if (this.anInt5789 > 0) {
-					Static268.anIntArray560[local52] = local61;
-					Static268.anIntArray548[local52] = local83;
-					Static268.anIntArray544[local52] = local71;
+					anIntArray560[local52] = local61;
+					anIntArray548[local52] = local83;
+					anIntArray544[local52] = local71;
 				}
 			}
 			this.method4590(false, arg6 >= 0L, arg6, this.aShort35, this.aShort35 << 1, null);
@@ -993,9 +1130,9 @@ public final class SoftwareModel extends Model {
 		@Pc(10) int local10 = this.anIntArray534[arg0];
 		@Pc(15) int local15 = this.anIntArray524[arg0];
 		@Pc(20) int local20 = this.anIntArray529[arg0];
-		@Pc(24) int local24 = Static268.anIntArray544[local10];
-		@Pc(28) int local28 = Static268.anIntArray544[local15];
-		@Pc(32) int local32 = Static268.anIntArray544[local20];
+		@Pc(24) int local24 = anIntArray544[local10];
+		@Pc(28) int local28 = anIntArray544[local15];
+		@Pc(32) int local32 = anIntArray544[local20];
 		if (this.aByteArray75 == null) {
 			Rasteriser.alpha = 0;
 		} else {
@@ -1006,76 +1143,76 @@ public final class SoftwareModel extends Model {
 		@Pc(86) int local86;
 		@Pc(99) int local99;
 		if (local24 >= 50) {
-			Static268.anIntArray542[0] = Static268.anIntArray556[local10];
-			Static268.anIntArray547[0] = Static268.anIntArray551[local10];
+			anIntArray542[0] = anIntArray556[local10];
+			anIntArray547[0] = anIntArray551[local10];
 			local5++;
-			Static268.anIntArray553[0] = this.anIntArray533[arg0] & 0xFFFF;
+			anIntArray553[0] = this.anIntArray533[arg0] & 0xFFFF;
 		} else {
-			local75 = Static268.anIntArray560[local10];
-			local79 = Static268.anIntArray548[local10];
+			local75 = anIntArray560[local10];
+			local79 = anIntArray548[local10];
 			local86 = this.anIntArray533[arg0] & 0xFFFF;
 			if (local32 >= 50) {
 				local99 = (50 - local24) * MathUtils.reciprical16[local32 - local24];
-				Static268.anIntArray542[0] = local1 + (local75 + ((Static268.anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[0] = local3 + (local79 + ((Static268.anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray542[0] = local1 + (local75 + ((anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[0] = local3 + (local79 + ((anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50;
 				local5++;
-				Static268.anIntArray553[0] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray553[0] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 			if (local28 >= 50) {
 				local99 = (50 - local24) * MathUtils.reciprical16[local28 - local24];
-				Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray542[local5] = local1 + (local75 + ((anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[local5] = local3 + (local79 + ((anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 		}
 		if (local28 >= 50) {
-			Static268.anIntArray542[local5] = Static268.anIntArray556[local15];
-			Static268.anIntArray547[local5] = Static268.anIntArray551[local15];
-			Static268.anIntArray553[local5++] = this.anIntArray523[arg0] & 0xFFFF;
+			anIntArray542[local5] = anIntArray556[local15];
+			anIntArray547[local5] = anIntArray551[local15];
+			anIntArray553[local5++] = this.anIntArray523[arg0] & 0xFFFF;
 		} else {
-			local75 = Static268.anIntArray560[local15];
-			local79 = Static268.anIntArray548[local15];
+			local75 = anIntArray560[local15];
+			local79 = anIntArray548[local15];
 			local86 = this.anIntArray523[arg0] & 0xFFFF;
 			if (local24 >= 50) {
 				local99 = (50 - local28) * MathUtils.reciprical16[local24 - local28];
-				Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray542[local5] = local1 + (local75 + ((anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[local5] = local3 + (local79 + ((anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 			if (local32 >= 50) {
 				local99 = (50 - local28) * MathUtils.reciprical16[local32 - local28];
-				Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray553[local5++] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray542[local5] = local1 + (local75 + ((anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[local5] = local3 + (local79 + ((anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray553[local5++] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 		}
 		if (local32 >= 50) {
-			Static268.anIntArray542[local5] = Static268.anIntArray556[local20];
-			Static268.anIntArray547[local5] = Static268.anIntArray551[local20];
-			Static268.anIntArray553[local5++] = this.anIntArray532[arg0] & 0xFFFF;
+			anIntArray542[local5] = anIntArray556[local20];
+			anIntArray547[local5] = anIntArray551[local20];
+			anIntArray553[local5++] = this.anIntArray532[arg0] & 0xFFFF;
 		} else {
-			local75 = Static268.anIntArray560[local20];
-			local79 = Static268.anIntArray548[local20];
+			local75 = anIntArray560[local20];
+			local79 = anIntArray548[local20];
 			local86 = this.anIntArray532[arg0] & 0xFFFF;
 			if (local28 >= 50) {
 				local99 = (50 - local32) * MathUtils.reciprical16[local28 - local32];
-				Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray542[local5] = local1 + (local75 + ((anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[local5] = local3 + (local79 + ((anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 			if (local24 >= 50) {
 				local99 = (50 - local32) * MathUtils.reciprical16[local24 - local32];
-				Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50;
-				Static268.anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16);
+				anIntArray542[local5] = local1 + (local75 + ((anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50;
+				anIntArray547[local5] = local3 + (local79 + ((anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50;
+				anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16);
 			}
 		}
-		local75 = Static268.anIntArray542[0];
-		local79 = Static268.anIntArray542[1];
-		local86 = Static268.anIntArray542[2];
-		local99 = Static268.anIntArray547[0];
-		@Pc(614) int local614 = Static268.anIntArray547[1];
-		@Pc(618) int local618 = Static268.anIntArray547[2];
+		local75 = anIntArray542[0];
+		local79 = anIntArray542[1];
+		local86 = anIntArray542[2];
+		local99 = anIntArray547[0];
+		@Pc(614) int local614 = anIntArray547[1];
+		@Pc(618) int local618 = anIntArray547[2];
 		Rasteriser.testX = false;
 		@Pc(709) int local709;
 		@Pc(714) int local714;
@@ -1097,20 +1234,20 @@ public final class SoftwareModel extends Model {
 					local719 = this.anIntArray525[local704];
 				}
 				if (this.anIntArray532[arg0] == -1) {
-					Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]);
+					Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], this.aShortArray92[arg0]);
 				} else {
-					Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]);
+					Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, anIntArray553[0], anIntArray553[1], anIntArray553[2], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], this.aShortArray92[arg0]);
 				}
 			} else if (this.anIntArray532[arg0] == -1) {
 				Rasteriser.fillTriangle(local99, local614, local618, local75, local79, local86, Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF]);
 			} else {
-				Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]);
+				Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, anIntArray553[0], anIntArray553[1], anIntArray553[2]);
 			}
 		}
 		if (local5 != 4) {
 			return;
 		}
-		if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.width || local79 > Rasteriser.width || local86 > Rasteriser.width || Static268.anIntArray542[3] < 0 || Static268.anIntArray542[3] > Rasteriser.width) {
+		if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.width || local79 > Rasteriser.width || local86 > Rasteriser.width || anIntArray542[3] < 0 || anIntArray542[3] > Rasteriser.width) {
 			Rasteriser.testX = true;
 		}
 		if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) {
@@ -1126,19 +1263,19 @@ public final class SoftwareModel extends Model {
 			}
 			@Pc(984) short local984 = this.aShortArray92[arg0];
 			if (this.anIntArray532[arg0] == -1) {
-				Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
-				Rasteriser.fillTexturedAlphaTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
+				Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], local984);
+				Rasteriser.fillTexturedAlphaTriangle(local99, local618, anIntArray547[3], local75, local86, anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], local984);
 			} else {
-				Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
-				Rasteriser.fillTexturedAlphaTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984);
+				Rasteriser.fillTexturedAlphaTriangle(local99, local614, local618, local75, local79, local86, anIntArray553[0], anIntArray553[1], anIntArray553[2], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], local984);
+				Rasteriser.fillTexturedAlphaTriangle(local99, local618, anIntArray547[3], local75, local86, anIntArray542[3], anIntArray553[0], anIntArray553[2], anIntArray553[3], anIntArray560[local709], anIntArray560[local714], anIntArray560[local719], anIntArray548[local709], anIntArray548[local714], anIntArray548[local719], anIntArray544[local709], anIntArray544[local714], anIntArray544[local719], local984);
 			}
 		} else if (this.anIntArray532[arg0] == -1) {
 			local709 = Rasteriser.palette[this.anIntArray533[arg0] & 0xFFFF];
 			Rasteriser.fillTriangle(local99, local614, local618, local75, local79, local86, local709);
-			Rasteriser.fillTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], local709);
+			Rasteriser.fillTriangle(local99, local618, anIntArray547[3], local75, local86, anIntArray542[3], local709);
 		} else {
-			Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]);
-			Rasteriser.fillGouraudTriangle(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3]);
+			Rasteriser.fillGouraudTriangle(local99, local614, local618, local75, local79, local86, anIntArray553[0], anIntArray553[1], anIntArray553[2]);
+			Rasteriser.fillGouraudTriangle(local99, local618, anIntArray547[3], local75, local86, anIntArray542[3], anIntArray553[0], anIntArray553[2], anIntArray553[3]);
 		}
 	}
 
@@ -1165,16 +1302,16 @@ public final class SoftwareModel extends Model {
 	@OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZZ)Lclient!ak;")
 	@Override
 	public final Model method4560(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
-		if (!arg0 && Static268.aByteArray77.length < this.anInt5787) {
-			Static268.aByteArray77 = new byte[this.anInt5787 + 100];
+		if (!arg0 && aByteArray77.length < this.anInt5787) {
+			aByteArray77 = new byte[this.anInt5787 + 100];
 		}
-		if (!arg1 && Static268.aShortArray94.length < this.anInt5787) {
-			Static268.anIntArray539 = new int[this.anInt5787 + 100];
-			Static268.anIntArray540 = new int[this.anInt5787 + 100];
-			Static268.anIntArray538 = new int[this.anInt5787 + 100];
-			Static268.aShortArray94 = new short[this.anInt5787 + 100];
+		if (!arg1 && aShortArray94.length < this.anInt5787) {
+			anIntArray539 = new int[this.anInt5787 + 100];
+			anIntArray540 = new int[this.anInt5787 + 100];
+			anIntArray538 = new int[this.anInt5787 + 100];
+			aShortArray94 = new short[this.anInt5787 + 100];
 		}
-		return this.method4584(arg0, arg1, Static268.aClass8_Sub1_Sub2_2, Static268.aByteArray77, Static268.aShortArray94, Static268.anIntArray539, Static268.anIntArray540, Static268.anIntArray538);
+		return this.method4584(arg0, arg1, aClass8_Sub1_Sub2_2, aByteArray77, aShortArray94, anIntArray539, anIntArray540, anIntArray538);
 	}
 
 	@OriginalMember(owner = "client!w", name = "j", descriptor = "()I")
@@ -1233,30 +1370,30 @@ public final class SoftwareModel extends Model {
 		@Pc(41) int local41;
 		if (arg0 == 0) {
 			local6 = 0;
-			Static268.anInt5793 = 0;
-			Static268.anInt5791 = 0;
-			Static268.anInt5792 = 0;
+			anInt5793 = 0;
+			anInt5791 = 0;
+			anInt5792 = 0;
 			for (local14 = 0; local14 < local2; local14++) {
 				@Pc(21) int local21 = arg1[local14];
 				if (local21 < this.anIntArrayArray41.length) {
 					@Pc(31) int[] local31 = this.anIntArrayArray41[local21];
 					for (local33 = 0; local33 < local31.length; local33++) {
 						local41 = local31[local33];
-						Static268.anInt5793 += this.anIntArray528[local41];
-						Static268.anInt5791 += this.anIntArray527[local41];
-						Static268.anInt5792 += this.anIntArray531[local41];
+						anInt5793 += this.anIntArray528[local41];
+						anInt5791 += this.anIntArray527[local41];
+						anInt5792 += this.anIntArray531[local41];
 						local6++;
 					}
 				}
 			}
 			if (local6 > 0) {
-				Static268.anInt5793 = Static268.anInt5793 / local6 + arg2;
-				Static268.anInt5791 = Static268.anInt5791 / local6 + arg3;
-				Static268.anInt5792 = Static268.anInt5792 / local6 + arg4;
+				anInt5793 = anInt5793 / local6 + arg2;
+				anInt5791 = anInt5791 / local6 + arg3;
+				anInt5792 = anInt5792 / local6 + arg4;
 			} else {
-				Static268.anInt5793 = arg2;
-				Static268.anInt5791 = arg3;
-				Static268.anInt5792 = arg4;
+				anInt5793 = arg2;
+				anInt5791 = arg3;
+				anInt5792 = arg4;
 			}
 			return;
 		}
@@ -1286,9 +1423,9 @@ public final class SoftwareModel extends Model {
 					local117 = this.anIntArrayArray41[local14];
 					for (local119 = 0; local119 < local117.length; local119++) {
 						local33 = local117[local119];
-						this.anIntArray528[local33] -= Static268.anInt5793;
-						this.anIntArray527[local33] -= Static268.anInt5791;
-						this.anIntArray531[local33] -= Static268.anInt5792;
+						this.anIntArray528[local33] -= anInt5793;
+						this.anIntArray527[local33] -= anInt5791;
+						this.anIntArray531[local33] -= anInt5792;
 						if (arg4 != 0) {
 							local41 = MathUtils.sin[arg4];
 							local222 = MathUtils.cos[arg4];
@@ -1310,9 +1447,9 @@ public final class SoftwareModel extends Model {
 							this.anIntArray531[local33] = this.anIntArray531[local33] * local222 + 32767 - this.anIntArray528[local33] * local41 >> 16;
 							this.anIntArray528[local33] = local240;
 						}
-						this.anIntArray528[local33] += Static268.anInt5793;
-						this.anIntArray527[local33] += Static268.anInt5791;
-						this.anIntArray531[local33] += Static268.anInt5792;
+						this.anIntArray528[local33] += anInt5793;
+						this.anIntArray527[local33] += anInt5791;
+						this.anIntArray531[local33] += anInt5792;
 					}
 				}
 			}
@@ -1323,15 +1460,15 @@ public final class SoftwareModel extends Model {
 					local117 = this.anIntArrayArray41[local14];
 					for (local119 = 0; local119 < local117.length; local119++) {
 						local33 = local117[local119];
-						this.anIntArray528[local33] -= Static268.anInt5793;
-						this.anIntArray527[local33] -= Static268.anInt5791;
-						this.anIntArray531[local33] -= Static268.anInt5792;
+						this.anIntArray528[local33] -= anInt5793;
+						this.anIntArray527[local33] -= anInt5791;
+						this.anIntArray531[local33] -= anInt5792;
 						this.anIntArray528[local33] = this.anIntArray528[local33] * arg2 / 128;
 						this.anIntArray527[local33] = this.anIntArray527[local33] * arg3 / 128;
 						this.anIntArray531[local33] = this.anIntArray531[local33] * arg4 / 128;
-						this.anIntArray528[local33] += Static268.anInt5793;
-						this.anIntArray527[local33] += Static268.anInt5791;
-						this.anIntArray531[local33] += Static268.anInt5792;
+						this.anIntArray528[local33] += anInt5793;
+						this.anIntArray527[local33] += anInt5791;
+						this.anIntArray531[local33] += anInt5792;
 					}
 				}
 			}
@@ -1402,16 +1539,16 @@ public final class SoftwareModel extends Model {
 	@OriginalMember(owner = "client!w", name = "c", descriptor = "(ZZZ)Lclient!ak;")
 	@Override
 	public final Model method4572(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
-		if (!arg0 && Static268.aByteArray76.length < this.anInt5787) {
-			Static268.aByteArray76 = new byte[this.anInt5787 + 100];
+		if (!arg0 && aByteArray76.length < this.anInt5787) {
+			aByteArray76 = new byte[this.anInt5787 + 100];
 		}
-		if (!arg1 && Static268.aShortArray93.length < this.anInt5787) {
-			Static268.anIntArray536 = new int[this.anInt5787 + 100];
-			Static268.anIntArray537 = new int[this.anInt5787 + 100];
-			Static268.anIntArray535 = new int[this.anInt5787 + 100];
-			Static268.aShortArray93 = new short[this.anInt5787 + 100];
+		if (!arg1 && aShortArray93.length < this.anInt5787) {
+			anIntArray536 = new int[this.anInt5787 + 100];
+			anIntArray537 = new int[this.anInt5787 + 100];
+			anIntArray535 = new int[this.anInt5787 + 100];
+			aShortArray93 = new short[this.anInt5787 + 100];
 		}
-		return this.method4584(arg0, arg1, Static268.aClass8_Sub1_Sub2_1, Static268.aByteArray76, Static268.aShortArray93, Static268.anIntArray536, Static268.anIntArray537, Static268.anIntArray535);
+		return this.method4584(arg0, arg1, aClass8_Sub1_Sub2_1, aByteArray76, aShortArray93, anIntArray536, anIntArray537, anIntArray535);
 	}
 
 	@OriginalMember(owner = "client!w", name = "a", descriptor = "(ZZJIILclient!ga;)V")
@@ -1422,14 +1559,14 @@ public final class SoftwareModel extends Model {
 		@Pc(5) int local5 = 0;
 		@Pc(7) int local7 = 0;
 		@Pc(11) int local11;
-		if (!Static268.aBoolean307) {
+		if (!aBoolean307) {
 			for (local11 = 0; local11 < 1600; local11++) {
-				Static268.anIntArray558[local11] = 0;
+				anIntArray558[local11] = 0;
 			}
 			for (local11 = 0; local11 < 32; local11++) {
-				Static268.anIntArray552[local11] = 0;
+				anIntArray552[local11] = 0;
 			}
-			Static268.anInt5790 = 0;
+			anInt5790 = 0;
 		}
 		@Pc(51) int local51;
 		@Pc(56) int local56;
@@ -1445,19 +1582,19 @@ public final class SoftwareModel extends Model {
 				local51 = this.anIntArray534[local11];
 				local56 = this.anIntArray524[local11];
 				local61 = this.anIntArray529[local11];
-				local65 = Static268.anIntArray556[local51];
-				local69 = Static268.anIntArray556[local56];
-				@Pc(73) int local73 = Static268.anIntArray556[local61];
+				local65 = anIntArray556[local51];
+				local69 = anIntArray556[local56];
+				@Pc(73) int local73 = anIntArray556[local61];
 				if (arg0 && (local65 == -5000 || local69 == -5000 || local73 == -5000)) {
-					local88 = Static268.anIntArray560[local51];
-					local92 = Static268.anIntArray560[local56];
-					local96 = Static268.anIntArray560[local61];
-					@Pc(100) int local100 = Static268.anIntArray548[local51];
-					local104 = Static268.anIntArray548[local56];
-					@Pc(108) int local108 = Static268.anIntArray548[local61];
-					@Pc(112) int local112 = Static268.anIntArray544[local51];
-					@Pc(116) int local116 = Static268.anIntArray544[local56];
-					@Pc(120) int local120 = Static268.anIntArray544[local61];
+					local88 = anIntArray560[local51];
+					local92 = anIntArray560[local56];
+					local96 = anIntArray560[local61];
+					@Pc(100) int local100 = anIntArray548[local51];
+					local104 = anIntArray548[local56];
+					@Pc(108) int local108 = anIntArray548[local61];
+					@Pc(112) int local112 = anIntArray544[local51];
+					@Pc(116) int local116 = anIntArray544[local56];
+					@Pc(120) int local120 = anIntArray544[local61];
 					local88 -= local92;
 					@Pc(128) int local128 = local96 - local92;
 					@Pc(132) int local132 = local100 - local104;
@@ -1468,96 +1605,96 @@ public final class SoftwareModel extends Model {
 					@Pc(160) int local160 = local140 * local128 - local88 * local144;
 					@Pc(168) int local168 = local88 * local136 - local132 * local128;
 					if (local92 * local152 + local104 * local160 + local116 * local168 > 0) {
-						Static268.aBooleanArray132[local11] = true;
-						if (Static268.aBoolean307) {
-							Static268.anIntArray550[local5] = (Static268.anIntArray543[local51] + Static268.anIntArray543[local56] + Static268.anIntArray543[local61]) / 3;
-							Static268.anIntArray549[local5++] = local11;
+						aBooleanArray132[local11] = true;
+						if (aBoolean307) {
+							anIntArray550[local5] = (anIntArray543[local51] + anIntArray543[local56] + anIntArray543[local61]) / 3;
+							anIntArray549[local5++] = local11;
 						} else {
-							@Pc(224) int local224 = (Static268.anIntArray543[local51] + Static268.anIntArray543[local56] + Static268.anIntArray543[local61]) / 3 + arg3;
-							if (Static268.anIntArray558[local224] < 64) {
-								Static268.anIntArrayArray44[local224][Static268.anIntArray558[local224]++] = local11;
+							@Pc(224) int local224 = (anIntArray543[local51] + anIntArray543[local56] + anIntArray543[local61]) / 3 + arg3;
+							if (anIntArray558[local224] < 64) {
+								anIntArrayArray44[local224][anIntArray558[local224]++] = local11;
 							} else {
-								@Pc(247) int local247 = Static268.anIntArray558[local224];
+								@Pc(247) int local247 = anIntArray558[local224];
 								if (local247 == 64) {
-									if (Static268.anInt5790 == 512) {
+									if (anInt5790 == 512) {
 										continue;
 									}
-									Static268.anIntArray558[local224] = local247 = Static268.anInt5790++ + 65;
+									anIntArray558[local224] = local247 = anInt5790++ + 65;
 								}
 								local247 -= 65;
-								Static268.anIntArrayArray43[local247][Static268.anIntArray552[local247]++] = local11;
+								anIntArrayArray43[local247][anIntArray552[local247]++] = local11;
 							}
 						}
 					}
 				} else {
-					if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, Static268.anIntArray551[local51], Static268.anIntArray551[local56], Static268.anIntArray551[local61], local65, local69, local73)) {
+					if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.centerX, Static34.anInt1053 + Rasteriser.centerY, anIntArray551[local51], anIntArray551[local56], anIntArray551[local61], local65, local69, local73)) {
 						Static259.aLongArray11[Static2.anInt7++] = arg2;
 						arg1 = false;
 					}
-					if ((local65 - local69) * (Static268.anIntArray551[local61] - Static268.anIntArray551[local56]) - (Static268.anIntArray551[local51] - Static268.anIntArray551[local56]) * (local73 - local69) > 0) {
-						Static268.aBooleanArray132[local11] = false;
+					if ((local65 - local69) * (anIntArray551[local61] - anIntArray551[local56]) - (anIntArray551[local51] - anIntArray551[local56]) * (local73 - local69) > 0) {
+						aBooleanArray132[local11] = false;
 						if (local65 >= 0 && local69 >= 0 && local73 >= 0 && local65 <= Rasteriser.width && local69 <= Rasteriser.width && local73 <= Rasteriser.width) {
-							Static268.aBooleanArray133[local11] = false;
+							aBooleanArray133[local11] = false;
 						} else {
-							Static268.aBooleanArray133[local11] = true;
+							aBooleanArray133[local11] = true;
 						}
-						if (Static268.aBoolean307) {
-							Static268.anIntArray550[local5] = (Static268.anIntArray543[local51] + Static268.anIntArray543[local56] + Static268.anIntArray543[local61]) / 3;
-							Static268.anIntArray549[local5++] = local11;
+						if (aBoolean307) {
+							anIntArray550[local5] = (anIntArray543[local51] + anIntArray543[local56] + anIntArray543[local61]) / 3;
+							anIntArray549[local5++] = local11;
 						} else {
-							local88 = (Static268.anIntArray543[local51] + Static268.anIntArray543[local56] + Static268.anIntArray543[local61]) / 3 + arg3;
-							if (Static268.anIntArray558[local88] < 64) {
-								Static268.anIntArrayArray44[local88][Static268.anIntArray558[local88]++] = local11;
+							local88 = (anIntArray543[local51] + anIntArray543[local56] + anIntArray543[local61]) / 3 + arg3;
+							if (anIntArray558[local88] < 64) {
+								anIntArrayArray44[local88][anIntArray558[local88]++] = local11;
 							} else {
-								local92 = Static268.anIntArray558[local88];
+								local92 = anIntArray558[local88];
 								if (local92 == 64) {
-									if (Static268.anInt5790 == 512) {
+									if (anInt5790 == 512) {
 										continue;
 									}
-									Static268.anIntArray558[local88] = local92 = Static268.anInt5790++ + 65;
+									anIntArray558[local88] = local92 = anInt5790++ + 65;
 								}
 								local92 -= 65;
-								Static268.anIntArrayArray43[local92][Static268.anIntArray552[local92]++] = local11;
+								anIntArrayArray43[local92][anIntArray552[local92]++] = local11;
 							}
 						}
 					}
 				}
 			}
 		}
-		if (Static268.aBoolean307) {
-			Static172.method3223(0, local5 - 1, Static268.anIntArray550, Static268.anIntArray549);
+		if (aBoolean307) {
+			Static172.method3223(0, local5 - 1, anIntArray550, anIntArray549);
 			if (this.aByteArray73 == null) {
 				for (local11 = 0; local11 < local5; local11++) {
-					this.method4579(Static268.anIntArray549[local11]);
+					this.method4579(anIntArray549[local11]);
 				}
 				return;
 			}
 			for (local11 = 0; local11 < 12; local11++) {
-				Static268.anIntArray541[local11] = 0;
-				Static268.anIntArray557[local11] = 0;
+				anIntArray541[local11] = 0;
+				anIntArray557[local11] = 0;
 			}
 			for (local11 = 0; local11 < local5; local11++) {
-				local51 = Static268.anIntArray549[local11];
-				local56 = Static268.anIntArray550[local11];
+				local51 = anIntArray549[local11];
+				local56 = anIntArray550[local11];
 				@Pc(523) byte local523 = this.aByteArray73[local51];
-				local65 = Static268.anIntArray541[local523]++;
-				Static268.anIntArrayArray45[local523][local65] = local51;
+				local65 = anIntArray541[local523]++;
+				anIntArrayArray45[local523][local65] = local51;
 				if (local523 < 10) {
-					Static268.anIntArray557[local523] += local56;
+					anIntArray557[local523] += local56;
 				} else if (local523 == 10) {
-					Static268.anIntArray545[local65] = local56;
+					anIntArray545[local65] = local56;
 				} else {
-					Static268.anIntArray555[local65] = local56;
+					anIntArray555[local65] = local56;
 				}
 			}
 		} else {
 			@Pc(590) int[] local590;
 			if (this.aByteArray73 == null) {
 				for (local11 = arg4 - 1; local11 >= 0; local11--) {
-					local51 = Static268.anIntArray558[local11];
+					local51 = anIntArray558[local11];
 					if (local51 > 0) {
 						local56 = local51 > 64 ? 64 : local51;
-						local590 = Static268.anIntArrayArray44[local11];
+						local590 = anIntArrayArray44[local11];
 						for (local65 = 0; local65 < local56; local65++) {
 							local69 = local590[local65];
 							if (local69 < 65536) {
@@ -1566,9 +1703,9 @@ public final class SoftwareModel extends Model {
 						}
 					}
 					if (local51 > 64) {
-						local56 = Static268.anIntArray558[local11] - 64 - 1;
-						local590 = Static268.anIntArrayArray43[local56];
-						for (local65 = 0; local65 < Static268.anIntArray552[local56]; local65++) {
+						local56 = anIntArray558[local11] - 64 - 1;
+						local590 = anIntArrayArray43[local56];
+						for (local65 = 0; local65 < anIntArray552[local56]; local65++) {
 							local69 = local590[local65];
 							if (local69 < 65536) {
 								this.method4579(local590[local65]);
@@ -1579,11 +1716,11 @@ public final class SoftwareModel extends Model {
 				return;
 			}
 			for (local11 = 0; local11 < 12; local11++) {
-				Static268.anIntArray541[local11] = 0;
-				Static268.anIntArray557[local11] = 0;
+				anIntArray541[local11] = 0;
+				anIntArray557[local11] = 0;
 			}
 			for (local11 = arg4 - 1; local11 >= 0; local11--) {
-				local51 = Static268.anIntArray558[local11];
+				local51 = anIntArray558[local11];
 				@Pc(704) byte local704;
 				if (local51 > 0) {
 					if (local51 > 64) {
@@ -1591,69 +1728,69 @@ public final class SoftwareModel extends Model {
 					} else {
 						local56 = local51;
 					}
-					local590 = Static268.anIntArrayArray44[local11];
+					local590 = anIntArrayArray44[local11];
 					for (local65 = 0; local65 < local56; local65++) {
 						local69 = local590[local65];
 						if (local69 < 65536) {
 							local704 = this.aByteArray73[local69];
-							local88 = Static268.anIntArray541[local704]++;
-							Static268.anIntArrayArray45[local704][local88] = local69;
+							local88 = anIntArray541[local704]++;
+							anIntArrayArray45[local704][local88] = local69;
 							if (local704 < 10) {
-								Static268.anIntArray557[local704] += local11;
+								anIntArray557[local704] += local11;
 							} else if (local704 == 10) {
-								Static268.anIntArray545[local88] = local11;
+								anIntArray545[local88] = local11;
 							} else {
-								Static268.anIntArray555[local88] = local11;
+								anIntArray555[local88] = local11;
 							}
 						} else {
-							Static268.anIntArray561[local7++] = (local69 >> 16) - 1;
+							anIntArray561[local7++] = (local69 >> 16) - 1;
 						}
 					}
 				}
 				if (local51 > 64) {
-					local56 = Static268.anIntArray558[local11] - 64 - 1;
-					local590 = Static268.anIntArrayArray43[local56];
-					for (local65 = 0; local65 < Static268.anIntArray552[local56]; local65++) {
+					local56 = anIntArray558[local11] - 64 - 1;
+					local590 = anIntArrayArray43[local56];
+					for (local65 = 0; local65 < anIntArray552[local56]; local65++) {
 						local69 = local590[local65];
 						if (local69 < 65536) {
 							local704 = this.aByteArray73[local69];
-							local88 = Static268.anIntArray541[local704]++;
-							Static268.anIntArrayArray45[local704][local88] = local69;
+							local88 = anIntArray541[local704]++;
+							anIntArrayArray45[local704][local88] = local69;
 							if (local704 < 10) {
-								Static268.anIntArray557[local704] += local11;
+								anIntArray557[local704] += local11;
 							} else if (local704 == 10) {
-								Static268.anIntArray545[local88] = local11;
+								anIntArray545[local88] = local11;
 							} else {
-								Static268.anIntArray555[local88] = local11;
+								anIntArray555[local88] = local11;
 							}
 						} else {
-							Static268.anIntArray561[local7++] = (local69 >> 16) - 1;
+							anIntArray561[local7++] = (local69 >> 16) - 1;
 						}
 					}
 				}
 			}
 		}
 		local11 = 0;
-		if (Static268.anIntArray541[1] > 0 || Static268.anIntArray541[2] > 0) {
-			local11 = (Static268.anIntArray557[1] + Static268.anIntArray557[2]) / (Static268.anIntArray541[1] + Static268.anIntArray541[2]);
+		if (anIntArray541[1] > 0 || anIntArray541[2] > 0) {
+			local11 = (anIntArray557[1] + anIntArray557[2]) / (anIntArray541[1] + anIntArray541[2]);
 		}
 		local51 = 0;
-		if (Static268.anIntArray541[3] > 0 || Static268.anIntArray541[4] > 0) {
-			local51 = (Static268.anIntArray557[3] + Static268.anIntArray557[4]) / (Static268.anIntArray541[3] + Static268.anIntArray541[4]);
+		if (anIntArray541[3] > 0 || anIntArray541[4] > 0) {
+			local51 = (anIntArray557[3] + anIntArray557[4]) / (anIntArray541[3] + anIntArray541[4]);
 		}
 		local56 = 0;
-		if (Static268.anIntArray541[6] > 0 || Static268.anIntArray541[8] > 0) {
-			local56 = (Static268.anIntArray557[6] + Static268.anIntArray557[8]) / (Static268.anIntArray541[6] + Static268.anIntArray541[8]);
+		if (anIntArray541[6] > 0 || anIntArray541[8] > 0) {
+			local56 = (anIntArray557[6] + anIntArray557[8]) / (anIntArray541[6] + anIntArray541[8]);
 		}
 		local65 = 0;
-		local69 = Static268.anIntArray541[10];
-		@Pc(928) int[] local928 = Static268.anIntArrayArray45[10];
-		@Pc(930) int[] local930 = Static268.anIntArray545;
+		local69 = anIntArray541[10];
+		@Pc(928) int[] local928 = anIntArrayArray45[10];
+		@Pc(930) int[] local930 = anIntArray545;
 		if (local69 == 0) {
 			local65 = 0;
-			local69 = Static268.anIntArray541[11];
-			local928 = Static268.anIntArrayArray45[11];
-			local930 = Static268.anIntArray555;
+			local69 = anIntArray541[11];
+			local928 = anIntArrayArray45[11];
+			local930 = anIntArray555;
 		}
 		if (local69 > 0) {
 			local61 = local930[0];
@@ -1663,11 +1800,11 @@ public final class SoftwareModel extends Model {
 		for (local92 = 0; local92 < 10; local92++) {
 			while (local92 == 0 && local61 > local11) {
 				this.method4579(local928[local65++]);
-				if (local65 == local69 && local928 != Static268.anIntArrayArray45[11]) {
+				if (local65 == local69 && local928 != anIntArrayArray45[11]) {
 					local65 = 0;
-					local69 = Static268.anIntArray541[11];
-					local928 = Static268.anIntArrayArray45[11];
-					local930 = Static268.anIntArray555;
+					local69 = anIntArray541[11];
+					local928 = anIntArrayArray45[11];
+					local930 = anIntArray555;
 				}
 				if (local65 < local69) {
 					local61 = local930[local65];
@@ -1677,11 +1814,11 @@ public final class SoftwareModel extends Model {
 			}
 			while (local92 == 3 && local61 > local51) {
 				this.method4579(local928[local65++]);
-				if (local65 == local69 && local928 != Static268.anIntArrayArray45[11]) {
+				if (local65 == local69 && local928 != anIntArrayArray45[11]) {
 					local65 = 0;
-					local69 = Static268.anIntArray541[11];
-					local928 = Static268.anIntArrayArray45[11];
-					local930 = Static268.anIntArray555;
+					local69 = anIntArray541[11];
+					local928 = anIntArrayArray45[11];
+					local930 = anIntArray555;
 				}
 				if (local65 < local69) {
 					local61 = local930[local65];
@@ -1691,11 +1828,11 @@ public final class SoftwareModel extends Model {
 			}
 			while (local92 == 5 && local61 > local56) {
 				this.method4579(local928[local65++]);
-				if (local65 == local69 && local928 != Static268.anIntArrayArray45[11]) {
+				if (local65 == local69 && local928 != anIntArrayArray45[11]) {
 					local65 = 0;
-					local69 = Static268.anIntArray541[11];
-					local928 = Static268.anIntArrayArray45[11];
-					local930 = Static268.anIntArray555;
+					local69 = anIntArray541[11];
+					local928 = anIntArrayArray45[11];
+					local930 = anIntArray555;
 				}
 				if (local65 < local69) {
 					local61 = local930[local65];
@@ -1703,19 +1840,19 @@ public final class SoftwareModel extends Model {
 					local61 = -1000;
 				}
 			}
-			local96 = Static268.anIntArray541[local92];
-			@Pc(1096) int[] local1096 = Static268.anIntArrayArray45[local92];
+			local96 = anIntArray541[local92];
+			@Pc(1096) int[] local1096 = anIntArrayArray45[local92];
 			for (local104 = 0; local104 < local96; local104++) {
 				this.method4579(local1096[local104]);
 			}
 		}
 		while (local61 != -1000) {
 			this.method4579(local928[local65++]);
-			if (local65 == local69 && local928 != Static268.anIntArrayArray45[11]) {
+			if (local65 == local69 && local928 != anIntArrayArray45[11]) {
 				local65 = 0;
-				local928 = Static268.anIntArrayArray45[11];
-				local69 = Static268.anIntArray541[11];
-				local930 = Static268.anIntArray555;
+				local928 = anIntArrayArray45[11];
+				local69 = anIntArray541[11];
+				local930 = anIntArray555;
 			}
 			if (local65 < local69) {
 				local61 = local930[local65];
@@ -1773,13 +1910,13 @@ public final class SoftwareModel extends Model {
 				local71 += arg5;
 				local83 = local66 * local40 - local71 * local36 >> 16;
 				local71 = local66 * local36 + local71 * local40 >> 16;
-				Static268.anIntArray543[local52] = local71 - local50;
-				Static268.anIntArray556[local52] = local6 + (local61 << 9) / arg6;
-				Static268.anIntArray551[local52] = local8 + (local83 << 9) / arg6;
+				anIntArray543[local52] = local71 - local50;
+				anIntArray556[local52] = local6 + (local61 << 9) / arg6;
+				anIntArray551[local52] = local8 + (local83 << 9) / arg6;
 				if (this.anInt5789 > 0) {
-					Static268.anIntArray560[local52] = local61;
-					Static268.anIntArray548[local52] = local83;
-					Static268.anIntArray544[local52] = local71;
+					anIntArray560[local52] = local61;
+					anIntArray548[local52] = local83;
+					anIntArray544[local52] = local71;
 				}
 			}
 			this.method4590(false, false, 0L, this.aShort35, this.aShort35 << 1, null);
@@ -1859,9 +1996,9 @@ public final class SoftwareModel extends Model {
 		@Pc(21) int local21;
 		if (arg0 == 0) {
 			local6 = 0;
-			Static268.anInt5793 = 0;
-			Static268.anInt5791 = 0;
-			Static268.anInt5792 = 0;
+			anInt5793 = 0;
+			anInt5791 = 0;
+			anInt5792 = 0;
 			for (local14 = 0; local14 < local2; local14++) {
 				local21 = arg1[local14];
 				if (local21 < this.anIntArrayArray41.length) {
@@ -1869,23 +2006,23 @@ public final class SoftwareModel extends Model {
 					for (local33 = 0; local33 < local31.length; local33++) {
 						local41 = local31[local33];
 						if (this.aShortArray91 == null || (arg6 & this.aShortArray91[local41]) != 0) {
-							Static268.anInt5793 += this.anIntArray528[local41];
-							Static268.anInt5791 += this.anIntArray527[local41];
-							Static268.anInt5792 += this.anIntArray531[local41];
+							anInt5793 += this.anIntArray528[local41];
+							anInt5791 += this.anIntArray527[local41];
+							anInt5792 += this.anIntArray531[local41];
 							local6++;
 						}
 					}
 				}
 			}
 			if (local6 > 0) {
-				Static268.anInt5793 = Static268.anInt5793 / local6 + arg2;
-				Static268.anInt5791 = Static268.anInt5791 / local6 + arg3;
-				Static268.anInt5792 = Static268.anInt5792 / local6 + arg4;
-				Static268.aBoolean306 = true;
+				anInt5793 = anInt5793 / local6 + arg2;
+				anInt5791 = anInt5791 / local6 + arg3;
+				anInt5792 = anInt5792 / local6 + arg4;
+				aBoolean306 = true;
 			} else {
-				Static268.anInt5793 = arg2;
-				Static268.anInt5791 = arg3;
-				Static268.anInt5792 = arg4;
+				anInt5793 = arg2;
+				anInt5791 = arg3;
+				anInt5792 = arg4;
 			}
 			return;
 		}
@@ -1947,9 +2084,9 @@ public final class SoftwareModel extends Model {
 						for (local206 = 0; local206 < local204.length; local206++) {
 							local33 = local204[local206];
 							if (this.aShortArray91 == null || (arg6 & this.aShortArray91[local33]) != 0) {
-								this.anIntArray528[local33] -= Static268.anInt5793;
-								this.anIntArray527[local33] -= Static268.anInt5791;
-								this.anIntArray531[local33] -= Static268.anInt5792;
+								this.anIntArray528[local33] -= anInt5793;
+								this.anIntArray527[local33] -= anInt5791;
+								this.anIntArray531[local33] -= anInt5792;
 								if (arg4 != 0) {
 									local41 = MathUtils.sin[arg4];
 									local307 = MathUtils.cos[arg4];
@@ -1971,9 +2108,9 @@ public final class SoftwareModel extends Model {
 									this.anIntArray531[local33] = this.anIntArray531[local33] * local307 + 32767 - this.anIntArray528[local33] * local41 >> 16;
 									this.anIntArray528[local33] = local329;
 								}
-								this.anIntArray528[local33] += Static268.anInt5793;
-								this.anIntArray527[local33] += Static268.anInt5791;
-								this.anIntArray531[local33] += Static268.anInt5792;
+								this.anIntArray528[local33] += anInt5793;
+								this.anIntArray527[local33] += anInt5791;
+								this.anIntArray531[local33] += anInt5792;
 							}
 						}
 					}
@@ -1985,17 +2122,17 @@ public final class SoftwareModel extends Model {
 				local206 = arg7[12];
 				local33 = arg7[13];
 				local41 = arg7[14];
-				if (Static268.aBoolean306) {
-					local307 = arg7[0] * Static268.anInt5793 + arg7[3] * Static268.anInt5791 + arg7[6] * Static268.anInt5792 + 16384 >> 15;
-					local329 = arg7[1] * Static268.anInt5793 + arg7[4] * Static268.anInt5791 + arg7[7] * Static268.anInt5792 + 16384 >> 15;
-					local351 = arg7[2] * Static268.anInt5793 + arg7[5] * Static268.anInt5791 + arg7[8] * Static268.anInt5792 + 16384 >> 15;
+				if (aBoolean306) {
+					local307 = arg7[0] * anInt5793 + arg7[3] * anInt5791 + arg7[6] * anInt5792 + 16384 >> 15;
+					local329 = arg7[1] * anInt5793 + arg7[4] * anInt5791 + arg7[7] * anInt5792 + 16384 >> 15;
+					local351 = arg7[2] * anInt5793 + arg7[5] * anInt5791 + arg7[8] * anInt5792 + 16384 >> 15;
 					local307 += local206;
 					local329 += local33;
 					local351 += local41;
-					Static268.anInt5793 = local307;
-					Static268.anInt5791 = local329;
-					Static268.anInt5792 = local351;
-					Static268.aBoolean306 = false;
+					anInt5793 = local307;
+					anInt5791 = local329;
+					anInt5792 = local351;
+					aBoolean306 = false;
 				}
 				@Pc(374) int[] local374 = new int[9];
 				local329 = MathUtils.cos[arg2] >> 1;
@@ -2015,12 +2152,12 @@ public final class SoftwareModel extends Model {
 				local374[6] = -local398 * local404 + local392 * local426 + 16384 >> 15;
 				local374[7] = local398 * local410 + local392 * local418 + 16384 >> 15;
 				local374[8] = local392 * local329 + 16384 >> 15;
-				@Pc(554) int local554 = local374[0] * -Static268.anInt5793 + local374[1] * -Static268.anInt5791 + local374[2] * -Static268.anInt5792 + 16384 >> 15;
-				local579 = local374[3] * -Static268.anInt5793 + local374[4] * -Static268.anInt5791 + local374[5] * -Static268.anInt5792 + 16384 >> 15;
-				local604 = local374[6] * -Static268.anInt5793 + local374[7] * -Static268.anInt5791 + local374[8] * -Static268.anInt5792 + 16384 >> 15;
-				local608 = local554 + Static268.anInt5793;
-				@Pc(612) int local612 = local579 + Static268.anInt5791;
-				local616 = local604 + Static268.anInt5792;
+				@Pc(554) int local554 = local374[0] * -anInt5793 + local374[1] * -anInt5791 + local374[2] * -anInt5792 + 16384 >> 15;
+				local579 = local374[3] * -anInt5793 + local374[4] * -anInt5791 + local374[5] * -anInt5792 + 16384 >> 15;
+				local604 = local374[6] * -anInt5793 + local374[7] * -anInt5791 + local374[8] * -anInt5792 + 16384 >> 15;
+				local608 = local554 + anInt5793;
+				@Pc(612) int local612 = local579 + anInt5791;
+				local616 = local604 + anInt5792;
 				@Pc(619) int[] local619 = new int[9];
 				for (local621 = 0; local621 < 3; local621++) {
 					for (local626 = 0; local626 < 3; local626++) {
@@ -2083,15 +2220,15 @@ public final class SoftwareModel extends Model {
 						for (local206 = 0; local206 < local204.length; local206++) {
 							local33 = local204[local206];
 							if (this.aShortArray91 == null || (arg6 & this.aShortArray91[local33]) != 0) {
-								this.anIntArray528[local33] -= Static268.anInt5793;
-								this.anIntArray527[local33] -= Static268.anInt5791;
-								this.anIntArray531[local33] -= Static268.anInt5792;
+								this.anIntArray528[local33] -= anInt5793;
+								this.anIntArray527[local33] -= anInt5791;
+								this.anIntArray531[local33] -= anInt5792;
 								this.anIntArray528[local33] = this.anIntArray528[local33] * arg2 / 128;
 								this.anIntArray527[local33] = this.anIntArray527[local33] * arg3 / 128;
 								this.anIntArray531[local33] = this.anIntArray531[local33] * arg4 / 128;
-								this.anIntArray528[local33] += Static268.anInt5793;
-								this.anIntArray527[local33] += Static268.anInt5791;
-								this.anIntArray531[local33] += Static268.anInt5792;
+								this.anIntArray528[local33] += anInt5793;
+								this.anIntArray527[local33] += anInt5791;
+								this.anIntArray531[local33] += anInt5792;
 							}
 						}
 					}
@@ -2103,27 +2240,27 @@ public final class SoftwareModel extends Model {
 				local206 = arg7[12];
 				local33 = arg7[13];
 				local41 = arg7[14];
-				if (Static268.aBoolean306) {
-					local307 = arg7[0] * Static268.anInt5793 + arg7[3] * Static268.anInt5791 + arg7[6] * Static268.anInt5792 + 16384 >> 15;
-					local329 = arg7[1] * Static268.anInt5793 + arg7[4] * Static268.anInt5791 + arg7[7] * Static268.anInt5792 + 16384 >> 15;
-					local351 = arg7[2] * Static268.anInt5793 + arg7[5] * Static268.anInt5791 + arg7[8] * Static268.anInt5792 + 16384 >> 15;
+				if (aBoolean306) {
+					local307 = arg7[0] * anInt5793 + arg7[3] * anInt5791 + arg7[6] * anInt5792 + 16384 >> 15;
+					local329 = arg7[1] * anInt5793 + arg7[4] * anInt5791 + arg7[7] * anInt5792 + 16384 >> 15;
+					local351 = arg7[2] * anInt5793 + arg7[5] * anInt5791 + arg7[8] * anInt5792 + 16384 >> 15;
 					local307 += local206;
 					local329 += local33;
 					local351 += local41;
-					Static268.anInt5793 = local307;
-					Static268.anInt5791 = local329;
-					Static268.anInt5792 = local351;
-					Static268.aBoolean306 = false;
+					anInt5793 = local307;
+					anInt5791 = local329;
+					anInt5792 = local351;
+					aBoolean306 = false;
 				}
 				local307 = arg2 << 15 >> 7;
 				local329 = arg3 << 15 >> 7;
 				local351 = arg4 << 15 >> 7;
-				local392 = local307 * -Static268.anInt5793 + 16384 >> 15;
-				local398 = local329 * -Static268.anInt5791 + 16384 >> 15;
-				local404 = local351 * -Static268.anInt5792 + 16384 >> 15;
-				local410 = local392 + Static268.anInt5793;
-				local418 = local398 + Static268.anInt5791;
-				local426 = local404 + Static268.anInt5792;
+				local392 = local307 * -anInt5793 + 16384 >> 15;
+				local398 = local329 * -anInt5791 + 16384 >> 15;
+				local404 = local351 * -anInt5792 + 16384 >> 15;
+				local410 = local392 + anInt5793;
+				local418 = local398 + anInt5791;
+				local426 = local404 + anInt5792;
 				@Pc(1481) int[] local1481 = new int[] { local307 * arg7[0] + 16384 >> 15, local307 * arg7[3] + 16384 >> 15, local307 * arg7[6] + 16384 >> 15, local329 * arg7[1] + 16384 >> 15, local329 * arg7[4] + 16384 >> 15, local329 * arg7[7] + 16384 >> 15, local351 * arg7[2] + 16384 >> 15, local351 * arg7[5] + 16384 >> 15, local351 * arg7[8] + 16384 >> 15 };
 				local579 = local307 * local206 + 16384 >> 15;
 				local604 = local329 * local33 + 16384 >> 15;
@@ -2231,23 +2368,23 @@ public final class SoftwareModel extends Model {
 		@Pc(11) int local11;
 		if (arg0 == 0) {
 			local3 = 0;
-			Static268.anInt5793 = 0;
-			Static268.anInt5791 = 0;
-			Static268.anInt5792 = 0;
+			anInt5793 = 0;
+			anInt5791 = 0;
+			anInt5792 = 0;
 			for (local11 = 0; local11 < this.vertexCount; local11++) {
-				Static268.anInt5793 += this.anIntArray528[local11];
-				Static268.anInt5791 += this.anIntArray527[local11];
-				Static268.anInt5792 += this.anIntArray531[local11];
+				anInt5793 += this.anIntArray528[local11];
+				anInt5791 += this.anIntArray527[local11];
+				anInt5792 += this.anIntArray531[local11];
 				local3++;
 			}
 			if (local3 > 0) {
-				Static268.anInt5793 = Static268.anInt5793 / local3 + arg1;
-				Static268.anInt5791 = Static268.anInt5791 / local3 + arg2;
-				Static268.anInt5792 = Static268.anInt5792 / local3 + arg3;
+				anInt5793 = anInt5793 / local3 + arg1;
+				anInt5791 = anInt5791 / local3 + arg2;
+				anInt5792 = anInt5792 / local3 + arg3;
 			} else {
-				Static268.anInt5793 = arg1;
-				Static268.anInt5791 = arg2;
-				Static268.anInt5792 = arg3;
+				anInt5793 = arg1;
+				anInt5791 = arg2;
+				anInt5792 = arg3;
 			}
 		} else if (arg0 == 1) {
 			for (local3 = 0; local3 < this.vertexCount; local3++) {
@@ -2260,9 +2397,9 @@ public final class SoftwareModel extends Model {
 			@Pc(164) int local164;
 			if (arg0 == 2) {
 				for (local3 = 0; local3 < this.vertexCount; local3++) {
-					this.anIntArray528[local3] -= Static268.anInt5793;
-					this.anIntArray527[local3] -= Static268.anInt5791;
-					this.anIntArray531[local3] -= Static268.anInt5792;
+					this.anIntArray528[local3] -= anInt5793;
+					this.anIntArray527[local3] -= anInt5791;
+					this.anIntArray531[local3] -= anInt5792;
 					if (arg3 != 0) {
 						local11 = MathUtils.sin[arg3];
 						local146 = MathUtils.cos[arg3];
@@ -2284,21 +2421,21 @@ public final class SoftwareModel extends Model {
 						this.anIntArray531[local3] = this.anIntArray531[local3] * local146 + 32767 - this.anIntArray528[local3] * local11 >> 16;
 						this.anIntArray528[local3] = local164;
 					}
-					this.anIntArray528[local3] += Static268.anInt5793;
-					this.anIntArray527[local3] += Static268.anInt5791;
-					this.anIntArray531[local3] += Static268.anInt5792;
+					this.anIntArray528[local3] += anInt5793;
+					this.anIntArray527[local3] += anInt5791;
+					this.anIntArray531[local3] += anInt5792;
 				}
 			} else if (arg0 == 3) {
 				for (local3 = 0; local3 < this.vertexCount; local3++) {
-					this.anIntArray528[local3] -= Static268.anInt5793;
-					this.anIntArray527[local3] -= Static268.anInt5791;
-					this.anIntArray531[local3] -= Static268.anInt5792;
+					this.anIntArray528[local3] -= anInt5793;
+					this.anIntArray527[local3] -= anInt5791;
+					this.anIntArray531[local3] -= anInt5792;
 					this.anIntArray528[local3] = this.anIntArray528[local3] * arg1 / 128;
 					this.anIntArray527[local3] = this.anIntArray527[local3] * arg2 / 128;
 					this.anIntArray531[local3] = this.anIntArray531[local3] * arg3 / 128;
-					this.anIntArray528[local3] += Static268.anInt5793;
-					this.anIntArray527[local3] += Static268.anInt5791;
-					this.anIntArray531[local3] += Static268.anInt5792;
+					this.anIntArray528[local3] += anInt5793;
+					this.anIntArray527[local3] += anInt5791;
+					this.anIntArray531[local3] += anInt5792;
 				}
 			} else if (arg0 == 5) {
 				for (local3 = 0; local3 < this.anInt5787; local3++) {
@@ -2350,15 +2487,15 @@ public final class SoftwareModel extends Model {
 	@OriginalMember(owner = "client!w", name = "b", descriptor = "(ZZZ)Lclient!ak;")
 	@Override
 	public final Model method4568(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2) {
-		if (!arg0 && Static268.aByteArray78.length < this.anInt5787) {
-			Static268.aByteArray78 = new byte[this.anInt5787 + 100];
+		if (!arg0 && aByteArray78.length < this.anInt5787) {
+			aByteArray78 = new byte[this.anInt5787 + 100];
 		}
-		if (!arg1 && Static268.aShortArray95.length < this.anInt5787) {
-			Static268.anIntArray554 = new int[this.anInt5787 + 100];
-			Static268.anIntArray559 = new int[this.anInt5787 + 100];
-			Static268.anIntArray546 = new int[this.anInt5787 + 100];
-			Static268.aShortArray95 = new short[this.anInt5787 + 100];
+		if (!arg1 && aShortArray95.length < this.anInt5787) {
+			anIntArray554 = new int[this.anInt5787 + 100];
+			anIntArray559 = new int[this.anInt5787 + 100];
+			anIntArray546 = new int[this.anInt5787 + 100];
+			aShortArray95 = new short[this.anInt5787 + 100];
 		}
-		return this.method4584(arg0, arg1, Static268.aClass8_Sub1_Sub2_3, Static268.aByteArray78, Static268.aShortArray95, Static268.anIntArray554, Static268.anIntArray559, Static268.anIntArray546);
+		return this.method4584(arg0, arg1, aClass8_Sub1_Sub2_3, aByteArray78, aShortArray95, anIntArray554, anIntArray559, anIntArray546);
 	}
 }
diff --git a/client/src/main/java/rt4/SoftwareRaster.java b/client/src/main/java/rt4/SoftwareRaster.java
index d17cf5b..53ef1ab 100644
--- a/client/src/main/java/rt4/SoftwareRaster.java
+++ b/client/src/main/java/rt4/SoftwareRaster.java
@@ -156,7 +156,7 @@ public final class SoftwareRaster {
 		pixels = arg0;
 		width = arg1;
 		height = arg2;
-		method2496(0, 0, arg1, arg2);
+		setClip(0, 0, arg1, arg2);
 	}
 
 	@OriginalMember(owner = "client!kb", name = "b", descriptor = "()V")
@@ -278,7 +278,7 @@ public final class SoftwareRaster {
 	}
 
 	@OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIII)V")
-	public static void method2496(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+	public static void setClip(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (arg0 < 0) {
 			arg0 = 0;
 		}
diff --git a/client/src/main/java/rt4/SoftwareSprite.java b/client/src/main/java/rt4/SoftwareSprite.java
index aa9b154..ae6120b 100644
--- a/client/src/main/java/rt4/SoftwareSprite.java
+++ b/client/src/main/java/rt4/SoftwareSprite.java
@@ -201,7 +201,12 @@ public class SoftwareSprite extends Sprite {
 		}
 	}
 
-	@OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V")
+    @OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;")
+    public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
+        return SpriteLoader.decode(arg0, 0, arg1) ? Static102.method2071() : null;
+    }
+
+    @OriginalMember(owner = "client!mm", name = "d", descriptor = "(I)V")
 	public final void method298(@OriginalArg(0) int arg0) {
 		if (this.width == this.anInt1860 && this.height == this.anInt1866) {
 			return;
@@ -901,7 +906,7 @@ public class SoftwareSprite extends Sprite {
 
 	@OriginalMember(owner = "client!mm", name = "e", descriptor = "(II)V")
 	@Override
-	public void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+	public void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		arg0 += this.anInt1863;
 		arg1 += this.anInt1861;
 		@Pc(15) int local15 = arg0 + arg1 * SoftwareRaster.width;
@@ -955,7 +960,7 @@ public class SoftwareSprite extends Sprite {
 	}
 
 	@OriginalMember(owner = "client!mm", name = "a", descriptor = "(IIIIIIII[I[I)V")
-	public void drawMinimapRegion(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
+	public void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(7) int zoom, @OriginalArg(8) int[] lineStarts, @OriginalArg(9) int[] arg9) {
 		try {
 			@Pc(4) int centerX = -w / 2;
 			@Pc(9) int centerY = -h / 2;
@@ -1113,7 +1118,7 @@ public class SoftwareSprite extends Sprite {
 	}
 
 	@OriginalMember(owner = "client!mm", name = "b", descriptor = "(IIIIIIII[I[I)V")
-	public void drawCompass(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
+	public void renderRotatedTransparent(@OriginalArg(0) int x, @OriginalArg(1) int y, @OriginalArg(2) int w, @OriginalArg(3) int h, @OriginalArg(4) int anchorX, @OriginalArg(5) int anchorY, @OriginalArg(6) int theta, @OriginalArg(8) int[] lineStart, @OriginalArg(9) int[] lineWidth) {
 		try {
 			@Pc(4) int centerX = -w / 2;
 			@Pc(9) int centerY = -h / 2;
diff --git a/client/src/main/java/rt4/SoundBank.java b/client/src/main/java/rt4/SoundBank.java
index 48b2465..31de9f2 100644
--- a/client/src/main/java/rt4/SoundBank.java
+++ b/client/src/main/java/rt4/SoundBank.java
@@ -72,7 +72,7 @@ public final class SoundBank {
 		} else if (arg1 == null || arg1[0] > 0) {
 			@Pc(53) VorbisSound local53 = (VorbisSound) this.aClass133_11.get(local26);
 			if (local53 == null) {
-				local53 = Static117.method2345(this.aClass153_53, arg0, arg2);
+				local53 = VorbisSound.method2345(this.aClass153_53, arg0, arg2);
 				if (local53 == null) {
 					return null;
 				}
diff --git a/client/src/main/java/rt4/Sprite.java b/client/src/main/java/rt4/Sprite.java
index 38efcb6..40bc728 100644
--- a/client/src/main/java/rt4/Sprite.java
+++ b/client/src/main/java/rt4/Sprite.java
@@ -58,5 +58,5 @@ public abstract class Sprite extends SecondaryNode {
 	public abstract void method1422(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4);
 
 	@OriginalMember(owner = "client!qf", name = "e", descriptor = "(II)V")
-	public abstract void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
+	public abstract void renderTransparent(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1);
 }
diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java
index 4b42f5e..a4c0247 100644
--- a/client/src/main/java/rt4/Static1.java
+++ b/client/src/main/java/rt4/Static1.java
@@ -18,10 +18,7 @@ public final class Static1 {
 	@OriginalMember(owner = "client!a", name = "i", descriptor = "I")
 	public static int anInt6 = 0;
 
-	@OriginalMember(owner = "client!a", name = "j", descriptor = "Lclient!na;")
-	public static final JagString aClass100_2 = JagString.parse("<col=ffffff> )4 ");
-
-	@OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
+    @OriginalMember(owner = "client!a", name = "a", descriptor = "([[F[[F[[II[[F[[B[[II[[B[[B[[B[[[B)[Lclient!hg;")
 	public static GlTile[] method2(@OriginalArg(0) float[][] arg0, @OriginalArg(1) float[][] arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) byte[][] arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(8) byte[][] arg7, @OriginalArg(9) byte[][] arg8, @OriginalArg(10) byte[][] arg9, @OriginalArg(11) byte[][][] arg10) {
 		@Pc(10) HashTable local10 = new HashTable(128);
 		@Pc(12) int local12;
@@ -530,10 +527,10 @@ public final class Static1 {
 	@OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V")
 	public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg0, arg3, arg2 + arg0, arg1 + arg3);
+			GlRaster.setClip(arg0, arg3, arg2 + arg0, arg1 + arg3);
 			GlRaster.method1186(arg0, arg3, arg2, arg1, 0);
 		} else {
-			SoftwareRaster.method2496(arg0, arg3, arg2 + arg0, arg3 + arg1);
+			SoftwareRaster.setClip(arg0, arg3, arg2 + arg0, arg3 + arg1);
 			SoftwareRaster.fillRect(arg0, arg3, arg2, arg1, 0);
 		}
 		if (WorldMap.loadPercentage < 100) {
diff --git a/client/src/main/java/rt4/Static10.java b/client/src/main/java/rt4/Static10.java
index 0501bf6..0a2b0f7 100644
--- a/client/src/main/java/rt4/Static10.java
+++ b/client/src/main/java/rt4/Static10.java
@@ -9,19 +9,6 @@ public final class Static10 {
 	@OriginalMember(owner = "client!an", name = "db", descriptor = "S")
 	public static short aShort9 = 205;
 
-	@OriginalMember(owner = "client!an", name = "a", descriptor = "([BIII)Lclient!na;")
-	public static JagString decodeString(@OriginalArg(0) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(7) JagString local7 = new JagString();
-		local7.chars = new byte[arg1];
-		local7.length = 0;
-		for (@Pc(22) int local22 = arg2; local22 < arg1 + arg2; local22++) {
-			if (arg0[local22] != 0) {
-				local7.chars[local7.length++] = arg0[local22];
-			}
-		}
-		return local7;
-	}
-
 	@OriginalMember(owner = "client!an", name = "c", descriptor = "(III)V")
 	public static void method348(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		if (Static189.anInt4457 != arg1) {
diff --git a/client/src/main/java/rt4/Static102.java b/client/src/main/java/rt4/Static102.java
index 90ba158..5933229 100644
--- a/client/src/main/java/rt4/Static102.java
+++ b/client/src/main/java/rt4/Static102.java
@@ -38,7 +38,7 @@ public final class Static102 {
 
 	@OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V")
 	public static void method2073() {
-		Static20.objectContainerCache = new HashTable(32);
+		Inv.objectContainerCache = new HashTable(32);
 	}
 
 }
diff --git a/client/src/main/java/rt4/Static105.java b/client/src/main/java/rt4/Static105.java
index b6f6456..6f9d2b1 100644
--- a/client/src/main/java/rt4/Static105.java
+++ b/client/src/main/java/rt4/Static105.java
@@ -15,30 +15,12 @@ public final class Static105 {
 	@OriginalMember(owner = "client!ib", name = "e", descriptor = "Lclient!be;")
 	public static Component aClass13_14 = null;
 
-	@OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;")
-	public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");
-
-	@OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;")
 	public static final JagString aClass100_561 = JagString.parse(" )2> <col=ffffff>");
 
 	@OriginalMember(owner = "client!ib", name = "l", descriptor = "I")
 	public static int anInt2863 = 0;
 
-	@OriginalMember(owner = "client!ib", name = "b", descriptor = "(I)V")
-	public static void method2255() {
-		Static251.anIntArray479 = null;
-		Static60.anIntArrayArrayArray6 = null;
-		Static128.anIntArray293 = null;
-		SceneGraph.tileShapes = null;
-		SceneGraph.tileAngles = null;
-		Static118.aByteArrayArrayArray9 = null;
-		SceneGraph.tileOverlays = null;
-		SceneGraph.tileUnderlays = null;
-		Static139.anIntArray325 = null;
-		Static221.anIntArray376 = null;
-		Static279.anIntArray568 = null;
-	}
-
 	@OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z")
 	public static boolean method2256(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) {
 		@Pc(6) boolean local6 = SceneGraph.tileHeights == Static80.underWaterTileHeightMap;
@@ -46,17 +28,17 @@ public final class Static105 {
 		@Pc(17) int local17;
 		for (@Pc(10) int local10 = arg1; local10 < arg1 + arg3; local10++) {
 			for (local17 = arg2; local17 < arg2 + arg4; local17++) {
-				if (local10 < 0 || local17 < 0 || local10 >= Static152.mapSizeX || local17 >= Static99.mapSizeZ) {
+				if (local10 < 0 || local17 < 0 || local10 >= SceneGraph.mapSizeX || local17 >= SceneGraph.mapSizeZ) {
 					return false;
 				}
 				@Pc(42) Tile local42 = SceneGraph.tiles[arg0][local10][local17];
-				if (local42 != null && local42.anInt662 >= 5) {
+				if (local42 != null && local42.sceneryLen >= 5) {
 					return false;
 				}
 			}
 		}
 		@Pc(58) Scenery local58 = new Scenery();
-		local58.aLong56 = arg11;
+		local58.key = arg11;
 		local58.anInt1709 = arg0;
 		local58.anInt1699 = arg5;
 		local58.anInt1703 = arg6;
@@ -89,10 +71,10 @@ public final class Static105 {
 					}
 				}
 				@Pc(174) Tile local174 = SceneGraph.tiles[arg0][local17][local108];
-				local174.aClass31Array1[local174.anInt662] = local58;
-				local174.anIntArray59[local174.anInt662] = local115;
+				local174.scenery[local174.sceneryLen] = local58;
+				local174.anIntArray59[local174.sceneryLen] = local115;
 				local174.anInt664 |= local115;
-				local174.anInt662++;
+				local174.sceneryLen++;
 				if (local6 && Static62.anIntArrayArray11[local17][local108] != 0) {
 					local8 = Static62.anIntArrayArray11[local17][local108];
 				}
@@ -108,7 +90,7 @@ public final class Static105 {
 			}
 		}
 		if (arg10) {
-			Static243.aClass31Array3[Static22.anInt726++] = local58;
+			SceneGraph.aClass31Array3[SceneGraph.anInt726++] = local58;
 		}
 		return true;
 	}
diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java
index d0c3048..02a1b23 100644
--- a/client/src/main/java/rt4/Static107.java
+++ b/client/src/main/java/rt4/Static107.java
@@ -10,9 +10,6 @@ public final class Static107 {
 	@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
 	public static int anInt2875 = -1;
 
-	@OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;")
-	public static final JagString FPSON = JagString.parse("::fpson");
-
 	@OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I")
 	public static final int[][][] anIntArrayArrayArray9 = new int[2][][];
 
diff --git a/client/src/main/java/rt4/Static108.java b/client/src/main/java/rt4/Static108.java
deleted file mode 100644
index eeec46c..0000000
--- a/client/src/main/java/rt4/Static108.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static108 {
-
-	@OriginalMember(owner = "client!ie", name = "b", descriptor = "[Z")
-	public static boolean[] aBooleanArray60;
-
-	@OriginalMember(owner = "client!ie", name = "h", descriptor = "[I")
-	public static int[] anIntArray264;
-
-	@OriginalMember(owner = "client!ie", name = "j", descriptor = "[I")
-	public static int[] anIntArray266;
-
-	@OriginalMember(owner = "client!ie", name = "k", descriptor = "[I")
-	public static final int[] anIntArray267 = new int[] { 256, 128, 86, 64 };
-
-	@OriginalMember(owner = "client!ie", name = "a", descriptor = "([II)I")
-	public static int method2268(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
-		@Pc(3) int local3 = arg0[arg1];
-		@Pc(5) int local5 = -1;
-		@Pc(7) int local7 = Integer.MIN_VALUE;
-		for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
-			@Pc(16) int local16 = arg0[local9];
-			if (local16 < local3 && local16 > local7) {
-				local5 = local9;
-				local7 = local16;
-			}
-		}
-		return local5;
-	}
-
-	@OriginalMember(owner = "client!ie", name = "b", descriptor = "([II)I")
-	public static int method2270(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
-		@Pc(3) int local3 = arg0[arg1];
-		@Pc(5) int local5 = -1;
-		@Pc(7) int local7 = Integer.MAX_VALUE;
-		for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
-			@Pc(16) int local16 = arg0[local9];
-			if (local16 > local3 && local16 < local7) {
-				local5 = local9;
-				local7 = local16;
-			}
-		}
-		return local5;
-	}
-}
diff --git a/client/src/main/java/rt4/Static109.java b/client/src/main/java/rt4/Static109.java
index cfe6a96..14ccc10 100644
--- a/client/src/main/java/rt4/Static109.java
+++ b/client/src/main/java/rt4/Static109.java
@@ -19,8 +19,8 @@ public final class Static109 {
 
 	@OriginalMember(owner = "client!ig", name = "a", descriptor = "(I)V")
 	public static void method2274() {
-		for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) {
-			@Pc(18) int local18 = Static33.anIntArray79[local7];
+		for (@Pc(7) int local7 = 0; local7 < NpcList.size; local7++) {
+			@Pc(18) int local18 = NpcList.ids[local7];
 			@Pc(22) Npc local22 = NpcList.npcs[local18];
 			if (local22 != null) {
 				Static263.method4514(local22.type.size, local22);
diff --git a/client/src/main/java/rt4/Static110.java b/client/src/main/java/rt4/Static110.java
index 831b59d..b984fed 100644
--- a/client/src/main/java/rt4/Static110.java
+++ b/client/src/main/java/rt4/Static110.java
@@ -12,6 +12,6 @@ public final class Static110 {
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZII)Lclient!na;")
 	public static JagString method2285(@OriginalArg(2) int arg0) {
-		return Static198.method1025(true, arg0);
+		return JagString.parseInt(true, arg0);
 	}
 }
diff --git a/client/src/main/java/rt4/Static111.java b/client/src/main/java/rt4/Static111.java
index c04d7ab..35ed7aa 100644
--- a/client/src/main/java/rt4/Static111.java
+++ b/client/src/main/java/rt4/Static111.java
@@ -5,15 +5,9 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static111 {
 
-	@OriginalMember(owner = "client!ii", name = "a", descriptor = "I")
-	public static int cameraZ;
-
 	@OriginalMember(owner = "client!ii", name = "y", descriptor = "I")
 	public static int anInt2910;
 
-    @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
-	public static final JagString aClass100_570 = JagString.parse(")2");
-
 	@OriginalMember(owner = "client!ii", name = "a", descriptor = "(Lclient!be;III)V")
 	public static void method2291(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
 		if (arg0.xMode == 0) {
diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java
index ea541b4..7a1289e 100644
--- a/client/src/main/java/rt4/Static112.java
+++ b/client/src/main/java/rt4/Static112.java
@@ -16,8 +16,8 @@ public final class Static112 {
 		@Pc(13) int local13 = Static24.anInt761;
 		if (Static39.aClass3_Sub2_Sub1_1 == null || Static181.aClass3_Sub2_Sub1_9 == null) {
 			if (client.js5Archive8.isFileReady(Static55.anInt1736) && client.js5Archive8.isFileReady(Static169.anInt4073)) {
-				Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736);
-				Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073);
+				Static39.aClass3_Sub2_Sub1_1 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static55.anInt1736);
+				Static181.aClass3_Sub2_Sub1_9 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static169.anInt4073);
 				if (GlRenderer.enabled) {
 					if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) {
 						Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1);
@@ -41,9 +41,9 @@ public final class Static112 {
 		if (Static39.aClass3_Sub2_Sub1_1 != null && Static181.aClass3_Sub2_Sub1_9 != null) {
 			local112 = local13 / Static39.aClass3_Sub2_Sub1_1.width;
 			for (local114 = 0; local114 < local112; local114++) {
-				Static39.aClass3_Sub2_Sub1_1.method1423(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9);
+				Static39.aClass3_Sub2_Sub1_1.renderTransparent(local114 * Static39.aClass3_Sub2_Sub1_1.width + local3, local9);
 			}
-			Static181.aClass3_Sub2_Sub1_9.method1423(local3, local9);
+			Static181.aClass3_Sub2_Sub1_9.renderTransparent(local3, local9);
 			Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.width, local9);
 		}
 		Fonts.b12Full.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1);
@@ -67,9 +67,9 @@ public final class Static112 {
 			}
 		}
 		if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && client.js5Archive8.isFileReady(Static85.anInt2261) && client.js5Archive8.isFileReady(Static136.anInt3324) && client.js5Archive8.isFileReady(Static254.anInt5556)) {
-			Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261);
-			Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324);
-			Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556);
+			Static165.aClass3_Sub2_Sub1_8 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static85.anInt2261);
+			Static92.aClass3_Sub2_Sub1_6 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static136.anInt3324);
+			Static204.aClass3_Sub2_Sub1_10 = SoftwareSprite.loadSoftwareAlphaSprite(client.js5Archive8, Static254.anInt5556);
 			if (GlRenderer.enabled) {
 				if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) {
 					Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8);
@@ -92,14 +92,14 @@ public final class Static112 {
 		if (Static165.aClass3_Sub2_Sub1_8 != null && Static92.aClass3_Sub2_Sub1_6 != null && Static204.aClass3_Sub2_Sub1_10 != null) {
 			local203 = local13 / Static165.aClass3_Sub2_Sub1_8.width;
 			for (local219 = 0; local219 < local203; local219++) {
-				Static165.aClass3_Sub2_Sub1_8.method1423(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
+				Static165.aClass3_Sub2_Sub1_8.renderTransparent(local3 + Static165.aClass3_Sub2_Sub1_8.width * local219, local11 + local9 + -Static165.aClass3_Sub2_Sub1_8.height);
 			}
 			local219 = (local11 - 20) / Static92.aClass3_Sub2_Sub1_6.height;
 			for (local418 = 0; local418 < local219; local418++) {
-				Static92.aClass3_Sub2_Sub1_6.method1423(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20);
+				Static92.aClass3_Sub2_Sub1_6.renderTransparent(local3, local9 + local418 * Static92.aClass3_Sub2_Sub1_6.height + 20);
 				Static92.aClass3_Sub2_Sub1_6.method1421(local3 + local13 - Static92.aClass3_Sub2_Sub1_6.width, local9 + 20 + local418 * Static92.aClass3_Sub2_Sub1_6.height);
 			}
-			Static204.aClass3_Sub2_Sub1_10.method1423(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
+			Static204.aClass3_Sub2_Sub1_10.renderTransparent(local3, local11 + local9 - Static204.aClass3_Sub2_Sub1_10.height);
 			Static204.aClass3_Sub2_Sub1_10.method1421(local3 + local13 - Static204.aClass3_Sub2_Sub1_10.width, local9 - -local11 + -Static204.aClass3_Sub2_Sub1_10.height);
 		}
 		for (local203 = 0; local203 < MiniMenu.size; local203++) {
diff --git a/client/src/main/java/rt4/Static113.java b/client/src/main/java/rt4/Static113.java
index 3fb2883..c4aa993 100644
--- a/client/src/main/java/rt4/Static113.java
+++ b/client/src/main/java/rt4/Static113.java
@@ -9,16 +9,6 @@ public final class Static113 {
 	@OriginalMember(owner = "client!il", name = "O", descriptor = "I")
 	public static int anInt4612;
 
-    @OriginalMember(owner = "client!il", name = "a", descriptor = "(III)V")
-	public static void method3556(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		Static158.aBoolean187 = true;
-		Static160.anInt3902 = arg0;
-		Static89.anInt2388 = arg1;
-		Static131.anInt3259 = arg2;
-		Static56.anInt1742 = -1;
-		Static116.anInt2954 = -1;
-	}
-
 	@OriginalMember(owner = "client!il", name = "a", descriptor = "(BII)Z")
 	public static boolean method3557(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 11) {
diff --git a/client/src/main/java/rt4/Static114.java b/client/src/main/java/rt4/Static114.java
index 675d0a6..e5dc8da 100644
--- a/client/src/main/java/rt4/Static114.java
+++ b/client/src/main/java/rt4/Static114.java
@@ -10,10 +10,7 @@ public final class Static114 {
 	@OriginalMember(owner = "client!j", name = "K", descriptor = "I")
 	public static int anInt5843 = 0;
 
-	@OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;")
-	public static final JagString REPLACECANVAS = JagString.parse("::replacecanvas");
-
-	@OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
+    @OriginalMember(owner = "client!j", name = "O", descriptor = "[I")
 	public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 };
 
 	@OriginalMember(owner = "client!j", name = "c", descriptor = "(I)V")
diff --git a/client/src/main/java/rt4/Static115.java b/client/src/main/java/rt4/Static115.java
index fedf701..10cb95b 100644
--- a/client/src/main/java/rt4/Static115.java
+++ b/client/src/main/java/rt4/Static115.java
@@ -38,12 +38,12 @@ public final class Static115 {
     @OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIB)V")
 	public static void method2310(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		if (Cross.type == 1) {
-			Sprites.crosses[Cross.milliseconds / 100].method1423(Cross.x - 8, Cross.y + -8);
+			Sprites.crosses[Cross.milliseconds / 100].renderTransparent(Cross.x - 8, Cross.y + -8);
 		}
 		if (Cross.type == 2) {
-			Sprites.crosses[Cross.milliseconds / 100 + 4].method1423(Cross.x - 8, Cross.y + -8);
+			Sprites.crosses[Cross.milliseconds / 100 + 4].renderTransparent(Cross.x - 8, Cross.y + -8);
 		}
-		Static256.method4392();
+		Player.setTutorialIsland();
 	}
 
 	@OriginalMember(owner = "client!ja", name = "a", descriptor = "(IIIIIZ)V")
diff --git a/client/src/main/java/rt4/Static116.java b/client/src/main/java/rt4/Static116.java
index 3fd8768..aa8b357 100644
--- a/client/src/main/java/rt4/Static116.java
+++ b/client/src/main/java/rt4/Static116.java
@@ -6,15 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static116 {
 
-	@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
-	public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
-
-    @OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
+	@OriginalMember(owner = "client!jb", name = "n", descriptor = "I")
 	public static int anInt2952 = 0;
 
-	@OriginalMember(owner = "client!jb", name = "p", descriptor = "I")
-	public static int anInt2954 = -1;
-
     @OriginalMember(owner = "client!jb", name = "a", descriptor = "(ILclient!ve;I)Lclient!jk;")
 	public static MidiInstrument method2320(@OriginalArg(1) Js5 arg0, @OriginalArg(2) int arg1) {
 		@Pc(9) byte[] local9 = arg0.method4500(arg1);
diff --git a/client/src/main/java/rt4/Static117.java b/client/src/main/java/rt4/Static117.java
deleted file mode 100644
index d79e1c9..0000000
--- a/client/src/main/java/rt4/Static117.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static117 {
-
-	@OriginalMember(owner = "client!jc", name = "p", descriptor = "[F")
-	public static float[] aFloatArray9;
-
-	@OriginalMember(owner = "client!jc", name = "q", descriptor = "[F")
-	public static float[] aFloatArray10;
-
-	@OriginalMember(owner = "client!jc", name = "t", descriptor = "[I")
-	public static int[] anIntArray276;
-
-	@OriginalMember(owner = "client!jc", name = "u", descriptor = "[Lclient!vb;")
-	public static VorbisResidue[] aClass152Array1;
-
-	@OriginalMember(owner = "client!jc", name = "v", descriptor = "[Z")
-	public static boolean[] aBooleanArray63;
-
-	@OriginalMember(owner = "client!jc", name = "y", descriptor = "I")
-	public static int anInt2975;
-
-	@OriginalMember(owner = "client!jc", name = "A", descriptor = "[Lclient!uk;")
-	public static VorbisMapping[] aClass151Array1;
-
-	@OriginalMember(owner = "client!jc", name = "B", descriptor = "[F")
-	public static float[] aFloatArray12;
-
-	@OriginalMember(owner = "client!jc", name = "C", descriptor = "[F")
-	public static float[] aFloatArray13;
-
-	@OriginalMember(owner = "client!jc", name = "E", descriptor = "I")
-	public static int anInt2978;
-
-	@OriginalMember(owner = "client!jc", name = "F", descriptor = "[F")
-	public static float[] aFloatArray14;
-
-	@OriginalMember(owner = "client!jc", name = "G", descriptor = "I")
-	private static int anInt2979;
-
-	@OriginalMember(owner = "client!jc", name = "I", descriptor = "[Lclient!ji;")
-	public static VorbisCodebook[] aClass78Array1;
-
-	@OriginalMember(owner = "client!jc", name = "J", descriptor = "[Lclient!ie;")
-	public static VorbisRange[] aClass67Array1;
-
-	@OriginalMember(owner = "client!jc", name = "L", descriptor = "[I")
-	public static int[] anIntArray277;
-
-	@OriginalMember(owner = "client!jc", name = "P", descriptor = "[F")
-	public static float[] aFloatArray15;
-
-	@OriginalMember(owner = "client!jc", name = "Q", descriptor = "I")
-	private static int anInt2982;
-
-	@OriginalMember(owner = "client!jc", name = "S", descriptor = "[F")
-	public static float[] aFloatArray16;
-
-	@OriginalMember(owner = "client!jc", name = "T", descriptor = "[B")
-	private static byte[] aByteArray42;
-
-	@OriginalMember(owner = "client!jc", name = "W", descriptor = "[I")
-	public static int[] anIntArray278;
-
-	@OriginalMember(owner = "client!jc", name = "H", descriptor = "Z")
-	private static boolean aBoolean149 = false;
-
-	@OriginalMember(owner = "client!jc", name = "c", descriptor = "(I)F")
-	public static float method2340(@OriginalArg(0) int arg0) {
-		@Pc(3) int local3 = arg0 & 0x1FFFFF;
-		@Pc(7) int local7 = arg0 & Integer.MIN_VALUE;
-		@Pc(13) int local13 = arg0 >> 21 & 0x3FF;
-		if (local7 != 0) {
-			local3 = -local3;
-		}
-		return (float) ((double) local3 * Math.pow(2.0D, (double) (local13 - 788)));
-	}
-
-	@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;)Z")
-	private static boolean method2344(@OriginalArg(0) Js5 arg0) {
-		if (!aBoolean149) {
-			@Pc(7) byte[] local7 = arg0.getFile(0, 0);
-			if (local7 == null) {
-				return false;
-			}
-			method2349(local7);
-			aBoolean149 = true;
-		}
-		return true;
-	}
-
-	@OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;II)Lclient!jc;")
-	public static VorbisSound method2345(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		if (method2344(arg0)) {
-			@Pc(16) byte[] local16 = arg0.getFile(arg1, arg2);
-			return local16 == null ? null : new VorbisSound(local16);
-		} else {
-			arg0.isFileReady(arg2, arg1);
-			return null;
-		}
-	}
-
-	@OriginalMember(owner = "client!jc", name = "b", descriptor = "()I")
-	public static int method2346() {
-		@Pc(7) int local7 = aByteArray42[anInt2979] >> anInt2982 & 0x1;
-		anInt2982++;
-		anInt2979 += anInt2982 >> 3;
-		anInt2982 &= 0x7;
-		return local7;
-	}
-
-	@OriginalMember(owner = "client!jc", name = "a", descriptor = "([BI)V")
-	public static void method2347(@OriginalArg(0) byte[] arg0) {
-		aByteArray42 = arg0;
-		anInt2979 = 0;
-		anInt2982 = 0;
-	}
-
-	@OriginalMember(owner = "client!jc", name = "b", descriptor = "([B)V")
-	private static void method2349(@OriginalArg(0) byte[] arg0) {
-		method2347(arg0);
-		anInt2978 = 0x1 << method2350(4);
-		anInt2975 = 0x1 << method2350(4);
-		aFloatArray14 = new float[anInt2975];
-		@Pc(17) int local17;
-		@Pc(26) int local26;
-		@Pc(30) int local30;
-		@Pc(34) int local34;
-		@Pc(38) int local38;
-		for (local17 = 0; local17 < 2; local17++) {
-			local26 = local17 == 0 ? anInt2978 : anInt2975;
-			local30 = local26 >> 1;
-			local34 = local26 >> 2;
-			local38 = local26 >> 3;
-			@Pc(41) float[] local41 = new float[local30];
-			for (@Pc(43) int local43 = 0; local43 < local34; local43++) {
-				local41[local43 * 2] = (float) Math.cos((double) (local43 * 4) * 3.141592653589793D / (double) local26);
-				local41[local43 * 2 + 1] = -((float) Math.sin((double) (local43 * 4) * 3.141592653589793D / (double) local26));
-			}
-			@Pc(86) float[] local86 = new float[local30];
-			for (@Pc(88) int local88 = 0; local88 < local34; local88++) {
-				local86[local88 * 2] = (float) Math.cos((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
-				local86[local88 * 2 + 1] = (float) Math.sin((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
-			}
-			@Pc(138) float[] local138 = new float[local34];
-			for (@Pc(140) int local140 = 0; local140 < local38; local140++) {
-				local138[local140 * 2] = (float) Math.cos((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26);
-				local138[local140 * 2 + 1] = -((float) Math.sin((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26));
-			}
-			@Pc(187) int[] local187 = new int[local38];
-			@Pc(193) int local193 = Static204.method3674(local38 - 1);
-			for (@Pc(195) int local195 = 0; local195 < local38; local195++) {
-				local187[local195] = Static24.method667(local193, local195);
-			}
-			if (local17 == 0) {
-				aFloatArray13 = local41;
-				aFloatArray15 = local86;
-				aFloatArray16 = local138;
-				anIntArray276 = local187;
-			} else {
-				aFloatArray12 = local41;
-				aFloatArray9 = local86;
-				aFloatArray10 = local138;
-				anIntArray277 = local187;
-			}
-		}
-		local17 = method2350(8) + 1;
-		aClass78Array1 = new VorbisCodebook[local17];
-		for (local26 = 0; local26 < local17; local26++) {
-			aClass78Array1[local26] = new VorbisCodebook();
-		}
-		local26 = method2350(6) + 1;
-		for (local30 = 0; local30 < local26; local30++) {
-			method2350(16);
-		}
-		local26 = method2350(6) + 1;
-		aClass67Array1 = new VorbisRange[local26];
-		for (local30 = 0; local30 < local26; local30++) {
-			aClass67Array1[local30] = new VorbisRange();
-		}
-		local30 = method2350(6) + 1;
-		aClass152Array1 = new VorbisResidue[local30];
-		for (local34 = 0; local34 < local30; local34++) {
-			aClass152Array1[local34] = new VorbisResidue();
-		}
-		local34 = method2350(6) + 1;
-		aClass151Array1 = new VorbisMapping[local34];
-		for (local38 = 0; local38 < local34; local38++) {
-			aClass151Array1[local38] = new VorbisMapping();
-		}
-		local38 = method2350(6) + 1;
-		aBooleanArray63 = new boolean[local38];
-		anIntArray278 = new int[local38];
-		for (@Pc(340) int local340 = 0; local340 < local38; local340++) {
-			aBooleanArray63[local340] = method2346() != 0;
-			method2350(16);
-			method2350(16);
-			anIntArray278[local340] = method2350(8);
-		}
-	}
-
-	@OriginalMember(owner = "client!jc", name = "e", descriptor = "(I)I")
-	public static int method2350(@OriginalArg(0) int arg0) {
-		@Pc(1) int local1 = 0;
-		@Pc(3) int local3 = 0;
-		@Pc(12) int local12;
-		while (arg0 >= 8 - anInt2982) {
-			local12 = 8 - anInt2982;
-			@Pc(18) int local18 = (0x1 << local12) - 1;
-			local1 += (aByteArray42[anInt2979] >> anInt2982 & local18) << local3;
-			anInt2982 = 0;
-			anInt2979++;
-			local3 += local12;
-			arg0 -= local12;
-		}
-		if (arg0 > 0) {
-			local12 = (0x1 << arg0) - 1;
-			local1 += (aByteArray42[anInt2979] >> anInt2982 & local12) << local3;
-			anInt2982 += arg0;
-		}
-		return local1;
-	}
-}
diff --git a/client/src/main/java/rt4/Static118.java b/client/src/main/java/rt4/Static118.java
index 3cb307f..88c386a 100644
--- a/client/src/main/java/rt4/Static118.java
+++ b/client/src/main/java/rt4/Static118.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static118 {
 
-	@OriginalMember(owner = "client!jd", name = "d", descriptor = "[[[B")
-	public static byte[][][] aByteArrayArrayArray9;
-
-	@OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
+    @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;")
 	public static Component aClass13_15;
 
     @OriginalMember(owner = "client!jd", name = "a", descriptor = "(B)I")
@@ -18,12 +15,6 @@ public final class Static118 {
 		return Static119.method2385();
 	}
 
-	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
-	public static void method2353(@OriginalArg(0) int arg0) {
-		@Pc(12) DelayedStateChange local12 = DelayedStateChange.create(12, arg0);
-		local12.pushClient();
-	}
-
 	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
 	public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) {
 		for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) {
diff --git a/client/src/main/java/rt4/Static119.java b/client/src/main/java/rt4/Static119.java
index aab7d7b..a8eff14 100644
--- a/client/src/main/java/rt4/Static119.java
+++ b/client/src/main/java/rt4/Static119.java
@@ -7,13 +7,7 @@ public final class Static119 {
 	@OriginalMember(owner = "client!je", name = "eb", descriptor = "[I")
 	public static int[] anIntArray282;
 
-	@OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;")
-	public static final JagString aClass100_588 = JagString.parse("showingVideoAd");
-
-	@OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
-	public static final JagString aClass100_589 = JagString.parse(" <col=ffffff>");
-
-    @OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
+	@OriginalMember(owner = "client!je", name = "j", descriptor = "(I)I")
 	public static int method2385() {
 		if (WorldMap.labels == null) {
 			return -1;
diff --git a/client/src/main/java/rt4/Static12.java b/client/src/main/java/rt4/Static12.java
index e830320..98655ec 100644
--- a/client/src/main/java/rt4/Static12.java
+++ b/client/src/main/java/rt4/Static12.java
@@ -1,7 +1,6 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static12 {
 
@@ -11,42 +10,4 @@ public final class Static12 {
 	@OriginalMember(owner = "client!bb", name = "t", descriptor = "[[B")
 	public static final byte[][] aByteArrayArray2 = new byte[250][];
 
-	@OriginalMember(owner = "client!bb", name = "A", descriptor = "Lclient!na;")
-	public static final JagString aClass100_74 = JagString.parse("::");
-
-	@OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V")
-	public static void method447() {
-		if (WorldMap.zoom < WorldMap.targetZoom) {
-			WorldMap.zoom = (float) ((double) WorldMap.zoom + (double) WorldMap.zoom / 30.0D);
-			if (WorldMap.targetZoom < WorldMap.zoom) {
-				WorldMap.zoom = WorldMap.targetZoom;
-			}
-			WorldMap.method965();
-		} else if (WorldMap.targetZoom < WorldMap.zoom) {
-			WorldMap.zoom = (float) ((double) WorldMap.zoom - (double) WorldMap.zoom / 30.0D);
-			if (WorldMap.targetZoom > WorldMap.zoom) {
-				WorldMap.zoom = WorldMap.targetZoom;
-			}
-			WorldMap.method965();
-		}
-		if (WorldMap.anInt3482 == -1 || WorldMap.anInt4901 == -1) {
-			return;
-		}
-		@Pc(60) int local60 = WorldMap.anInt3482 - WorldMap.anInt435;
-		if (local60 < 2 || local60 > 2) {
-			local60 >>= 0x4;
-		}
-		@Pc(78) int local78 = WorldMap.anInt4901 - WorldMap.anInt919;
-		if (local78 < 2 || local78 > 2) {
-			local78 >>= 0x4;
-		}
-		WorldMap.anInt919 -= -local78;
-		WorldMap.anInt435 += local60;
-		if (local60 == 0 && local78 == 0) {
-			WorldMap.anInt3482 = -1;
-			WorldMap.anInt4901 = -1;
-		}
-		WorldMap.method965();
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static120.java b/client/src/main/java/rt4/Static120.java
deleted file mode 100644
index c2cb539..0000000
--- a/client/src/main/java/rt4/Static120.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package rt4;
-
-import com.jogamp.opengl.*;
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static120 {
-
-	@OriginalMember(owner = "client!jf", name = "c", descriptor = "[I")
-	private static int[] anIntArray283;
-
-	@OriginalMember(owner = "client!jf", name = "d", descriptor = "I")
-	private static int anInt3029;
-
-	@OriginalMember(owner = "client!jf", name = "e", descriptor = "I")
-	private static int anInt3030;
-
-	@OriginalMember(owner = "client!jf", name = "f", descriptor = "[Z")
-	private static boolean[] aBooleanArray65;
-
-	@OriginalMember(owner = "client!jf", name = "g", descriptor = "[[[I")
-	private static int[][][] anIntArrayArrayArray11;
-
-	@OriginalMember(owner = "client!jf", name = "h", descriptor = "[I")
-	private static int[] anIntArray284;
-
-	@OriginalMember(owner = "client!jf", name = "i", descriptor = "I")
-	private static int anInt3031;
-
-	@OriginalMember(owner = "client!jf", name = "j", descriptor = "I")
-	private static int anInt3032;
-
-	@OriginalMember(owner = "client!jf", name = "k", descriptor = "I")
-	private static int anInt3033;
-
-	@OriginalMember(owner = "client!jf", name = "m", descriptor = "[Z")
-	private static boolean[] aBooleanArray66;
-
-	@OriginalMember(owner = "client!jf", name = "n", descriptor = "I")
-	private static int anInt3035;
-
-	@OriginalMember(owner = "client!jf", name = "o", descriptor = "I")
-	private static int anInt3036;
-
-	@OriginalMember(owner = "client!jf", name = "p", descriptor = "I")
-	private static int anInt3037;
-
-	@OriginalMember(owner = "client!jf", name = "b", descriptor = "[F")
-	private static final float[] aFloatArray17 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F };
-
-    @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V")
-	public static void method2388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
-		if (!Preferences.highDetailLighting) {
-			return;
-		}
-		if (arg0 == 1 && arg5 > 0) {
-			method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6);
-		} else if (arg0 == 4 && arg5 < anInt3037 - 1) {
-			method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6);
-		} else if (arg0 == 8 && arg6 > 0) {
-			method2393(arg1, arg2, arg3, arg4, arg5, arg6 - 1);
-		} else if (arg0 == 2 && arg6 < anInt3036 - 1) {
-			method2393(arg1, arg2, arg3, arg4, arg5, arg6 + 1);
-		} else if (arg0 == 16 && arg5 > 0 && arg6 < anInt3036 - 1) {
-			method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 + 1);
-		} else if (arg0 == 32 && arg5 < anInt3037 - 1 && arg6 < anInt3036 - 1) {
-			method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 + 1);
-		} else if (arg0 == 128 && arg5 > 0 && arg6 > 0) {
-			method2393(arg1, arg2, arg3, arg4, arg5 - 1, arg6 - 1);
-		} else if (arg0 == 64 && arg5 < anInt3037 - 1 && arg6 > 0) {
-			method2393(arg1, arg2, arg3, arg4, arg5 + 1, arg6 - 1);
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(Lclient!gi;)V")
-	public static void method2389(@OriginalArg(0) Light arg0) {
-		if (LightingManager.lightCount >= 255) {
-			System.out.println("Number of lights added exceeds maximum!");
-		} else {
-			LightingManager.lights[LightingManager.lightCount++] = arg0;
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "()V")
-	public static void method2390() {
-		for (@Pc(1) int local1 = 0; local1 < 4; local1++) {
-			anIntArray284[local1] = -1;
-			method2396(local1);
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V")
-	public static void method2391(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
-		if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) {
-			return;
-		}
-		@Pc(20) int local20;
-		for (local20 = 0; local20 < 4; local20++) {
-			aBooleanArray66[local20] = false;
-		}
-		local20 = 0;
-		@Pc(33) int local33 = 0;
-		@Pc(35) int local35;
-		@Pc(40) int local40;
-		label112: for (local35 = arg4; local35 <= arg6; local35++) {
-			label110: for (local40 = arg5; local40 <= arg7; local40++) {
-				@Pc(51) int local51 = anIntArrayArrayArray11[arg3][local35][local40];
-				while (true) {
-					while (true) {
-						label96: while (true) {
-							if (local51 == 0) {
-								continue label110;
-							}
-							@Pc(59) int local59 = (local51 & 0xFF) - 1;
-							local51 >>>= 0x8;
-							@Pc(65) int local65;
-							for (local65 = 0; local65 < local33; local65++) {
-								if (local59 == anIntArray283[local65]) {
-									continue label96;
-								}
-							}
-							for (local65 = 0; local65 < 4; local65++) {
-								if (local59 == anIntArray284[local65]) {
-									if (!aBooleanArray66[local65]) {
-										aBooleanArray66[local65] = true;
-										local20++;
-										if (local20 == 4) {
-											break label112;
-										}
-									}
-									continue label96;
-								}
-							}
-							anIntArray283[local33++] = local59;
-							local20++;
-							if (local20 == 4) {
-								break label112;
-							}
-						}
-					}
-				}
-			}
-		}
-		for (local35 = 0; local35 < local33; local35++) {
-			for (local40 = 0; local40 < 4; local40++) {
-				if (!aBooleanArray66[local40]) {
-					anIntArray284[local40] = anIntArray283[local35];
-					aBooleanArray66[local40] = true;
-					method2403(local40, LightingManager.lights[anIntArray283[local35]], arg0, arg1, arg2);
-					break;
-				}
-			}
-		}
-		for (local35 = 0; local35 < 4; local35++) {
-			if (!aBooleanArray66[local35]) {
-				anIntArray284[local35] = -1;
-				method2396(local35);
-			}
-		}
-		anInt3031 = arg3;
-		anInt3033 = arg4;
-		anInt3029 = arg5;
-		anInt3035 = arg6;
-		anInt3030 = arg7;
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(III)V")
-	public static void method2392() {
-		anInt3032 = 4;
-		anInt3037 = 104;
-		anInt3036 = 104;
-		anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V")
-	public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
-		if (!Preferences.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) {
-			return;
-		}
-		@Pc(20) int local20;
-		for (local20 = 0; local20 < 4; local20++) {
-			aBooleanArray66[local20] = false;
-		}
-		local20 = 0;
-		@Pc(39) int local39 = anIntArrayArrayArray11[arg3][arg4][arg5];
-		while (true) {
-			@Pc(47) int local47;
-			@Pc(53) int local53;
-			label72: while (local39 != 0) {
-				local47 = (local39 & 0xFF) - 1;
-				local39 >>>= 0x8;
-				for (local53 = 0; local53 < 4; local53++) {
-					if (local47 == anIntArray284[local53]) {
-						aBooleanArray66[local53] = true;
-						continue label72;
-					}
-				}
-				anIntArray283[local20++] = local47;
-			}
-			for (local47 = 0; local47 < local20; local47++) {
-				for (local53 = 0; local53 < 4; local53++) {
-					if (!aBooleanArray66[local53]) {
-						anIntArray284[local53] = anIntArray283[local47];
-						aBooleanArray66[local53] = true;
-						method2403(local53, LightingManager.lights[anIntArray283[local47]], arg0, arg1, arg2);
-						break;
-					}
-				}
-			}
-			for (local47 = 0; local47 < 4; local47++) {
-				if (!aBooleanArray66[local47]) {
-					anIntArray284[local47] = -1;
-					method2396(local47);
-				}
-			}
-			anInt3031 = arg3;
-			anInt3033 = arg4;
-			anInt3029 = arg5;
-			anInt3035 = arg4;
-			anInt3030 = arg5;
-			return;
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IZ)V")
-	public static void method2394(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1) {
-		for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
-			LightingManager.lights[local1].method1765(arg1, arg0);
-		}
-		anInt3031 = -1;
-		anInt3033 = -1;
-		anInt3029 = -1;
-		anInt3035 = -1;
-		anInt3030 = -1;
-	}
-
-	@OriginalMember(owner = "client!jf", name = "b", descriptor = "()V")
-	public static void method2395() {
-		for (@Pc(1) int local1 = 0; local1 < LightingManager.lightCount; local1++) {
-			@Pc(8) Light local8 = LightingManager.lights[local1];
-			@Pc(11) int local11 = local8.anInt2241;
-			if (local8.aBoolean124) {
-				local11 = 0;
-			}
-			@Pc(19) int local19 = local8.anInt2241;
-			if (local8.aBoolean126) {
-				local19 = 3;
-			}
-			for (@Pc(26) int local26 = local11; local26 <= local19; local26++) {
-				@Pc(31) int local31 = 0;
-				@Pc(39) int local39 = (local8.anInt2245 >> 7) - local8.anInt2236;
-				if (local39 < 0) {
-					local31 = -local39;
-					local39 = 0;
-				}
-				@Pc(55) int local55 = (local8.anInt2245 >> 7) + local8.anInt2236;
-				if (local55 > anInt3036 - 1) {
-					local55 = anInt3036 - 1;
-				}
-				for (@Pc(66) int local66 = local39; local66 <= local55; local66++) {
-					@Pc(75) short local75 = local8.aShortArray30[local31++];
-					@Pc(87) int local87 = (local8.anInt2240 >> 7) + (local75 >> 8) - local8.anInt2236;
-					@Pc(95) int local95 = local87 + (local75 & 0xFF) - 1;
-					if (local87 < 0) {
-						local87 = 0;
-					}
-					if (local95 > anInt3037 - 1) {
-						local95 = anInt3037 - 1;
-					}
-					for (@Pc(110) int local110 = local87; local110 <= local95; local110++) {
-						@Pc(121) int local121 = anIntArrayArrayArray11[local26][local110][local66];
-						if ((local121 & 0xFF) == 0) {
-							anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1;
-						} else if ((local121 & 0xFF00) == 0) {
-							anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 8;
-						} else if ((local121 & 0xFF0000) == 0) {
-							anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 16;
-						} else if ((local121 & 0xFF000000) == 0) {
-							anIntArrayArrayArray11[local26][local110][local66] = local121 | local1 + 1 << 24;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(I)V")
-	private static void method2396(@OriginalArg(0) int arg0) {
-		if (aBooleanArray65[arg0]) {
-			aBooleanArray65[arg0] = false;
-			@Pc(14) int local14 = arg0 + 16384 + 4;
-			@Pc(16) GL2 local16 = GlRenderer.gl;
-			local16.glDisable(local14);
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V")
-	public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
-		if (!Preferences.highDetailLighting) {
-			return;
-		}
-		label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) {
-			if (anIntArray284[local4] != -1) {
-				@Pc(20) int local20 = anIntArrayArrayArray11[arg0][arg1][arg2];
-				@Pc(28) int local28;
-				while (local20 != 0) {
-					local28 = (local20 & 0xFF) - 1;
-					local20 >>>= 0x8;
-					if (local28 == anIntArray284[local4]) {
-						continue label43;
-					}
-				}
-				local20 = anIntArrayArrayArray11[arg0][arg3][arg4];
-				while (local20 != 0) {
-					local28 = (local20 & 0xFF) - 1;
-					local20 >>>= 0x8;
-					if (local28 == anIntArray284[local4]) {
-						continue label43;
-					}
-				}
-			}
-			anIntArray284[local4] = -1;
-			method2396(local4);
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "c", descriptor = "()V")
-	public static void method2398() {
-		LightingManager.lights = null;
-		anIntArray284 = null;
-		aBooleanArray65 = null;
-		anIntArray283 = null;
-		aBooleanArray66 = null;
-		anIntArrayArrayArray11 = null;
-	}
-
-	@OriginalMember(owner = "client!jf", name = "e", descriptor = "()V")
-	public static void method2400() {
-		@Pc(1) GL2 local1 = GlRenderer.gl;
-		@Pc(3) int local3;
-		for (local3 = 0; local3 < 4; local3++) {
-			@Pc(10) int local10 = local3 + 16388;
-			local1.glLightfv(local10, GL2.GL_AMBIENT, new float[] { 0.0F, 0.0F, 0.0F, 1.0F }, 0);
-			local1.glLightf(local10, GL2.GL_LINEAR_ATTENUATION, 0.0F);
-			local1.glLightf(local10, GL2.GL_CONSTANT_ATTENUATION, 0.0F);
-		}
-		for (local3 = 0; local3 < 4; local3++) {
-			anIntArray284[local3] = -1;
-			method2396(local3);
-		}
-	}
-
-	@OriginalMember(owner = "client!jf", name = "f", descriptor = "()V")
-	public static void method2401() {
-		LightingManager.lights = new Light[255];
-		anIntArray284 = new int[4];
-		aBooleanArray65 = new boolean[4];
-		anIntArray283 = new int[4];
-		aBooleanArray66 = new boolean[4];
-		anIntArrayArrayArray11 = new int[anInt3032][anInt3037][anInt3036];
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V")
-	public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) {
-		if (!Preferences.highDetailLighting) {
-			return;
-		}
-		@Pc(4) GL2 local4 = GlRenderer.gl;
-		MaterialManager.setMaterial(0, 0);
-		GlRenderer.setTextureCombineRgbMode(0);
-		GlRenderer.resetTextureMatrix();
-		GlRenderer.setTextureId(GlRenderer.anInt5328);
-		local4.glDepthMask(false);
-		GlRenderer.setLightingEnabled(false);
-		local4.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE);
-		local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0);
-		local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT);
-		local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_ALPHA);
-		label71: for (@Pc(56) int local56 = 0; local56 < LightingManager.lightCount; local56++) {
-			@Pc(63) Light local63 = LightingManager.lights[local56];
-			@Pc(66) int local66 = local63.anInt2241;
-			if (local63.aBoolean125) {
-				local66--;
-			}
-			if (local63.aClass45_1 != null) {
-				@Pc(76) int local76 = 0;
-				@Pc(84) int local84 = (local63.anInt2245 >> 7) - local63.anInt2236;
-				@Pc(92) int local92 = (local63.anInt2245 >> 7) + local63.anInt2236;
-				if (local92 >= Static215.anInt4866) {
-					local92 = Static215.anInt4866 - 1;
-				}
-				if (local84 < Static80.anInt4698) {
-					local76 = Static80.anInt4698 - local84;
-					local84 = Static80.anInt4698;
-				}
-				for (@Pc(112) int local112 = local84; local112 <= local92; local112++) {
-					@Pc(121) short local121 = local63.aShortArray30[local76++];
-					@Pc(133) int local133 = (local63.anInt2240 >> 7) + (local121 >> 8) - local63.anInt2236;
-					@Pc(141) int local141 = local133 + (local121 & 0xFF) - 1;
-					if (local133 < Static31.anInt987) {
-						local133 = Static31.anInt987;
-					}
-					if (local141 >= Static2.anInt15) {
-						local141 = Static2.anInt15 - 1;
-					}
-					for (@Pc(155) int local155 = local133; local155 <= local141; local155++) {
-						@Pc(160) Tile local160 = null;
-						if (local66 >= 0) {
-							local160 = arg2[local66][local155][local112];
-						}
-						if (local66 < 0 || local160 != null && local160.aBoolean45) {
-							GlRenderer.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F);
-							local4.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.aFloat8 }, 0);
-							local63.aClass45_1.method1556();
-							continue label71;
-						}
-					}
-				}
-			}
-		}
-		local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE);
-		local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR);
-		local4.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
-		local4.glDepthMask(true);
-		local4.glFogfv(GL2.GL_FOG_COLOR, Static161.fogColor, 0);
-		local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY);
-		GlRenderer.method4173();
-	}
-
-	@OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V")
-	private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
-		@Pc(5) int local5 = arg0 + 16384 + 4;
-		@Pc(7) GL2 local7 = GlRenderer.gl;
-		if (!aBooleanArray65[arg0]) {
-			local7.glEnable(local5);
-			aBooleanArray65[arg0] = true;
-		}
-		local7.glLightf(local5, GL2.GL_QUADRATIC_ATTENUATION, arg1.aFloat9);
-		local7.glLightfv(local5, GL2.GL_DIFFUSE, arg1.aFloatArray3, 0);
-		aFloatArray17[0] = arg1.anInt2240 - arg2;
-		aFloatArray17[1] = arg1.anInt2235 - arg3;
-		aFloatArray17[2] = arg1.anInt2245 - arg4;
-		local7.glLightfv(local5, GL2.GL_POSITION, aFloatArray17, 0);
-	}
-
-	@OriginalMember(owner = "client!jf", name = "g", descriptor = "()V")
-	public static void method2404() {
-		LightingManager.lightCount = 0;
-		for (@Pc(3) int local3 = 0; local3 < anInt3032; local3++) {
-			for (@Pc(8) int local8 = 0; local8 < anInt3037; local8++) {
-				for (@Pc(13) int local13 = 0; local13 < anInt3036; local13++) {
-					anIntArrayArrayArray11[local3][local8][local13] = 0;
-				}
-			}
-		}
-	}
-}
diff --git a/client/src/main/java/rt4/Static122.java b/client/src/main/java/rt4/Static122.java
index fc9bda8..7d7f112 100644
--- a/client/src/main/java/rt4/Static122.java
+++ b/client/src/main/java/rt4/Static122.java
@@ -12,11 +12,11 @@ public final class Static122 {
 	public static void method2410(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1, @OriginalArg(5) int arg2) {
 		Static172.aClass153_70 = arg0;
 		MidiPlayer.anInt441 = 1;
-		Static253.anInt5527 = arg2;
+		MidiPlayer.anInt5527 = arg2;
 		Static226.anInt5085 = 0;
-		Static277.anInt5853 = arg1;
-		Static72.aBoolean116 = false;
-		Static57.anInt1757 = 10000;
+		MidiPlayer.anInt5853 = arg1;
+		MidiPlayer.aBoolean116 = false;
+		MidiPlayer.anInt1757 = 10000;
 	}
 
     @OriginalMember(owner = "client!jh", name = "a", descriptor = "(IILclient!ve;Lclient!ve;I)Lclient!dd;")
diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java
index ca53f5a..c043c93 100644
--- a/client/src/main/java/rt4/Static123.java
+++ b/client/src/main/java/rt4/Static123.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
@@ -9,14 +8,9 @@ public final class Static123 {
     @OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
 	public static int anInt3058 = 0;
 
-	@OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;")
-	public static final JagString aClass100_593 = JagString.parse(" (X");
-
-	@OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
+    @OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
 	public static boolean aBoolean155 = false;
 
-	@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
-	public static final JagString aClass100_594 = JagString.parse("<)4col>");
 	@OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
 	public static int anInt3947;
 
@@ -32,9 +26,9 @@ public final class Static123 {
 
 	@OriginalMember(owner = "client!jj", name = "a", descriptor = "()V")
 	public static void method2419() {
-		Static215.anInt4870 = 0;
-		label194: for (@Pc(3) int local3 = 0; local3 < Static28.anInt917; local3++) {
-			@Pc(10) Class120 local10 = Static91.aClass120Array1[local3];
+		SceneGraph.anInt4870 = 0;
+		label194: for (@Pc(3) int local3 = 0; local3 < SceneGraph.anInt917; local3++) {
+			@Pc(10) Class120 local10 = SceneGraph.aClass120Array1[local3];
 			@Pc(14) int local14;
 			if (Static8.anIntArray8 != null) {
 				for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) {
@@ -80,7 +74,7 @@ public final class Static123 {
 						local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local158;
 						local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
 						local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
-						Static247.aClass120Array2[Static215.anInt4870++] = local10;
+						SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
 					}
 				}
 			} else if (local10.anInt4453 == 2) {
@@ -116,7 +110,7 @@ public final class Static123 {
 						local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158;
 						local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
 						local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
-						Static247.aClass120Array2[Static215.anInt4870++] = local10;
+						SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
 					}
 				}
 			} else if (local10.anInt4453 == 4) {
@@ -154,7 +148,7 @@ public final class Static123 {
 							local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14;
 							local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14;
 							local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14;
-							Static247.aClass120Array2[Static215.anInt4870++] = local10;
+							SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
 						}
 					}
 				}
@@ -162,8 +156,4 @@ public final class Static123 {
 		}
 	}
 
-	@OriginalMember(owner = "client!jj", name = "b", descriptor = "(BI)Lclient!na;")
-	public static JagString parseInt(@OriginalArg(1) int arg0) {
-		return Static198.method1025(false, arg0);
-	}
 }
diff --git a/client/src/main/java/rt4/Static125.java b/client/src/main/java/rt4/Static125.java
index 9019e6d..7d26769 100644
--- a/client/src/main/java/rt4/Static125.java
+++ b/client/src/main/java/rt4/Static125.java
@@ -72,7 +72,7 @@ public final class Static125 {
 		}
 		local9 = Static265.anInt5765 * 128 + 64;
 		local15 = Static251.anInt5449 * 128 + 64;
-		local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static57.anInt1744;
+		local23 = SceneGraph.getTileHeight(Player.level, local15, local9) - Static260.anInt1744;
 		@Pc(236) int local236 = local23 - Static5.anInt40;
 		@Pc(241) int local241 = local9 - Static134.renderZ;
 		@Pc(246) int local246 = local15 - Static138.renderX;
diff --git a/client/src/main/java/rt4/Static127.java b/client/src/main/java/rt4/Static127.java
index 3762e8e..5b6b85d 100644
--- a/client/src/main/java/rt4/Static127.java
+++ b/client/src/main/java/rt4/Static127.java
@@ -7,6 +7,8 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static127 {
 
+	@OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
+	public static final JagString aClass100_520 = JagString.parse("(U4");
 	@OriginalMember(owner = "client!k", name = "j", descriptor = "I")
 	public static int anInt3126;
 
@@ -21,7 +23,7 @@ public final class Static127 {
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIBLclient!ve;Lclient!ve;)Lclient!rk;")
 	public static Font method2462(@OriginalArg(1) int arg0, @OriginalArg(3) Js5 arg1, @OriginalArg(4) Js5 arg2) {
-		return SpriteLoader.decode(arg1, 0, arg0) ? Static29.method799(arg2.getFile(arg0, 0)) : null;
+		return SpriteLoader.decode(arg1, 0, arg0) ? Font.method799(arg2.getFile(arg0, 0)) : null;
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(IIIIZIZ)V")
@@ -53,7 +55,7 @@ public final class Static127 {
 		@Pc(103) Npc local103;
 		@Pc(109) int local109;
 		if (arg4) {
-			Static272.anInt5214 = 0;
+			NpcList.size = 0;
 			for (local96 = 0; local96 < 32768; local96++) {
 				local103 = NpcList.npcs[local96];
 				if (local103 != null) {
@@ -64,7 +66,7 @@ public final class Static127 {
 							local103.movementQueueX[local109] -= local86;
 							local103.movementQueueZ[local109] -= local81;
 						}
-						Static33.anIntArray79[Static272.anInt5214++] = local96;
+						NpcList.ids[NpcList.size++] = local96;
 					} else {
 						NpcList.npcs[local96].setNpcType(null);
 						NpcList.npcs[local96] = null;
@@ -119,9 +121,9 @@ public final class Static127 {
 				@Pc(382) int local382 = local367 + local81;
 				for (@Pc(384) int local384 = 0; local384 < 4; local384++) {
 					if (local378 >= 0 && local382 >= 0 && local378 < 104 && local382 < 104) {
-						Static159.aClass69ArrayArrayArray1[local384][local358][local367] = Static159.aClass69ArrayArrayArray1[local384][local378][local382];
+						Static159.objStacks[local384][local358][local367] = Static159.objStacks[local384][local378][local382];
 					} else {
-						Static159.aClass69ArrayArrayArray1[local384][local358][local367] = null;
+						Static159.objStacks[local384][local358][local367] = null;
 					}
 				}
 			}
@@ -156,28 +158,6 @@ public final class Static127 {
 		Static217.aClass69_116.clear();
 	}
 
-	@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
-	public static DelayedStateChange poll() {
-		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) DelayedStateChange.serverQueue.method795();
-		if (local10 != null) {
-			local10.unlink();
-			local10.method4365();
-			return local10;
-		}
-		do {
-			local10 = (DelayedStateChange) DelayedStateChange.clientQueue.method795();
-			if (local10 == null) {
-				return null;
-			}
-			if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
-				return null;
-			}
-			local10.unlink();
-			local10.method4365();
-		} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
-		return local10;
-	}
-
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;")
 	public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) {
 		if (arg1.indexOf(Static49.PERCENT_SIGN) == -1) {
@@ -193,7 +173,7 @@ public final class Static127 {
 							local14 = arg1.indexOf(Static160.aClass100_761);
 							if (local14 == -1) {
 								while (true) {
-									local14 = arg1.indexOf(Static96.aClass100_520);
+									local14 = arg1.indexOf(aClass100_520);
 									if (local14 == -1) {
 										while (true) {
 											local14 = arg1.indexOf(Static235.aClass100_1002);
@@ -209,7 +189,7 @@ public final class Static127 {
 														try {
 															if (Player.lastLogAddress.result != null) {
 																@Pc(265) byte[] local265 = ((String) Player.lastLogAddress.result).getBytes("ISO-8859-1");
-																local246 = Static10.decodeString(local265, local265.length, 0);
+																local246 = JagString.decodeString(local265, local265.length, 0);
 															}
 														} catch (@Pc(274) UnsupportedEncodingException local274) {
 														}
diff --git a/client/src/main/java/rt4/Static128.java b/client/src/main/java/rt4/Static128.java
index 14d2c7a..13b89fd 100644
--- a/client/src/main/java/rt4/Static128.java
+++ b/client/src/main/java/rt4/Static128.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static128 {
 
-	@OriginalMember(owner = "client!ka", name = "r", descriptor = "[I")
-	public static int[] anIntArray293;
-
     @OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
 	public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
 
diff --git a/client/src/main/java/rt4/Static13.java b/client/src/main/java/rt4/Static13.java
index a1ca678..77c6662 100644
--- a/client/src/main/java/rt4/Static13.java
+++ b/client/src/main/java/rt4/Static13.java
@@ -1,7 +1,6 @@
 package rt4;
 
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static13 {
 
@@ -14,25 +13,4 @@ public final class Static13 {
 	@OriginalMember(owner = "client!bc", name = "I", descriptor = "Z")
 	public static boolean aBoolean16 = false;
 
-	@OriginalMember(owner = "client!bc", name = "N", descriptor = "Lclient!lb;")
-	public static final MonochromeImageCache_Class3_Sub23 aClass3_Sub23_1 = new MonochromeImageCache_Class3_Sub23(0, 0);
-
-	@OriginalMember(owner = "client!bc", name = "f", descriptor = "(B)Lclient!na;")
-	public static JagString method471() {
-		@Pc(32) JagString local32;
-		if (Static260.anInt5014 == 1 && MiniMenu.size < 2) {
-			local32 = JagString.concatenate(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, MiniMenu.aClass100_203, Static225.aClass100_961 });
-		} else if (Static241.aBoolean302 && MiniMenu.size < 2) {
-			local32 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
-		} else if (Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2) {
-			local32 = MiniMenu.getOp(MiniMenu.size - 2);
-		} else {
-			local32 = MiniMenu.getOp(MiniMenu.size - 1);
-		}
-		if (MiniMenu.size > 2) {
-			local32 = JagString.concatenate(new JagString[] { local32, Static1.aClass100_2, Static123.parseInt(MiniMenu.size - 2), LocalizedText.MOREOPTIONS});
-		}
-		return local32;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java
index ce13fe5..9ebc9ae 100644
--- a/client/src/main/java/rt4/Static131.java
+++ b/client/src/main/java/rt4/Static131.java
@@ -22,10 +22,7 @@ public final class Static131 {
 	@OriginalMember(owner = "client!kd", name = "yb", descriptor = "S")
 	public static short aShort21 = 32767;
 
-	@OriginalMember(owner = "client!kd", name = "zb", descriptor = "I")
-	public static int anInt3259 = 0;
-
-	@OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
+    @OriginalMember(owner = "client!kd", name = "Bb", descriptor = "I")
 	public static int anInt3260 = -1;
 
 	@OriginalMember(owner = "client!kd", name = "a", descriptor = "([IIIII)V")
diff --git a/client/src/main/java/rt4/Static132.java b/client/src/main/java/rt4/Static132.java
index 97c27be..2276149 100644
--- a/client/src/main/java/rt4/Static132.java
+++ b/client/src/main/java/rt4/Static132.java
@@ -127,9 +127,9 @@ public final class Static132 {
 		Rasteriser.alpha = 0;
 		@Pc(475) int local475;
 		if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) {
-			if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
-				Static56.anInt1742 = arg6;
-				Static116.anInt2954 = arg7;
+			if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local315, local331, local299, local307, local323, local291)) {
+				MiniMenu.anInt1742 = arg6;
+				MiniMenu.anInt2954 = arg7;
 			}
 			if (!GlRenderer.enabled && !arg8) {
 				Rasteriser.testX = false;
@@ -153,9 +153,9 @@ public final class Static132 {
 		if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) {
 			return;
 		}
-		if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
-			Static56.anInt1742 = arg6;
-			Static116.anInt2954 = arg7;
+		if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local283, local299, local331, local275, local291, local323)) {
+			MiniMenu.anInt1742 = arg6;
+			MiniMenu.anInt2954 = arg7;
 		}
 		if (GlRenderer.enabled || arg8) {
 			return;
diff --git a/client/src/main/java/rt4/Static137.java b/client/src/main/java/rt4/Static137.java
index 7023298..957771b 100644
--- a/client/src/main/java/rt4/Static137.java
+++ b/client/src/main/java/rt4/Static137.java
@@ -8,9 +8,6 @@ public final class Static137 {
 	@OriginalMember(owner = "client!kl", name = "s", descriptor = "I")
 	public static int anInt3337 = 0;
 
-	@OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;")
-	public static final JagString aClass100_637 = JagString.parse("<col=ffffff>");
-
 	@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
 	public static TextureOp29SubOp2 method2664(@OriginalArg(0) Buffer arg0) {
 		return new TextureOp29SubOp2(arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g2s(), arg0.g3(), arg0.g3(), arg0.g1());
diff --git a/client/src/main/java/rt4/Static139.java b/client/src/main/java/rt4/Static139.java
index d61e33c..d70126e 100644
--- a/client/src/main/java/rt4/Static139.java
+++ b/client/src/main/java/rt4/Static139.java
@@ -10,16 +10,13 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static139 {
 
-	@OriginalMember(owner = "client!l", name = "l", descriptor = "[I")
-	public static int[] anIntArray325;
-
 	@OriginalMember(owner = "client!l", name = "d", descriptor = "Lclient!na;")
 	public static final JagString aClass100_659 = JagString.parse(")4j");
 
     @OriginalMember(owner = "client!l", name = "a", descriptor = "(III)J")
 	public static long method2703(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
-		return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key;
+		return local7 == null || local7.wallDecor == null ? 0L : local7.wallDecor.key;
 	}
 
 	@OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/rt4/Static14.java b/client/src/main/java/rt4/Static14.java
index 384c3b4..3d94f10 100644
--- a/client/src/main/java/rt4/Static14.java
+++ b/client/src/main/java/rt4/Static14.java
@@ -11,7 +11,7 @@ public final class Static14 {
 
 	@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
 	public static void method475(@OriginalArg(1) int arg0) {
-		@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
+		@Pc(8) Inv local8 = (Inv) Inv.objectContainerCache.get((long) arg0);
 		if (local8 != null) {
 			for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
 				local8.objectIds[local24] = -1;
diff --git a/client/src/main/java/rt4/Static141.java b/client/src/main/java/rt4/Static141.java
index 558aa38..78ff5ea 100644
--- a/client/src/main/java/rt4/Static141.java
+++ b/client/src/main/java/rt4/Static141.java
@@ -8,17 +8,6 @@ public final class Static141 {
 	@OriginalMember(owner = "client!lb", name = "z", descriptor = "I")
 	public static int anInt3473;
 
-    @OriginalMember(owner = "client!lb", name = "s", descriptor = "Lclient!na;")
-	public static final JagString CLAN = JagString.parse(":clan:");
-
-	@OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
-	public static void method2720() {
-		if (WorldMap.aClass100_724 != null) {
-			WorldMap.method1853(WorldMap.aClass100_724);
-			WorldMap.aClass100_724 = null;
-		}
-	}
-
 	@OriginalMember(owner = "client!lb", name = "a", descriptor = "(ZIIIBII)V")
 	public static void method2722(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		Static113.anInt4612 = arg3;
diff --git a/client/src/main/java/rt4/Static142.java b/client/src/main/java/rt4/Static142.java
index a0d08ad..b7f256e 100644
--- a/client/src/main/java/rt4/Static142.java
+++ b/client/src/main/java/rt4/Static142.java
@@ -1,309 +1,10 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static142 {
 
 	@OriginalMember(owner = "client!lc", name = "n", descriptor = "I")
 	public static int originZ;
 
-	@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
-	public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
-		Static277.anInt5854 = 0;
-		@Pc(5) int local5;
-		@Pc(642) int local642;
-		@Pc(74) int local74;
-		@Pc(265) int local265;
-		@Pc(310) int local310;
-		@Pc(359) int local359;
-		@Pc(639) int local639;
-		for (local5 = -1; local5 < PlayerList.size + Static272.anInt5214; local5++) {
-			@Pc(17) PathingEntity local17;
-			if (local5 == -1) {
-				local17 = PlayerList.self;
-			} else if (PlayerList.size > local5) {
-				local17 = PlayerList.players[PlayerList.ids[local5]];
-			} else {
-				local17 = NpcList.npcs[Static33.anIntArray79[local5 - PlayerList.size]];
-			}
-			if (local17 != null && local17.method2682()) {
-				@Pc(58) NpcType local58;
-				if (local17 instanceof Npc) {
-					local58 = ((Npc) local17).type;
-					if (local58.multiNpcs != null) {
-						local58 = local58.getMultiNpc();
-					}
-					if (local58 == null) {
-						continue;
-					}
-				}
-				@Pc(161) int local161;
-				if (local5 >= PlayerList.size) {
-					local58 = ((Npc) local17).type;
-					if (local58.multiNpcs != null) {
-						local58 = local58.getMultiNpc();
-					}
-					if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) {
-						if (local58.anInt3730 == -1) {
-							local265 = local17.method2691() + 15;
-						} else {
-							local265 = local58.anInt3730 + 15;
-						}
-						Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
-						if (Static65.anInt1951 > -1) {
-							Sprites.headiconPrayers[local58.prayerIcon].method1423(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
-						}
-					}
-					@Pc(308) MapMarker[] local308 = Static143.hintMapMarkers;
-					for (local310 = 0; local310 < local308.length; local310++) {
-						@Pc(322) MapMarker local322 = local308[local310];
-						if (local322 != null && local322.type == 1 && local322.actorTargetId == Static33.anIntArray79[local5 - PlayerList.size] && client.loop % 20 < 10) {
-							if (local58.anInt3730 == -1) {
-								local359 = local17.method2691() + 15;
-							} else {
-								local359 = local58.anInt3730 + 15;
-							}
-							Static180.method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1);
-							if (Static65.anInt1951 > -1) {
-								Sprites.headhints[local322.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0);
-							}
-						}
-					}
-				} else {
-					local74 = 30;
-					@Pc(77) Player local77 = (Player) local17;
-					if (local77.anInt1669 != -1 || local77.anInt1649 != -1) {
-						Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
-						if (Static65.anInt1951 > -1) {
-							if (local77.anInt1669 != -1) {
-								Sprites.headiconPks[local77.anInt1669].method1423(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548);
-								local74 += 25;
-							}
-							if (local77.anInt1649 != -1) {
-								Sprites.headiconPrayers[local77.anInt1649].method1423(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74));
-								local74 += 25;
-							}
-						}
-					}
-					if (local5 >= 0) {
-						@Pc(159) MapMarker[] local159 = Static143.hintMapMarkers;
-						for (local161 = 0; local161 < local159.length; local161++) {
-							@Pc(173) MapMarker local173 = local159[local161];
-							if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) {
-								Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
-								if (Static65.anInt1951 > -1) {
-									Sprites.headhints[local173.anInt4048].method1423(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74));
-								}
-							}
-						}
-					}
-				}
-				if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
-					Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
-					if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
-						Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
-						Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight;
-						Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
-						Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
-						Static191.anIntArray390[Static277.anInt5854] = local17.chatColor;
-						Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect;
-						Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops;
-						Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage;
-						Static277.anInt5854++;
-					}
-				}
-				if (local17.hitpointsBarVisibleUntil > client.loop) {
-					@Pc(508) Sprite local508 = Sprites.hitbars[0];
-					@Pc(512) Sprite local512 = Sprites.hitbars[1];
-					if (local17 instanceof Npc) {
-						@Pc(518) Npc local518 = (Npc) local17;
-						@Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId);
-						if (local528 == null) {
-							local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8);
-							if (local528 != null) {
-								HitBarList.hitBars.put(local528, (long) local518.type.hitBarId);
-							}
-						}
-						if (local528 != null && local528.length == 2) {
-							local512 = local528[1];
-							local508 = local528[0];
-						}
-						@Pc(571) NpcType local571 = local518.type;
-						if (local571.anInt3730 == -1) {
-							local310 = local17.method2691();
-						} else {
-							local310 = local571.anInt3730;
-						}
-					} else {
-						local310 = local17.method2691();
-					}
-					Static180.method3326(arg4 >> 1, arg3, local17, arg5, local508.height + local310 + 10, arg1 >> 1);
-					if (Static65.anInt1951 > -1) {
-						local161 = Static65.anInt1951 + arg2 - (local508.width >> 1);
-						local359 = Static16.anInt548 + arg0 - 3;
-						local508.method1423(local161, local359);
-						local639 = local508.width * local17.hitpointsBar / 255;
-						local642 = local508.height;
-						if (GlRenderer.enabled) {
-							GlRaster.method1183(local161, local359, local161 + local639, local359 + local642);
-						} else {
-							SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359);
-						}
-						local512.method1423(local161, local359);
-						if (GlRenderer.enabled) {
-							GlRaster.method1187(arg2, arg0, arg1 + arg2, arg0 - -arg4);
-						} else {
-							SoftwareRaster.method2496(arg2, arg0, arg1 + arg2, arg4 + arg0);
-						}
-					}
-				}
-				for (local74 = 0; local74 < 4; local74++) {
-					if (local17.anIntArray319[local74] > client.loop) {
-						if (local17 instanceof Npc) {
-							@Pc(725) Npc local725 = (Npc) local17;
-							@Pc(728) NpcType local728 = local725.type;
-							if (local728.anInt3730 == -1) {
-								local265 = local17.method2691() / 2;
-							} else {
-								local265 = local728.anInt3730 / 2;
-							}
-						} else {
-							local265 = local17.method2691() / 2;
-						}
-						Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
-						if (Static65.anInt1951 > -1) {
-							if (local74 == 1) {
-								Static16.anInt548 -= 20;
-							}
-							if (local74 == 2) {
-								Static16.anInt548 -= 10;
-								Static65.anInt1951 -= 15;
-							}
-							if (local74 == 3) {
-								Static16.anInt548 -= 10;
-								Static65.anInt1951 += 15;
-							}
-							Sprites.hitmarks[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
-							Fonts.p11Full.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
-						}
-					}
-				}
-			}
-		}
-		for (local5 = 0; local5 < Static277.anInt5854; local5++) {
-			local74 = Static191.anIntArray392[local5];
-			@Pc(859) int local859 = Static191.anIntArray385[local5];
-			local310 = Static191.anIntArray387[local5];
-			local265 = Static191.anIntArray389[local5];
-			@Pc(869) boolean local869 = true;
-			while (local869) {
-				local869 = false;
-				for (local359 = 0; local359 < local5; local359++) {
-					if (Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74 + 2 && local74 - local310 < Static191.anIntArray392[local359] - -2 && local859 - local265 < Static191.anIntArray385[local359] + Static191.anIntArray389[local359] && Static191.anIntArray385[local359] - Static191.anIntArray389[local359] < local265 + local859 && Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74) {
-						local74 = Static191.anIntArray392[local359] - Static191.anIntArray387[local359];
-						local869 = true;
-					}
-				}
-			}
-			Static65.anInt1951 = Static191.anIntArray385[local5];
-			Static16.anInt548 = Static191.anIntArray392[local5] = local74;
-			@Pc(962) JagString local962 = Static191.aClass100Array132[local5];
-			if (Static79.anInt2157 == 0) {
-				local639 = 16776960;
-				if (Static191.anIntArray390[local5] < 6) {
-					local639 = Static16.anIntArray52[Static191.anIntArray390[local5]];
-				}
-				if (Static191.anIntArray390[local5] == 6) {
-					local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680;
-				}
-				if (Static191.anIntArray390[local5] == 7) {
-					local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535;
-				}
-				if (Static191.anIntArray390[local5] == 8) {
-					local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056;
-				}
-				if (Static191.anIntArray390[local5] == 9) {
-					local642 = 150 - Static191.anIntArray384[local5];
-					if (local642 < 50) {
-						local639 = local642 * 1280 + 16711680;
-					} else if (local642 < 100) {
-						local639 = 16776960 + 16384000 - local642 * 327680;
-					} else if (local642 < 150) {
-						local639 = local642 * 5 + 65280 - 500;
-					}
-				}
-				if (Static191.anIntArray390[local5] == 10) {
-					local642 = 150 - Static191.anIntArray384[local5];
-					if (local642 < 50) {
-						local639 = local642 * 5 + 16711680;
-					} else if (local642 < 100) {
-						local639 = 16711935 - (local642 - 50) * 327680;
-					} else if (local642 < 150) {
-						local639 = local642 * 327680 + 255 + 500 - local642 * 5 - 32768000;
-					}
-				}
-				if (Static191.anIntArray390[local5] == 11) {
-					local642 = 150 - Static191.anIntArray384[local5];
-					if (local642 < 50) {
-						local639 = 16777215 - local642 * 327685;
-					} else if (local642 < 100) {
-						local639 = local642 * 327685 + 65280 - 16384250;
-					} else if (local642 < 150) {
-						local639 = 16777215 + 32768000 - local642 * 327680;
-					}
-				}
-				if (Static191.anIntArray391[local5] == 0) {
-					Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
-				}
-				if (Static191.anIntArray391[local5] == 1) {
-					Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
-				}
-				if (Static191.anIntArray391[local5] == 2) {
-					Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
-				}
-				if (Static191.anIntArray391[local5] == 3) {
-					Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
-				}
-				if (Static191.anIntArray391[local5] == 4) {
-					local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150;
-					if (GlRenderer.enabled) {
-						GlRaster.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
-					} else {
-						SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
-					}
-					Fonts.b12Full.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0);
-					if (GlRenderer.enabled) {
-						GlRaster.method1187(arg2, arg0, arg1 + arg2, arg4 + arg0);
-					} else {
-						SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4);
-					}
-				}
-				if (Static191.anIntArray391[local5] == 5) {
-					@Pc(1372) int local1372 = 0;
-					local642 = 150 - Static191.anIntArray384[local5];
-					if (GlRenderer.enabled) {
-						GlRaster.method1183(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
-					} else {
-						SoftwareRaster.method2498(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
-					}
-					if (local642 < 25) {
-						local1372 = local642 - 25;
-					} else if (local642 > 125) {
-						local1372 = local642 - 125;
-					}
-					Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
-					if (GlRenderer.enabled) {
-						GlRaster.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4);
-					} else {
-						SoftwareRaster.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4);
-					}
-				}
-			} else {
-				Fonts.b12Full.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
-			}
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java
index 494e681..957197b 100644
--- a/client/src/main/java/rt4/Static145.java
+++ b/client/src/main/java/rt4/Static145.java
@@ -81,13 +81,4 @@ public final class Static145 {
 		Static121.method2407(Static183.anInt4271, Static229.anInt5138, Static13.anInt436, Static24.anInt761);
 	}
 
-	@OriginalMember(owner = "client!lf", name = "a", descriptor = "(IIIIB)V")
-	public static void method2745(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(10, arg0);
-		local8.pushServer();
-		local8.intArg3 = arg2;
-		local8.intArg1 = arg3;
-		local8.intArg2 = arg1;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static146.java b/client/src/main/java/rt4/Static146.java
index ddc562c..f887173 100644
--- a/client/src/main/java/rt4/Static146.java
+++ b/client/src/main/java/rt4/Static146.java
@@ -15,9 +15,6 @@ public final class Static146 {
 	@OriginalMember(owner = "client!lg", name = "c", descriptor = "[Lclient!tk;")
 	public static final SeqType[] aClass144Array1 = new SeqType[14];
 
-	@OriginalMember(owner = "client!lg", name = "k", descriptor = "I")
-	public static int anInt3508 = 99;
-
 	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
 	public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) JagString arg1) {
 		@Pc(6) int local6 = arg0.offset;
@@ -30,8 +27,8 @@ public final class Static146 {
 	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(I)V")
 	public static void method2750(@OriginalArg(0) int arg0) {
 		Static235.anInt5276 = arg0;
-		for (@Pc(3) int local3 = 0; local3 < Static152.mapSizeX; local3++) {
-			for (@Pc(8) int local8 = 0; local8 < Static99.mapSizeZ; local8++) {
+		for (@Pc(3) int local3 = 0; local3 < SceneGraph.mapSizeX; local3++) {
+			for (@Pc(8) int local8 = 0; local8 < SceneGraph.mapSizeZ; local8++) {
 				if (SceneGraph.tiles[arg0][local3][local8] == null) {
 					SceneGraph.tiles[arg0][local3][local8] = new Tile(arg0, local3, local8);
 				}
diff --git a/client/src/main/java/rt4/Static147.java b/client/src/main/java/rt4/Static147.java
index dbf1ce3..99cfe8a 100644
--- a/client/src/main/java/rt4/Static147.java
+++ b/client/src/main/java/rt4/Static147.java
@@ -56,9 +56,9 @@ public final class Static147 {
 			@Pc(160) int local160 = Static68.anIntArray164[local22];
 			@Pc(164) int local164 = Static68.anIntArray164[local29];
 			if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) {
-				if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.centerX, Static131.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
-					Static56.anInt1742 = arg5;
-					Static116.anInt2954 = arg6;
+				if (MiniMenu.aBoolean187 && Static19.method583(MiniMenu.anInt2388 + Rasteriser.centerX, MiniMenu.anInt3259 + Rasteriser.centerY, local156, local160, local164, local39, local148, local152)) {
+					MiniMenu.anInt1742 = arg5;
+					MiniMenu.anInt2954 = arg6;
 				}
 				if (!GlRenderer.enabled && !arg7) {
 					Rasteriser.testX = false;
diff --git a/client/src/main/java/rt4/Static148.java b/client/src/main/java/rt4/Static148.java
index 82d80e4..8d3fcd5 100644
--- a/client/src/main/java/rt4/Static148.java
+++ b/client/src/main/java/rt4/Static148.java
@@ -15,16 +15,13 @@ public final class Static148 {
 	@OriginalMember(owner = "client!li", name = "x", descriptor = "I")
 	public static int screenUpperY;
 
-	@OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;")
-	public static final JagString REBUILD = JagString.parse("::rebuild");
-
-	@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
+    @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
 	public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		VarpDomain.activeVarps[arg0] = arg1;
-		@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0);
+		@Pc(21) LongNode local21 = (LongNode) VarpDomain.aClass133_20.get((long) arg0);
 		if (local21 == null) {
 			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
-			Static199.aClass133_20.put(local21, (long) arg0);
+			VarpDomain.aClass133_20.put(local21, (long) arg0);
 		} else {
 			local21.value = MonotonicClock.currentTimeMillis() + 500L;
 		}
diff --git a/client/src/main/java/rt4/Static149.java b/client/src/main/java/rt4/Static149.java
index a9d239d..ca07b63 100644
--- a/client/src/main/java/rt4/Static149.java
+++ b/client/src/main/java/rt4/Static149.java
@@ -1,13 +1,9 @@
 package rt4;
 
-import java.awt.Image;
 import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static149 {
 
-	@OriginalMember(owner = "client!lj", name = "y", descriptor = "Ljava/awt/Image;")
-	public static Image anImage3;
-
 	@OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
 	public static int anInt3555;
 
diff --git a/client/src/main/java/rt4/Static15.java b/client/src/main/java/rt4/Static15.java
index f6517c3..367f8e1 100644
--- a/client/src/main/java/rt4/Static15.java
+++ b/client/src/main/java/rt4/Static15.java
@@ -1,35 +1,38 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public final class Static15 {
 
+	@OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;")
+	public static final JagString aClass100_268 = JagString.parse(")4");
+	@OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;")
+	public static final JagString aClass100_518 = JagString.parse("www");
+	@OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;")
+	public static final JagString aClass100_365 = JagString.parse("www)2wtqa");
+	@OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;")
+	public static final JagString aClass100_687 = JagString.parse(")4p=");
+	@OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;")
+	public static final JagString aClass100_424 = JagString.parse("http:)4)4");
+	@OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;")
+	public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
+	@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
+	public static final JagString aClass100_98 = JagString.parse(")4a=");
 	@OriginalMember(owner = "client!be", name = "Vb", descriptor = "F")
 	public static float aFloat4;
 
-	@OriginalMember(owner = "client!be", name = "ib", descriptor = "Lclient!na;")
-	public static final JagString EVENT_OPBASE = JagString.parse("event_opbase");
-
-	@OriginalMember(owner = "client!be", name = "Ec", descriptor = "I")
-	public static int anInt506 = -1;
-
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
 	public static JagString method479() {
-		@Pc(8) JagString local8 = Static93.aClass100_518;
+		@Pc(8) JagString local8 = aClass100_518;
 		@Pc(10) JagString local10 = JagString.EMPTY;
 		if (client.modeWhere != 0) {
-			local8 = Static50.aClass100_365;
+			local8 = aClass100_365;
 		}
 		if (client.settings != null) {
-			local10 = JagString.concatenate(new JagString[] { Static150.aClass100_687, client.settings});
+			local10 = JagString.concatenate(new JagString[] { aClass100_687, client.settings});
 		}
-		return JagString.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(client.language), Static257.aClass100_98, Static123.parseInt(client.affiliate), local10, Static41.aClass100_268 });
+		return JagString.concatenate(new JagString[] { aClass100_424, local8, aClass100_886, JagString.parseInt(client.language), aClass100_98, JagString.parseInt(client.affiliate), local10, aClass100_268 });
 	}
 
-	@OriginalMember(owner = "client!be", name = "a", descriptor = "(II)I")
-	public static int method492(@OriginalArg(1) int arg0) {
-		return arg0 == 16711935 ? -1 : ColorUtils.rgbToHsl(arg0);
-	}
 }
diff --git a/client/src/main/java/rt4/Static150.java b/client/src/main/java/rt4/Static150.java
index f0005de..fdc8d42 100644
--- a/client/src/main/java/rt4/Static150.java
+++ b/client/src/main/java/rt4/Static150.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static150 {
 
-	@OriginalMember(owner = "client!lk", name = "J", descriptor = "Lclient!na;")
-	public static final JagString aClass100_687 = JagString.parse(")4p=");
-
     @OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
 	public static int anInt3582 = 0;
 
diff --git a/client/src/main/java/rt4/Static152.java b/client/src/main/java/rt4/Static152.java
index 5d4cf0d..52af51f 100644
--- a/client/src/main/java/rt4/Static152.java
+++ b/client/src/main/java/rt4/Static152.java
@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static152 {
 
-	@OriginalMember(owner = "client!ma", name = "i", descriptor = "I")
-	public static int mapSizeX;
-
-	@OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
+    @OriginalMember(owner = "client!ma", name = "z", descriptor = "I")
 	public static int anInt3604 = -1;
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(IIBIIII)V")
diff --git a/client/src/main/java/rt4/Static154.java b/client/src/main/java/rt4/Static154.java
index c6c9679..b002fb8 100644
--- a/client/src/main/java/rt4/Static154.java
+++ b/client/src/main/java/rt4/Static154.java
@@ -9,9 +9,6 @@ public final class Static154 {
     @OriginalMember(owner = "client!md", name = "S", descriptor = "I")
 	public static int anInt3709;
 
-	@OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;")
-	public static final JagString MM = JagString.parse("::mm");
-
     @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z")
 	public static boolean method2926(@OriginalArg(0) Component arg0) {
 		if (arg0.anIntArray43 == null) {
diff --git a/client/src/main/java/rt4/Static156.java b/client/src/main/java/rt4/Static156.java
index 2c346d9..a8e4431 100644
--- a/client/src/main/java/rt4/Static156.java
+++ b/client/src/main/java/rt4/Static156.java
@@ -17,13 +17,13 @@ public final class Static156 {
 	public static void method2954(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte[][][] arg5, @OriginalArg(6) int[] arg6, @OriginalArg(7) int[] arg7, @OriginalArg(8) int[] arg8, @OriginalArg(9) int[] arg9, @OriginalArg(10) int[] arg10, @OriginalArg(11) int arg11, @OriginalArg(12) byte arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14) {
 		if (arg0 < 0) {
 			arg0 = 0;
-		} else if (arg0 >= Static152.mapSizeX * 128) {
-			arg0 = Static152.mapSizeX * 128 - 1;
+		} else if (arg0 >= SceneGraph.mapSizeX * 128) {
+			arg0 = SceneGraph.mapSizeX * 128 - 1;
 		}
 		if (arg2 < 0) {
 			arg2 = 0;
-		} else if (arg2 >= Static99.mapSizeZ * 128) {
-			arg2 = Static99.mapSizeZ * 128 - 1;
+		} else if (arg2 >= SceneGraph.mapSizeZ * 128) {
+			arg2 = SceneGraph.mapSizeZ * 128 - 1;
 		}
 		Static109.anInt2886 = MathUtils.sin[arg3];
 		Static121.anInt3038 = MathUtils.cos[arg3];
@@ -43,12 +43,12 @@ public final class Static156 {
 			Static80.anInt4698 = 0;
 		}
 		Static2.anInt15 = Static167.anInt4069 + Static277.tileVisibilityDistance;
-		if (Static2.anInt15 > Static152.mapSizeX) {
-			Static2.anInt15 = Static152.mapSizeX;
+		if (Static2.anInt15 > SceneGraph.mapSizeX) {
+			Static2.anInt15 = SceneGraph.mapSizeX;
 		}
 		Static215.anInt4866 = Static193.anInt4539 + Static277.tileVisibilityDistance;
-		if (Static215.anInt4866 > Static99.mapSizeZ) {
-			Static215.anInt4866 = Static99.mapSizeZ;
+		if (Static215.anInt4866 > SceneGraph.mapSizeZ) {
+			Static215.anInt4866 = SceneGraph.mapSizeZ;
 		}
 		@Pc(99) short local99;
 		if (GlRenderer.enabled) {
@@ -64,7 +64,7 @@ public final class Static156 {
 				@Pc(140) int local140 = (local113 - Static277.tileVisibilityDistance << 7) - (Static217.anInt4903 & 0x7F);
 				@Pc(146) int local146 = Static167.anInt4069 + local104 - Static277.tileVisibilityDistance;
 				@Pc(152) int local152 = Static193.anInt4539 + local113 - Static277.tileVisibilityDistance;
-				if (local146 >= 0 && local152 >= 0 && local146 < Static152.mapSizeX && local152 < Static99.mapSizeZ) {
+				if (local146 >= 0 && local152 >= 0 && local146 < SceneGraph.mapSizeX && local152 < SceneGraph.mapSizeZ) {
 					@Pc(176) int local176;
 					if (Static80.underWaterTileHeightMap == null) {
 						local176 = SceneGraph.surfaceTileHeights[0][local146][local152] + 128 - Static123.anInt3947;
@@ -89,14 +89,14 @@ public final class Static156 {
 		Static234.anIntArray454 = arg9;
 		Static206.anIntArray427 = arg10;
 		Static123.method2419();
-		if (Static276.underWaterGroundTiles != null) {
+		if (SceneGraph.underWaterGroundTiles != null) {
 			Static278.setRenderTiles(true);
 			Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14);
 			if (GlRenderer.enabled) {
 				MaterialManager.renderingUnderwater = false;
 				MaterialManager.setMaterial(0, 0);
 				Static161.method3066(null);
-				Static120.method2390();
+				LightingManager.method2390();
 			}
 			Static278.setRenderTiles(false);
 		}
@@ -112,8 +112,8 @@ public final class Static156 {
 		local1.glPushAttrib(GL2.GL_FOG_BIT);
 		local1.glFogf(GL2.GL_FOG_START, (float) GlobalConfig.VIEW_DISTANCE - (GlobalConfig.VIEW_FADE_DISTANCE * 2.0f));
 		GlRenderer.disableDepthMask();
-		for (@Pc(19) int local19 = 0; local19 < Static36.surfaceHdTiles[0].length; local19++) {
-			@Pc(31) GlTile local31 = Static36.surfaceHdTiles[0][local19];
+		for (@Pc(19) int local19 = 0; local19 < SceneGraph.surfaceHdTiles[0].length; local19++) {
+			@Pc(31) GlTile local31 = SceneGraph.surfaceHdTiles[0][local19];
 			if (local31.anInt2485 >= 0 && Rasteriser.textureProvider.method3237(local31.anInt2485) == 4) {
 				local1.glColor4fv(Static190.method3441(local31.anInt2486), 0);
 				@Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F);
diff --git a/client/src/main/java/rt4/Static157.java b/client/src/main/java/rt4/Static157.java
deleted file mode 100644
index fedbbe6..0000000
--- a/client/src/main/java/rt4/Static157.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static157 {
-
-	@OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
-	public static int anInt3811 = 0;
-
-}
diff --git a/client/src/main/java/rt4/Static158.java b/client/src/main/java/rt4/Static158.java
index 1c58dc9..7614898 100644
--- a/client/src/main/java/rt4/Static158.java
+++ b/client/src/main/java/rt4/Static158.java
@@ -10,25 +10,24 @@ public final class Static158 {
 
 	@OriginalMember(owner = "client!mh", name = "X", descriptor = "I")
 	public static int anInt3851 = -1;
+    @OriginalMember(owner = "client!mg", name = "Q", descriptor = "I")
+    public static int anInt3811 = 0;
 
-	@OriginalMember(owner = "client!mh", name = "Y", descriptor = "Z")
-	public static boolean aBoolean187 = false;
-
-	@OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
+    @OriginalMember(owner = "client!mh", name = "h", descriptor = "(B)V")
 	public static void decodeNpcFiles() {
 		@Pc(10) int local10 = Static191.npcSpawnsFilesBuffer.length;
 		for (@Pc(16) int local16 = 0; local16 < local10; local16++) {
 			if (Static191.npcSpawnsFilesBuffer[local16] != null) {
 				@Pc(25) int local25 = -1;
-				for (@Pc(27) int local27 = 0; local27 < Static157.anInt3811; local27++) {
+				for (@Pc(27) int local27 = 0; local27 < anInt3811; local27++) {
 					if (Static217.anIntArray434[local27] == Static238.regionBitPacked[local16]) {
 						local25 = local27;
 						break;
 					}
 				}
 				if (local25 == -1) {
-					Static217.anIntArray434[Static157.anInt3811] = Static238.regionBitPacked[local16];
-					local25 = Static157.anInt3811++;
+					Static217.anIntArray434[anInt3811] = Static238.regionBitPacked[local16];
+					local25 = anInt3811++;
 				}
 				@Pc(67) int local67 = 0;
 				@Pc(74) Buffer local74 = new Buffer(Static191.npcSpawnsFilesBuffer[local16]);
@@ -44,7 +43,7 @@ public final class Static158 {
 					if (NpcList.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.size + local125 < 104 && local142 >= 0 && local142 + local148.size < 104) {
 						NpcList.npcs[local97] = new Npc();
 						@Pc(198) Npc local198 = NpcList.npcs[local97];
-						Static33.anIntArray79[Static272.anInt5214++] = local97;
+						NpcList.ids[NpcList.size++] = local97;
 						local198.lastSeenLoop = client.loop;
 						local198.setNpcType(local148);
 						local198.method2692(local198.type.size);
diff --git a/client/src/main/java/rt4/Static159.java b/client/src/main/java/rt4/Static159.java
index 5d16949..13b52d4 100644
--- a/client/src/main/java/rt4/Static159.java
+++ b/client/src/main/java/rt4/Static159.java
@@ -9,11 +9,8 @@ public final class Static159 {
 	@OriginalMember(owner = "client!mi", name = "Z", descriptor = "I")
 	public static int anInt3893;
 
-	@OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
-	public static final JagString aClass100_760 = JagString.parse(")1");
-
-	@OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")
-	public static final LinkedList[][][] aClass69ArrayArrayArray1 = new LinkedList[4][104][104];
+    @OriginalMember(owner = "client!mi", name = "Y", descriptor = "[[[Lclient!ih;")
+	public static final LinkedList[][][] objStacks = new LinkedList[4][104][104];
 
     @OriginalMember(owner = "client!mi", name = "a", descriptor = "([IBLclient!km;[I[I)V")
 	public static void method3037(@OriginalArg(0) int[] arg0, @OriginalArg(2) Npc arg1, @OriginalArg(3) int[] arg2, @OriginalArg(4) int[] arg3) {
diff --git a/client/src/main/java/rt4/Static16.java b/client/src/main/java/rt4/Static16.java
index 9df6b25..e5c8441 100644
--- a/client/src/main/java/rt4/Static16.java
+++ b/client/src/main/java/rt4/Static16.java
@@ -8,9 +8,6 @@ public final class Static16 {
     @OriginalMember(owner = "client!bf", name = "B", descriptor = "I")
 	public static int anInt548 = -1;
 
-	@OriginalMember(owner = "client!bf", name = "C", descriptor = "[I")
-	public static final int[] anIntArray51 = new int[] { 2, 2, 4, 2, 1, 8, 4, 1, 4, 4, 2, 1, 1, 1, 4, 1 };
-
 	@OriginalMember(owner = "client!bf", name = "G", descriptor = "I")
 	public static int anInt551 = 0;
 
@@ -30,54 +27,54 @@ public final class Static16 {
 					@Pc(54) Tile local54 = local30[local32][local42];
 					if (local54 != null) {
 						@Pc(71) GlModel local71;
-						if (local54.aClass15_1 != null && local54.aClass15_1.primary instanceof GlModel) {
-							local71 = (GlModel) local54.aClass15_1.primary;
-							if ((local54.aClass15_1.aLong26 & Long.MIN_VALUE) == 0L) {
+						if (local54.groundDecor != null && local54.groundDecor.primary instanceof GlModel) {
+							local71 = (GlModel) local54.groundDecor.primary;
+							if ((local54.groundDecor.key & Long.MIN_VALUE) == 0L) {
 								local71.method4111(false, true, true, false, true, true);
 							} else {
 								local71.method4111(true, true, true, true, true, true);
 							}
 						}
-						if (local54.aClass24_1 != null) {
-							if (local54.aClass24_1.primary instanceof GlModel) {
-								local71 = (GlModel) local54.aClass24_1.primary;
-								if ((local54.aClass24_1.key & Long.MIN_VALUE) == 0L) {
+						if (local54.wallDecor != null) {
+							if (local54.wallDecor.primary instanceof GlModel) {
+								local71 = (GlModel) local54.wallDecor.primary;
+								if ((local54.wallDecor.key & Long.MIN_VALUE) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
 								}
 							}
-							if (local54.aClass24_1.aClass8_2 instanceof GlModel) {
-								local71 = (GlModel) local54.aClass24_1.aClass8_2;
-								if ((Long.MIN_VALUE & local54.aClass24_1.key) == 0L) {
+							if (local54.wallDecor.aClass8_2 instanceof GlModel) {
+								local71 = (GlModel) local54.wallDecor.aClass8_2;
+								if ((Long.MIN_VALUE & local54.wallDecor.key) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
 								}
 							}
 						}
-						if (local54.aClass77_1 != null) {
-							if (local54.aClass77_1.primary instanceof GlModel) {
-								local71 = (GlModel) local54.aClass77_1.primary;
-								if ((local54.aClass77_1.key & Long.MIN_VALUE) == 0L) {
+						if (local54.wall != null) {
+							if (local54.wall.primary instanceof GlModel) {
+								local71 = (GlModel) local54.wall.primary;
+								if ((local54.wall.key & Long.MIN_VALUE) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
 								}
 							}
-							if (local54.aClass77_1.aClass8_6 instanceof GlModel) {
-								local71 = (GlModel) local54.aClass77_1.aClass8_6;
-								if ((Long.MIN_VALUE & local54.aClass77_1.key) == 0L) {
+							if (local54.wall.aClass8_6 instanceof GlModel) {
+								local71 = (GlModel) local54.wall.aClass8_6;
+								if ((Long.MIN_VALUE & local54.wall.key) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
 								}
 							}
 						}
-						for (@Pc(270) int local270 = 0; local270 < local54.anInt662; local270++) {
-							if (local54.aClass31Array1[local270].primary instanceof GlModel) {
-								@Pc(293) GlModel local293 = (GlModel) local54.aClass31Array1[local270].primary;
-								if ((Long.MIN_VALUE & local54.aClass31Array1[local270].aLong56) == 0L) {
+						for (@Pc(270) int local270 = 0; local270 < local54.sceneryLen; local270++) {
+							if (local54.scenery[local270].primary instanceof GlModel) {
+								@Pc(293) GlModel local293 = (GlModel) local54.scenery[local270].primary;
+								if ((Long.MIN_VALUE & local54.scenery[local270].key) == 0L) {
 									local293.method4111(false, true, true, false, true, true);
 								} else {
 									local293.method4111(true, true, true, true, true, true);
diff --git a/client/src/main/java/rt4/Static160.java b/client/src/main/java/rt4/Static160.java
index 2845538..cfd4fbc 100644
--- a/client/src/main/java/rt4/Static160.java
+++ b/client/src/main/java/rt4/Static160.java
@@ -9,27 +9,24 @@ public final class Static160 {
 	@OriginalMember(owner = "client!mj", name = "g", descriptor = "Lclient!na;")
 	public static final JagString aClass100_761 = JagString.parse("(U3");
 
-	@OriginalMember(owner = "client!mj", name = "i", descriptor = "I")
-	public static int anInt3902 = 0;
-
-    @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
+	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V")
 	public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) {
 		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg0, arg1, arg2.anInt445 + arg0, arg2.anInt459 + arg1);
+			GlRaster.setClip(arg0, arg1, arg2.anInt445 + arg0, arg2.anInt459 + arg1);
 		}
-		if (Static270.minimapState >= 3) {
+		if (MiniMap.state >= 3) {
 			if (GlRenderer.enabled) {
 				@Pc(44) Sprite local44 = arg2.method489(false);
 				if (local44 != null) {
-					local44.method1423(arg0, arg1);
+					local44.renderTransparent(arg0, arg1);
 				}
 			} else {
 				SoftwareRaster.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45);
 			}
 		} else if (GlRenderer.enabled) {
-			((GlSprite) Static106.compass).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
+			((GlSprite) Static106.compass).renderRotatedTransparent(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, 256, (GlSprite) arg2.method489(false));
 		} else {
-			((SoftwareSprite) Static106.compass).drawCompass(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
+			((SoftwareSprite) Static106.compass).renderRotatedTransparent(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.compass.width / 2, Static106.compass.height / 2, (int)Camera.yawTarget, arg2.anIntArray37, arg2.anIntArray45);
 		}
 		InterfaceList.rectangleRedraw[arg3] = true;
 	}
diff --git a/client/src/main/java/rt4/Static163.java b/client/src/main/java/rt4/Static163.java
index f215ee4..90e6228 100644
--- a/client/src/main/java/rt4/Static163.java
+++ b/client/src/main/java/rt4/Static163.java
@@ -9,12 +9,6 @@ public final class Static163 {
 	@OriginalMember(owner = "client!n", name = "e", descriptor = "Lclient!na;")
 	public static final JagString aClass100_767 = JagString.parse(")2");
 
-	@OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V")
-	public static void method3096(@OriginalArg(0) int arg0) {
-		@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(3, arg0);
-		local8.pushClient();
-	}
-
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(IIIIII)V")
 	public static void method3105(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(11) int local11 = Static78.method1690(TextureOp29.anInt2869, arg2, TextureOp29.anInt5773);
diff --git a/client/src/main/java/rt4/Static164.java b/client/src/main/java/rt4/Static164.java
index 844f1f8..d59ef2d 100644
--- a/client/src/main/java/rt4/Static164.java
+++ b/client/src/main/java/rt4/Static164.java
@@ -125,7 +125,7 @@ public final class Static164 {
 				return false;
 			}
 		}
-		local14 = Static20.method602(arg4, arg0 + 0, arg2);
+		local14 = SceneGraph.method602(arg4, arg0 + 0, arg2);
 		if (local14 != 0L) {
 			local28 = (int) local14 >> 20 & 0x3;
 			local35 = (int) (local14 >>> 32) & Integer.MAX_VALUE;
@@ -220,10 +220,10 @@ public final class Static164 {
 			local133.method314(arg0);
 		}
 		if (local5.certificateTemplate != -1) {
-			local71.method1423(0, 0);
+			local71.renderTransparent(0, 0);
 		} else if (local5.lentTemplate != -1) {
 			SoftwareRaster.method2491(local71.pixels, 36, 32);
-			local133.method1423(0, 0);
+			local133.renderTransparent(0, 0);
 			local133 = local71;
 		}
 		if (arg3 && (local5.stackable == 1 || arg5 != 1) && arg5 != -1) {
diff --git a/client/src/main/java/rt4/Static167.java b/client/src/main/java/rt4/Static167.java
index ee813d1..dd42ef2 100644
--- a/client/src/main/java/rt4/Static167.java
+++ b/client/src/main/java/rt4/Static167.java
@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static167 {
 
@@ -12,21 +10,4 @@ public final class Static167 {
 	@OriginalMember(owner = "client!nd", name = "y", descriptor = "Lclient!mm;")
 	public static SoftwareSprite aClass3_Sub2_Sub1_Sub1_3;
 
-	@OriginalMember(owner = "client!nd", name = "b", descriptor = "Lclient!na;")
-	public static final JagString aClass100_780 = JagString.parse("Clientscript error in: ");
-
-	@OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;")
-	public static final JagString aClass100_783 = JagString.parse(")4p=");
-
-	@OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V")
-	public static void setInactive(@OriginalArg(1) PcmStream arg0) {
-		if (arg0.aClass3_Sub16_5 != null) {
-			arg0.aClass3_Sub16_5.anInt3313 = 0;
-		}
-		arg0.aBoolean292 = false;
-		for (@Pc(14) PcmStream local14 = arg0.method4406(); local14 != null; local14 = arg0.method4409()) {
-			setInactive(local14);
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static169.java b/client/src/main/java/rt4/Static169.java
index 3c77a8a..60a7bbf 100644
--- a/client/src/main/java/rt4/Static169.java
+++ b/client/src/main/java/rt4/Static169.java
@@ -72,12 +72,4 @@ public final class Static169 {
 		}
 	}
 
-	@OriginalMember(owner = "client!nf", name = "a", descriptor = "(II[BB)I")
-	public static int crc32(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
-		@Pc(5) int local5 = -1;
-		for (@Pc(15) int local15 = arg0; local15 < arg1; local15++) {
-			local5 = local5 >>> 8 ^ HuffmanCodec.anIntArray175[(local5 ^ arg2[local15]) & 0xFF];
-		}
-		return ~local5;
-	}
 }
diff --git a/client/src/main/java/rt4/Static17.java b/client/src/main/java/rt4/Static17.java
index 22fdb23..bf02233 100644
--- a/client/src/main/java/rt4/Static17.java
+++ b/client/src/main/java/rt4/Static17.java
@@ -6,11 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static17 {
 
-	@OriginalMember(owner = "client!bg", name = "d", descriptor = "(II)Z")
-	public static boolean method530(@OriginalArg(0) int arg0) {
-		return arg0 == 198 || arg0 == 230 || arg0 == 156 || arg0 == 140 || arg0 == 223;
-	}
-
 	@OriginalMember(owner = "client!bg", name = "a", descriptor = "(Lclient!be;ZI)V")
 	public static void method531(@OriginalArg(0) Component arg0, @OriginalArg(1) boolean arg1) {
 		@Pc(20) int local20 = arg0.anInt486 == 0 ? arg0.anInt445 : arg0.anInt486;
diff --git a/client/src/main/java/rt4/Static170.java b/client/src/main/java/rt4/Static170.java
index a079661..74966f0 100644
--- a/client/src/main/java/rt4/Static170.java
+++ b/client/src/main/java/rt4/Static170.java
@@ -22,12 +22,12 @@ public final class Static170 {
 		local6.anInt732 = arg1 * 128 + 64;
 		local6.anInt736 = arg2 * 128 + 64;
 		local6.anInt733 = arg3;
-		local6.aLong26 = arg5;
+		local6.key = arg5;
 		local6.aBoolean49 = arg6;
 		if (SceneGraph.tiles[arg0][arg1][arg2] == null) {
 			SceneGraph.tiles[arg0][arg1][arg2] = new Tile(arg0, arg1, arg2);
 		}
-		SceneGraph.tiles[arg0][arg1][arg2].aClass15_1 = local6;
+		SceneGraph.tiles[arg0][arg1][arg2].groundDecor = local6;
 	}
 
 	@OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V")
diff --git a/client/src/main/java/rt4/Static171.java b/client/src/main/java/rt4/Static171.java
index 8579e52..6bcf265 100644
--- a/client/src/main/java/rt4/Static171.java
+++ b/client/src/main/java/rt4/Static171.java
@@ -10,9 +10,6 @@ public final class Static171 {
 	@OriginalMember(owner = "client!ni", name = "h", descriptor = "I")
 	public static int anInt4153;
 
-    @OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;")
-	public static Loc_Class139 aClass139_1 = new Loc_Class139();
-
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I")
 	public static int method3218(@OriginalArg(1) JagString arg0) {
 		if (WorldMap.labels == null || arg0.length() == 0) {
diff --git a/client/src/main/java/rt4/Static173.java b/client/src/main/java/rt4/Static173.java
index 0000a0a..6c92150 100644
--- a/client/src/main/java/rt4/Static173.java
+++ b/client/src/main/java/rt4/Static173.java
@@ -19,8 +19,8 @@ public final class Static173 {
 		@Pc(149) int local149;
 		@Pc(158) int local158;
 		@Pc(171) int local171;
-		for (local7 = 0; local7 < Static272.anInt5214; local7++) {
-			local16 = NpcList.npcs[Static33.anIntArray79[local7]];
+		for (local7 = 0; local7 < NpcList.size; local7++) {
+			local16 = NpcList.npcs[NpcList.ids[local7]];
 			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
 				@Pc(42) int local42 = local16.getSize();
 				@Pc(97) int local97;
@@ -57,9 +57,9 @@ public final class Static173 {
 				}
 			}
 		}
-		label200: for (local7 = 0; local7 < Static272.anInt5214; local7++) {
-			local16 = NpcList.npcs[Static33.anIntArray79[local7]];
-			@Pc(262) long local262 = (long) Static33.anIntArray79[local7] << 32 | 0x20000000L;
+		label200: for (local7 = 0; local7 < NpcList.size; local7++) {
+			local16 = NpcList.npcs[NpcList.ids[local7]];
+			@Pc(262) long local262 = (long) NpcList.ids[local7] << 32 | 0x20000000L;
 			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.isMultiNpcValid()) {
 				local107 = local16.getSize();
 				if (local107 == 1) {
diff --git a/client/src/main/java/rt4/Static176.java b/client/src/main/java/rt4/Static176.java
index a577dc2..ff56a4f 100644
--- a/client/src/main/java/rt4/Static176.java
+++ b/client/src/main/java/rt4/Static176.java
@@ -6,6 +6,16 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static176 {
 
+	@OriginalMember(owner = "client!wk", name = "x", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1107 = JagString.parse(")4l=");
+    @OriginalMember(owner = "client!cg", name = "e", descriptor = "Lclient!na;")
+    public static final JagString aClass100_184 = JagString.parse("1");
+	@OriginalMember(owner = "client!ch", name = "x", descriptor = "Lclient!na;")
+	public static final JagString aClass100_193 = JagString.parse(":");
+	@OriginalMember(owner = "client!em", name = "u", descriptor = "Lclient!na;")
+	public static final JagString aClass100_420 = JagString.parse(")1o");
+	@OriginalMember(owner = "client!nd", name = "x", descriptor = "Lclient!na;")
+	public static final JagString aClass100_783 = JagString.parse(")4p=");
 	@OriginalMember(owner = "client!ob", name = "f", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_76;
 
@@ -39,13 +49,13 @@ public final class Static176 {
 		} else {
 			@Pc(62) JagString local62 = Static211.aClass100_230;
 			if (client.modeWhere != 0) {
-				local62 = JagString.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.id + 7000) });
+				local62 = JagString.concatenate(new JagString[] { aClass100_193, JagString.parseInt(local3.id + 7000) });
 			}
 			@Pc(89) JagString local89 = Static211.aClass100_230;
 			if (client.settings != null) {
-				local89 = JagString.concatenate(new JagString[] { Static167.aClass100_783, client.settings});
+				local89 = JagString.concatenate(new JagString[] { aClass100_783, client.settings});
 			}
-			@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.hostname, local62, Static279.aClass100_1107, Static123.parseInt(client.language), aClass100_801, Static123.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, client.javaScript ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? Static30.aClass100_184 : Static260.aClass100_945 });
+			@Pc(182) JagString local182 = JagString.concatenate(new JagString[] { Static115.aClass100_582, local3.hostname, local62, aClass100_1107, JagString.parseInt(client.language), aClass100_801, JagString.parseInt(client.affiliate), local89, Static139.aClass100_659, client.objectTag ? aClass100_184 : Static260.aClass100_945, aClass100_420, client.javaScript ? aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, client.advertSuppressed ? aClass100_184 : Static260.aClass100_945 });
 			try {
 				client.instance.getAppletContext().showDocument(local182.method3107(), "_self");
 				return true;
@@ -55,203 +65,6 @@ public final class Static176 {
 		}
 	}
 
-	@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIIIB)V")
-	public static void method3304(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
-		@Pc(15) int local15;
-		@Pc(47) int local47;
-		if (Static260.anInt5014 == 0) {
-			@Pc(13) int local13 = Static148.screenUpperY;
-			local15 = Static1.screenLowerY;
-			@Pc(17) int local17 = Static247.screenUpperX;
-			@Pc(19) int local19 = Static240.screenLowerX;
-			@Pc(33) int local33 = (arg5 - arg3) * (local17 - local19) / arg1 + local19;
-			local47 = local15 + (local13 - local15) * (arg4 - arg0) / arg2;
-			if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) {
-				@Pc(61) Component local61 = Static201.method1418(Static98.anInt2512, Static15.anInt506);
-				if (local61 == null) {
-					Static53.method1294();
-				} else {
-					MiniMenu.add(Static246.anInt5393, 0L, Static225.aClass100_961, local33, (short) 11, MiniMenu.aClass100_545, local47);
-				}
-			} else {
-				if (client.game == 1) {
-					MiniMenu.add(-1, 0L, JagString.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, local47);
-				}
-				MiniMenu.add(-1, 0L, JagString.EMPTY, local33, (short) 60, Static195.walkText, local47);
-			}
-		}
-		@Pc(112) long local112 = -1L;
-		for (local15 = 0; local15 < Static2.anInt7; local15++) {
-			@Pc(121) long local121 = Static259.aLongArray11[local15];
-			local47 = (int) local121 & 0x7F;
-			@Pc(133) int local133 = (int) local121 >> 29 & 0x3;
-			@Pc(140) int local140 = (int) (local121 >>> 32) & Integer.MAX_VALUE;
-			@Pc(147) int local147 = (int) local121 >> 7 & 0x7F;
-			if (local121 != local112) {
-				local112 = local121;
-				@Pc(240) int local240;
-				if (local133 == 2 && Static257.method523(Player.level, local47, local147, local121)) {
-					@Pc(172) LocType local172 = LocTypeList.get(local140);
-					if (local172.multiLocs != null) {
-						local172 = local172.getMultiLoc();
-					}
-					if (local172 == null) {
-						continue;
-					}
-					if (Static260.anInt5014 == 1) {
-						MiniMenu.add(Static169.anInt4075, local121, JagString.concatenate(new JagString[] { MiniMenu.aClass100_203, Static27.aClass100_164, local172.name}), local47, (short) 14, LocalizedText.USE, local147);
-					} else if (Static241.aBoolean302) {
-						@Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
-						if ((Static274.anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) {
-							MiniMenu.add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static27.aClass100_164, local172.name}), local47, (short) 38, MiniMenu.aClass100_545, local147);
-						}
-					} else {
-						@Pc(228) JagString[] local228 = local172.ops;
-						if (Static208.aBoolean237) {
-							local228 = Static279.method4664(local228);
-						}
-						if (local228 != null) {
-							for (local240 = 4; local240 >= 0; local240--) {
-								if (local228[local240] != null) {
-									@Pc(254) short local254 = 0;
-									if (local240 == 0) {
-										local254 = 42;
-									}
-									if (local240 == 1) {
-										local254 = 50;
-									}
-									@Pc(268) int local268 = -1;
-									if (local240 == 2) {
-										local254 = 49;
-									}
-									if (local172.cursor1Op == local240) {
-										local268 = local172.cursor1;
-									}
-									if (local240 == 3) {
-										local254 = 46;
-									}
-									if (local240 == local172.cursor2Op) {
-										local268 = local172.cursor2;
-									}
-									if (local240 == 4) {
-										local254 = 1001;
-									}
-									MiniMenu.add(local268, local121, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, local254, local228[local240], local147);
-								}
-							}
-						}
-						MiniMenu.add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), local47, (short) 1004, LocalizedText.EXAMINE, local147);
-					}
-				}
-				@Pc(514) int local514;
-				@Pc(526) int local526;
-				@Pc(479) int local479;
-				@Pc(493) int local493;
-				@Pc(502) Npc local502;
-				@Pc(597) Player local597;
-				if (local133 == 1) {
-					@Pc(421) Npc local421 = NpcList.npcs[local140];
-					if ((local421.type.size & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.size & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
-						local479 = local421.xFine + 64 - local421.type.size * 64;
-						local240 = local421.zFine - (local421.type.size - 1) * 64;
-						for (local493 = 0; local493 < Static272.anInt5214; local493++) {
-							local502 = NpcList.npcs[Static33.anIntArray79[local493]];
-							local514 = local502.xFine + 64 - local502.type.size * 64;
-							local526 = local502.zFine + 64 - local502.type.size * 64;
-							if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.size - (local514 - local479 >> 7) >= local502.type.size && local240 <= local526 && local502.type.size <= local421.type.size - (local526 - local240 >> 7)) {
-								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
-							}
-						}
-						for (local493 = 0; local493 < PlayerList.size; local493++) {
-							local597 = PlayerList.players[PlayerList.ids[local493]];
-							local514 = local597.xFine + 64 - local597.getSize() * 64;
-							local526 = local597.zFine + 64 - local597.getSize() * 64;
-							if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.size - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.size - (local526 - local240 >> 7)) {
-								Static217.method3767(PlayerList.ids[local493], local147, local597, local47);
-							}
-						}
-					}
-					Static246.method4240(local421.type, local47, local140, local147);
-				}
-				if (local133 == 0) {
-					@Pc(688) Player local688 = PlayerList.players[local140];
-					if ((local688.xFine & 0x7F) == 64 && (local688.zFine & 0x7F) == 64) {
-						local479 = local688.xFine - (local688.getSize() - 1) * 64;
-						local240 = local688.zFine + 64 - local688.getSize() * 64;
-						for (local493 = 0; local493 < Static272.anInt5214; local493++) {
-							local502 = NpcList.npcs[Static33.anIntArray79[local493]];
-							local514 = local502.xFine + 64 - local502.type.size * 64;
-							local526 = local502.zFine + 64 - local502.type.size * 64;
-							if (local502 != null && local514 >= local479 && local502.type.size <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.size <= local688.getSize() - (local526 - local240 >> 7)) {
-								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
-							}
-						}
-						for (local493 = 0; local493 < PlayerList.size; local493++) {
-							local597 = PlayerList.players[PlayerList.ids[local493]];
-							local514 = local597.xFine - (local597.getSize() - 1) * 64;
-							local526 = local597.zFine + 64 - local597.getSize() * 64;
-							if (local597 != null && local597 != local688 && local479 <= local514 && local597.getSize() <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local688.getSize() - (local526 - local240 >> 7)) {
-								Static217.method3767(PlayerList.ids[local493], local147, local597, local47);
-							}
-						}
-					}
-					Static217.method3767(local140, local147, local688, local47);
-				}
-				if (local133 == 3) {
-					@Pc(931) LinkedList local931 = Static159.aClass69ArrayArrayArray1[Player.level][local47][local147];
-					if (local931 != null) {
-						for (@Pc(940) ObjStackNode local940 = (ObjStackNode) local931.method2279(); local940 != null; local940 = (ObjStackNode) local931.method2286()) {
-							local240 = local940.aClass8_Sub7_1.anInt5555;
-							@Pc(951) ObjType local951 = ObjTypeList.get(local240);
-							if (Static260.anInt5014 == 1) {
-								MiniMenu.add(Static169.anInt4075, (long) local240, JagString.concatenate(new JagString[] { MiniMenu.aClass100_203, MiniMenu.aClass100_947, local951.name}), local47, (short) 33, LocalizedText.USE, local147);
-							} else if (Static241.aBoolean302) {
-								@Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
-								if ((Static274.anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) {
-									MiniMenu.add(Static246.anInt5393, (long) local240, JagString.concatenate(new JagString[] { Static78.aClass100_466, MiniMenu.aClass100_947, local951.name}), local47, (short) 39, MiniMenu.aClass100_545, local147);
-								}
-							} else {
-								@Pc(997) JagString[] local997 = local951.ops;
-								if (Static208.aBoolean237) {
-									local997 = Static279.method4664(local997);
-								}
-								for (local514 = 4; local514 >= 0; local514--) {
-									if (local997 != null && local997[local514] != null) {
-										@Pc(1025) byte local1025 = 0;
-										if (local514 == 0) {
-											local1025 = 21;
-										}
-										if (local514 == 1) {
-											local1025 = 34;
-										}
-										@Pc(1041) int local1041 = -1;
-										if (local514 == local951.cursor1Op) {
-											local1041 = local951.cursor1;
-										}
-										if (local514 == 2) {
-											local1025 = 18;
-										}
-										if (local951.cursor2Op == local514) {
-											local1041 = local951.cursor2;
-										}
-										if (local514 == 3) {
-											local1025 = 20;
-										}
-										if (local514 == 4) {
-											local1025 = 24;
-										}
-										MiniMenu.add(local1041, (long) local240, JagString.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, local1025, local997[local514], local147);
-									}
-								}
-								MiniMenu.add(Static225.anInt5073, (long) local240, JagString.concatenate(new JagString[] { Static8.aClass100_32, local951.name}), local47, (short) 1002, LocalizedText.EXAMINE, local147);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
 	@OriginalMember(owner = "client!ob", name = "a", descriptor = "(IIIIIIIIIIIIIIIIIIII)V")
 	public static void method3305(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12, @OriginalArg(13) int arg13, @OriginalArg(14) int arg14, @OriginalArg(15) int arg15, @OriginalArg(16) int arg16, @OriginalArg(17) int arg17, @OriginalArg(18) int arg18, @OriginalArg(19) int arg19) {
 		@Pc(12) PlainTile local12;
diff --git a/client/src/main/java/rt4/Static179.java b/client/src/main/java/rt4/Static179.java
index 950991f..c488c36 100644
--- a/client/src/main/java/rt4/Static179.java
+++ b/client/src/main/java/rt4/Static179.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static179 {
 
-	@OriginalMember(owner = "client!oe", name = "a", descriptor = "I")
-	public static int mouseRecorderPrevY = 0;
-
 	@OriginalMember(owner = "client!oe", name = "b", descriptor = "I")
 	public static int anInt4254 = 0;
 
diff --git a/client/src/main/java/rt4/Static18.java b/client/src/main/java/rt4/Static18.java
index b14a5ca..682e2e5 100644
--- a/client/src/main/java/rt4/Static18.java
+++ b/client/src/main/java/rt4/Static18.java
@@ -91,7 +91,7 @@ public final class Static18 {
 		if (local7 == null) {
 			return;
 		}
-		@Pc(13) WallDecor local13 = local7.aClass24_1;
+		@Pc(13) WallDecor local13 = local7.wallDecor;
 		if (local13 != null) {
 			local13.anInt1394 = local13.anInt1394 * arg3 / 16;
 			local13.anInt1392 = local13.anInt1392 * arg3 / 16;
diff --git a/client/src/main/java/rt4/Static180.java b/client/src/main/java/rt4/Static180.java
index ec169ca..886d6a7 100644
--- a/client/src/main/java/rt4/Static180.java
+++ b/client/src/main/java/rt4/Static180.java
@@ -12,9 +12,6 @@ public final class Static180 {
 	@OriginalMember(owner = "client!og", name = "e", descriptor = "Lclient!be;")
 	public static Component aClass13_22;
 
-	@OriginalMember(owner = "client!og", name = "g", descriptor = "[Lclient!na;")
-	public static JagString[] stringLocals;
-
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(BIILclient!fe;III)V")
 	public static void method3326(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) PathingEntity arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		Static198.method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3);
diff --git a/client/src/main/java/rt4/Static181.java b/client/src/main/java/rt4/Static181.java
index 4f50268..56ab5d9 100644
--- a/client/src/main/java/rt4/Static181.java
+++ b/client/src/main/java/rt4/Static181.java
@@ -2,17 +2,13 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static181 {
 
 	@OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;")
 	public static Sprite aClass3_Sub2_Sub1_9;
 
-	@OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;")
-	public static final JagString WM1 = JagString.parse("::wm1");
-
-	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V")
+    @OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V")
 	public static void method3340(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) {
 		if (arg5 >= TextureOp29.anInt4164 && arg5 <= TextureOp29.anInt5063 && arg0 >= TextureOp29.anInt4164 && arg0 <= TextureOp29.anInt5063 && arg6 >= TextureOp29.anInt4164 && TextureOp29.anInt5063 >= arg6 && TextureOp29.anInt4164 <= arg1 && arg1 <= TextureOp29.anInt5063 && TextureOp29.anInt5773 <= arg4 && arg4 <= TextureOp29.anInt2869 && arg7 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg7 && arg2 >= TextureOp29.anInt5773 && TextureOp29.anInt2869 >= arg2 && arg3 >= TextureOp29.anInt5773 && arg3 <= TextureOp29.anInt2869) {
 			Static38.method962(arg2, arg8, arg7, arg6, arg1, arg3, arg4, arg0, arg5);
@@ -23,13 +19,7 @@ public final class Static181 {
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(II)Lclient!na;")
 	public static JagString method3341(@OriginalArg(0) int arg0) {
-		return JagString.concatenate(new JagString[] { Static123.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, Static123.parseInt(arg0 & 0xFF) });
-	}
-
-	@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
-	public static void method3345(@OriginalArg(0) int arg0) {
-		@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(5, arg0);
-		local8.pushClient();
+		return JagString.concatenate(new JagString[] { JagString.parseInt(arg0 >> 24 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 16 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 >> 8 & 0xFF), Static233.aClass100_994, JagString.parseInt(arg0 & 0xFF) });
 	}
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
diff --git a/client/src/main/java/rt4/Static182.java b/client/src/main/java/rt4/Static182.java
index 9afe74c..0d2e3a3 100644
--- a/client/src/main/java/rt4/Static182.java
+++ b/client/src/main/java/rt4/Static182.java
@@ -6,7 +6,11 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static182 {
 
-	@OriginalMember(owner = "client!oj", name = "t", descriptor = "[I")
+    @OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;")
+    public static final JagString aClass100_1017 = JagString.parse(")1");
+    @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;")
+    public static final JagString aClass100_185 = JagString.parse(")3");
+    @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I")
 	public static int[] anIntArray372;
 
 	@OriginalMember(owner = "client!oj", name = "E", descriptor = "[[Lclient!hg;")
@@ -28,24 +32,24 @@ public final class Static182 {
 			arg3 = -arg3;
 			local9.method3113(Static73.aClass100_453);
 		}
-		@Pc(26) JagString local26 = Static244.aClass100_1017;
-		@Pc(28) JagString local28 = Static30.aClass100_185;
+		@Pc(26) JagString local26 = aClass100_1017;
+		@Pc(28) JagString local28 = aClass100_185;
 		if (arg0 == 1) {
-			local26 = Static30.aClass100_185;
-			local28 = Static244.aClass100_1017;
+			local26 = aClass100_185;
+			local28 = aClass100_1017;
 		}
 		if (arg0 == 2) {
-			local28 = Static244.aClass100_1017;
+			local28 = aClass100_1017;
 			local26 = Static26.aClass100_160;
 		}
 		if (arg0 == 3) {
-			local26 = Static30.aClass100_185;
-			local28 = Static244.aClass100_1017;
+			local26 = aClass100_185;
+			local28 = aClass100_1017;
 		}
 		@Pc(59) JagString local59 = Static87.allocate(0);
 		@Pc(61) int local61;
 		for (local61 = 0; local61 < arg2; local61++) {
-			local59.method3113(Static123.parseInt((int) (arg3 % 10L)));
+			local59.method3113(JagString.parseInt((int) (arg3 % 10L)));
 			arg3 /= 10L;
 		}
 		local61 = 0;
@@ -58,7 +62,7 @@ public final class Static182 {
 				if (arg1 && local61 != 0 && local61 % 3 == 0) {
 					local95.method3113(local26);
 				}
-				local95.method3113(Static123.parseInt((int) (arg3 % 10L)));
+				local95.method3113(JagString.parseInt((int) (arg3 % 10L)));
 				local61++;
 				arg3 /= 10L;
 			}
diff --git a/client/src/main/java/rt4/Static183.java b/client/src/main/java/rt4/Static183.java
index 12b65ce..49a3fab 100644
--- a/client/src/main/java/rt4/Static183.java
+++ b/client/src/main/java/rt4/Static183.java
@@ -15,17 +15,6 @@ public final class Static183 {
 	@OriginalMember(owner = "client!ok", name = "f", descriptor = "J")
 	public static long prevClickTime = 0L;
 
-	@OriginalMember(owner = "client!ok", name = "a", descriptor = "(Lclient!ab;Lclient!ab;I)V")
-	public static void method3331(@OriginalArg(0) Node arg0, @OriginalArg(1) Node arg1) {
-		if (arg0.aClass3_223 != null) {
-			arg0.unlink();
-		}
-		arg0.aClass3_222 = arg1;
-		arg0.aClass3_223 = arg1.aClass3_223;
-		arg0.aClass3_223.aClass3_222 = arg0;
-		arg0.aClass3_222.aClass3_223 = arg0;
-	}
-
 	@OriginalMember(owner = "client!ok", name = "a", descriptor = "(IIB)Lclient!ce;")
 	public static SecondaryLinkedList method3333(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList();
diff --git a/client/src/main/java/rt4/Static184.java b/client/src/main/java/rt4/Static184.java
index ebae0ae..7bf2b11 100644
--- a/client/src/main/java/rt4/Static184.java
+++ b/client/src/main/java/rt4/Static184.java
@@ -9,9 +9,6 @@ public final class Static184 {
     @OriginalMember(owner = "client!ol", name = "ib", descriptor = "I")
 	public static int cameraYaw;
 
-    @OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;")
-	public static final JagString aClass100_819 = JagString.parse("<col=00ff80>");
-
     @OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIIILclient!th;IJIIII)Z")
 	public static boolean method3387(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) Entity arg4, @OriginalArg(5) int arg5, @OriginalArg(6) long arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10) {
 		return arg4 == null ? true : Static105.method2256(arg0, arg7, arg8, arg9 + 1 - arg7, arg10 - arg8 + 1, arg1, arg2, arg3, arg4, arg5, true, arg6);
diff --git a/client/src/main/java/rt4/Static185.java b/client/src/main/java/rt4/Static185.java
index a1300a4..4c25967 100644
--- a/client/src/main/java/rt4/Static185.java
+++ b/client/src/main/java/rt4/Static185.java
@@ -22,8 +22,8 @@ public final class Static185 {
 				return;
 			}
 		}
-		if (arg2 < Static146.anInt3508) {
-			Static146.anInt3508 = arg2;
+		if (arg2 < SceneGraph.firstVisibleLevel) {
+			SceneGraph.firstVisibleLevel = arg2;
 		}
 		@Pc(62) LocType local62 = LocTypeList.get(arg5);
 		if (GlRenderer.enabled && local62.aBoolean216) {
@@ -127,8 +127,8 @@ public final class Static185 {
 					}
 					for (@Pc(560) int local560 = 0; local560 <= local84; local560++) {
 						for (@Pc(565) int local565 = 0; local565 <= local81; local565++) {
-							if (Static118.aByteArrayArrayArray9[arg2][arg7 + local560][local565 + arg8] < local541) {
-								Static118.aByteArrayArrayArray9[arg2][arg7 + local560][arg8 + local565] = (byte) local541;
+							if (SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][local565 + arg8] < local541) {
+								SceneGraph.aByteArrayArrayArray9[arg2][arg7 + local560][arg8 + local565] = (byte) local541;
 							}
 						}
 					}
@@ -149,7 +149,7 @@ public final class Static185 {
 			}
 			Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
 			if (arg1 && arg6 >= 12 && arg6 <= 17 && arg6 != 13 && arg2 > 0) {
-				Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4;
+				SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4;
 			}
 			if (local62.anInt4435 != 0 && arg4 != null) {
 				arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
@@ -168,35 +168,35 @@ public final class Static185 {
 			if (arg1) {
 				if (arg9 == 0) {
 					if (local62.aBoolean215) {
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
 					}
 					if (local62.aBoolean220) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
 					}
 				} else if (arg9 == 1) {
 					if (local62.aBoolean215) {
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
 					}
 					if (local62.aBoolean220) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
 					}
 				} else if (arg9 == 2) {
 					if (local62.aBoolean215) {
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
 					}
 					if (local62.aBoolean220) {
-						Static60.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
 					}
 				} else if (arg9 == 3) {
 					if (local62.aBoolean215) {
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
 					}
 					if (local62.aBoolean220) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
 					}
 				}
 			}
@@ -219,13 +219,13 @@ public final class Static185 {
 			Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
 			if (local62.aBoolean215 && arg1) {
 				if (arg9 == 0) {
-					Static118.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
+					SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
 				} else if (arg9 == 1) {
-					Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
+					SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
 				} else if (arg9 == 2) {
-					Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
+					SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
 				} else if (arg9 == 3) {
-					Static118.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
+					SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
 				}
 			}
 			if (local62.anInt4435 != 0 && arg4 != null) {
@@ -255,17 +255,17 @@ public final class Static185 {
 				Static262.method4508(arg2, arg7, arg8, local199, local1254, local1269, Static267.anIntArray517[arg9], Static267.anIntArray517[local1226], local261);
 				if (local62.aBoolean220 && arg1) {
 					if (arg9 == 0) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
 					} else if (arg9 == 1) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
-						Static60.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8 + 1] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
 					} else if (arg9 == 2) {
-						Static60.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7 + 1][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
 					} else if (arg9 == 3) {
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
-						Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x2;
+						SceneGraph.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x1;
 					}
 				}
 				if (local62.anInt4435 != 0 && arg4 != null) {
@@ -287,13 +287,13 @@ public final class Static185 {
 				Static262.method4508(arg2, arg7, arg8, local199, local387, null, Static78.anIntArray204[arg9], 0, local261);
 				if (local62.aBoolean215 && arg1) {
 					if (arg9 == 0) {
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8 + 1] = 50;
 					} else if (arg9 == 1) {
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8 + 1] = 50;
 					} else if (arg9 == 2) {
-						Static118.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7 + 1][arg8] = 50;
 					} else if (arg9 == 3) {
-						Static118.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
+						SceneGraph.aByteArrayArrayArray9[arg2][arg7][arg8] = 50;
 					}
 				}
 				if (local62.anInt4435 != 0 && arg4 != null) {
diff --git a/client/src/main/java/rt4/Static19.java b/client/src/main/java/rt4/Static19.java
index 565763b..d1a4fd5 100644
--- a/client/src/main/java/rt4/Static19.java
+++ b/client/src/main/java/rt4/Static19.java
@@ -32,7 +32,7 @@ public final class Static19 {
 
 	@OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I")
 	public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(19) int local19 = Rasteriser.palette[Static268.method4585(arg1, arg2)];
+		@Pc(19) int local19 = Rasteriser.palette[SoftwareModel.method4585(arg1, arg2)];
 		if (arg0 > 0) {
 			@Pc(31) int local31 = Rasteriser.textureProvider.method3238(arg0 & 0xFFFF);
 			@Pc(49) int local49;
diff --git a/client/src/main/java/rt4/Static193.java b/client/src/main/java/rt4/Static193.java
index f9e561a..0027ddd 100644
--- a/client/src/main/java/rt4/Static193.java
+++ b/client/src/main/java/rt4/Static193.java
@@ -9,12 +9,6 @@ public final class Static193 {
 	@OriginalMember(owner = "client!pi", name = "U", descriptor = "I")
 	public static int anInt4539;
 
-	@OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
-	public static final JagString aClass100_853 = JagString.parse("null");
-
-	@OriginalMember(owner = "client!pi", name = "V", descriptor = "[Lclient!na;")
-	public static final JagString[] aClass100Array134 = new JagString[100];
-
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "([[[B[[B[[B[[I[[F[[I[[B[[B[[FI[[F[[I[[I[[II)[Lclient!hg;")
 	public static GlTile[] method3501(@OriginalArg(0) byte[][][] arg0, @OriginalArg(1) byte[][] arg1, @OriginalArg(2) byte[][] arg2, @OriginalArg(3) int[][] arg3, @OriginalArg(4) float[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) byte[][] arg6, @OriginalArg(7) byte[][] arg7, @OriginalArg(8) float[][] arg8, @OriginalArg(9) int arg9, @OriginalArg(10) float[][] arg10, @OriginalArg(11) int[][] arg11, @OriginalArg(12) int[][] arg12, @OriginalArg(13) int[][] arg13) {
 		@Pc(9) int[][] local9 = new int[105][105];
diff --git a/client/src/main/java/rt4/Static194.java b/client/src/main/java/rt4/Static194.java
deleted file mode 100644
index 6540bcb..0000000
--- a/client/src/main/java/rt4/Static194.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static194 {
-
-	@OriginalMember(owner = "client!pj", name = "o", descriptor = "[I")
-	public static final int[] anIntArray398 = new int[220500];
-
-	@OriginalMember(owner = "client!pj", name = "p", descriptor = "[I")
-	public static final int[] anIntArray399 = new int[5];
-
-	@OriginalMember(owner = "client!pj", name = "q", descriptor = "[I")
-	public static final int[] anIntArray400 = new int[5];
-
-	@OriginalMember(owner = "client!pj", name = "r", descriptor = "[I")
-	public static final int[] anIntArray401 = new int[5];
-
-	@OriginalMember(owner = "client!pj", name = "s", descriptor = "[I")
-	public static final int[] anIntArray402 = new int[5];
-
-	@OriginalMember(owner = "client!pj", name = "t", descriptor = "[I")
-	public static final int[] anIntArray403 = new int[5];
-}
diff --git a/client/src/main/java/rt4/Static195.java b/client/src/main/java/rt4/Static195.java
index 431a1d0..3f2ea4e 100644
--- a/client/src/main/java/rt4/Static195.java
+++ b/client/src/main/java/rt4/Static195.java
@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static195 {
 
-	@OriginalMember(owner = "client!pk", name = "R", descriptor = "[[Lclient!hg;")
-	public static GlTile[][] underWaterHdTiles;
-
-	@OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
+    @OriginalMember(owner = "client!pk", name = "Y", descriptor = "I")
 	public static int anInt4581;
 
     @OriginalMember(owner = "client!pk", name = "bb", descriptor = "Lclient!na;")
diff --git a/client/src/main/java/rt4/Static196.java b/client/src/main/java/rt4/Static196.java
deleted file mode 100644
index 41ea351..0000000
--- a/client/src/main/java/rt4/Static196.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static196 {
-
-	@OriginalMember(owner = "client!pl", name = "f", descriptor = "Lclient!na;")
-	public static final JagString TRADEREQ = JagString.parse(":tradereq:");
-
-    @OriginalMember(owner = "client!pl", name = "a", descriptor = "(ZI)V")
-	public static void method3535(@OriginalArg(0) boolean arg0) {
-		Static221.anIntArray376 = new int[104];
-		Static139.anIntArray325 = new int[104];
-		Static146.anInt3508 = 99;
-		Static251.anIntArray479 = new int[104];
-		@Pc(14) byte local14;
-		if (arg0) {
-			local14 = 1;
-		} else {
-			local14 = 4;
-		}
-		SceneGraph.tileShapes = new byte[local14][104][104];
-		Static128.anIntArray293 = new int[104];
-		Static60.anIntArrayArrayArray6 = new int[local14][105][105];
-		Static118.aByteArrayArrayArray9 = new byte[local14][105][105];
-		SceneGraph.tileOverlays = new byte[local14][104][104];
-		Static279.anIntArray568 = new int[104];
-		SceneGraph.tileAngles = new byte[local14][104][104];
-		SceneGraph.tileUnderlays = new byte[local14][104][104];
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static197.java b/client/src/main/java/rt4/Static197.java
index 4502de4..d668a59 100644
--- a/client/src/main/java/rt4/Static197.java
+++ b/client/src/main/java/rt4/Static197.java
@@ -9,9 +9,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static197 {
 
-	@OriginalMember(owner = "client!pm", name = "cb", descriptor = "[[[Lclient!bj;")
-	public static Tile[][][] surfaceGroundTiles;
-
 	@OriginalMember(owner = "client!pm", name = "hb", descriptor = "I")
 	public static int anInt4620;
 
@@ -163,7 +160,7 @@ public final class Static197 {
 		if (arg1 > 0 && arg3 == 0) {
 			GameShell.thread.setPriority(5);
 			SoftwareRaster.frameBuffer = null;
-			Static268.method4580();
+			SoftwareModel.method4580();
 			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(200);
 			if (Preferences.highDetailLighting) {
 				Rasteriser.setBrightness(0.7F);
@@ -172,7 +169,7 @@ public final class Static197 {
 		} else if (arg1 == 0 && arg3 > 0) {
 			GameShell.thread.setPriority(1);
 			SoftwareRaster.frameBuffer = Static131.create(503, 765, GameShell.canvas);
-			Static268.method4583();
+			SoftwareModel.method4583();
 			Static76.method1643();
 			((Js5GlTextureProvider) Rasteriser.textureProvider).method3248(20);
 			if (Preferences.highDetailLighting) {
diff --git a/client/src/main/java/rt4/Static198.java b/client/src/main/java/rt4/Static198.java
index 05fe8d0..40f680a 100644
--- a/client/src/main/java/rt4/Static198.java
+++ b/client/src/main/java/rt4/Static198.java
@@ -9,41 +9,6 @@ public final class Static198 {
 	@OriginalMember(owner = "client!q", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_260 = JagString.parse(")1a2)1m");
 
-	@OriginalMember(owner = "client!q", name = "a", descriptor = "(BZII)Lclient!na;")
-	public static JagString method1025(@OriginalArg(1) boolean arg0, @OriginalArg(3) int arg1) {
-		@Pc(23) int local23 = 1;
-		@Pc(27) int local27 = arg1 / 10;
-		while (local27 != 0) {
-			local27 /= 10;
-			local23++;
-		}
-		@Pc(38) int local38 = local23;
-		if (arg1 < 0 || arg0) {
-			local38 = local23 + 1;
-		}
-		@Pc(46) byte[] local46 = new byte[local38];
-		if (arg1 < 0) {
-			local46[0] = 45;
-		} else if (arg0) {
-			local46[0] = 43;
-		}
-		for (@Pc(61) int local61 = 0; local61 < local23; local61++) {
-			@Pc(68) int local68 = arg1 % 10;
-			if (local68 < 0) {
-				local68 = -local68;
-			}
-			if (local68 > 9) {
-				local68 += 39;
-			}
-			local46[local38 - local61 - 1] = (byte) (local68 + 48);
-			arg1 /= 10;
-		}
-		@Pc(112) JagString local112 = new JagString();
-		local112.chars = local46;
-		local112.length = local38;
-		return local112;
-	}
-
 	@OriginalMember(owner = "client!q", name = "a", descriptor = "(IIIIIIBI)V")
 	public static void method1026(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6) {
 		if (arg5 < 128 || arg2 < 128 || arg5 > 13056 || arg2 > 13056) {
diff --git a/client/src/main/java/rt4/Static199.java b/client/src/main/java/rt4/Static199.java
index 8b53b35..7fba1e4 100644
--- a/client/src/main/java/rt4/Static199.java
+++ b/client/src/main/java/rt4/Static199.java
@@ -8,9 +8,6 @@ public final class Static199 {
 	@OriginalMember(owner = "client!qc", name = "cb", descriptor = "I")
 	public static int anInt4675;
 
-	@OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;")
-	public static HashTable aClass133_20 = new HashTable(16);
-
     @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I")
 	public static int method3594(@OriginalArg(1) int arg0) {
 		return arg0 >> 11 & 0x7F;
diff --git a/client/src/main/java/rt4/Static20.java b/client/src/main/java/rt4/Static20.java
index 82a1f3b..cacaf70 100644
--- a/client/src/main/java/rt4/Static20.java
+++ b/client/src/main/java/rt4/Static20.java
@@ -1,8 +1,6 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static20 {
 
@@ -12,15 +10,7 @@ public final class Static20 {
 	@OriginalMember(owner = "client!bj", name = "s", descriptor = "I")
 	public static int anInt660 = -1;
 
-	@OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
-	public static HashTable objectContainerCache = new HashTable(32);
-
 	@OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
 	public static final int anInt671 = 3353893;
 
-    @OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J")
-	public static long method602(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
-		return local7 == null || local7.aClass15_1 == null ? 0L : local7.aClass15_1.aLong26;
-	}
 }
diff --git a/client/src/main/java/rt4/Static201.java b/client/src/main/java/rt4/Static201.java
index 34fb483..756ef47 100644
--- a/client/src/main/java/rt4/Static201.java
+++ b/client/src/main/java/rt4/Static201.java
@@ -12,12 +12,6 @@ public final class Static201 {
 	@OriginalMember(owner = "client!qf", name = "M", descriptor = "I")
 	public static int anInt1862 = 0;
 
-	@OriginalMember(owner = "client!qf", name = "Q", descriptor = "Lclient!na;")
-	public static final JagString aClass100_407 = JagString.parse(" )2> <col=ffff00>");
-
-	@OriginalMember(owner = "client!qf", name = "R", descriptor = "Lclient!na;")
-	public static final JagString aClass100_408 = JagString.parse(" )2> ");
-
 	@OriginalMember(owner = "client!qf", name = "X", descriptor = "Lclient!be;")
 	public static Component aClass13_13 = null;
 
diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java
index a0cb92c..0f05425 100644
--- a/client/src/main/java/rt4/Static202.java
+++ b/client/src/main/java/rt4/Static202.java
@@ -6,79 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static202 {
 
-	@OriginalMember(owner = "client!qg", name = "U", descriptor = "Lclient!na;")
-	public static final JagString aClass100_891 = JagString.parse("");
-
-    @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
+	@OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I")
 	public static final int[] cameraFrequency = new int[5];
 
-    @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V")
-	public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
-		@Pc(17) ReflectionCheck local17 = new ReflectionCheck();
-		local17.anInt1725 = arg1.g1();
-		local17.anInt1732 = arg1.g4();
-		local17.aClass212Array1 = new PrivilegedRequest[local17.anInt1725];
-		local17.anIntArray138 = new int[local17.anInt1725];
-		local17.aByteArrayArrayArray6 = new byte[local17.anInt1725][][];
-		local17.aClass212Array2 = new PrivilegedRequest[local17.anInt1725];
-		local17.anIntArray139 = new int[local17.anInt1725];
-		local17.anIntArray137 = new int[local17.anInt1725];
-		for (@Pc(59) int local59 = 0; local59 < local17.anInt1725; local59++) {
-			try {
-				@Pc(71) int local71 = arg1.g1();
-				@Pc(93) String local93;
-				@Pc(104) String local104;
-				@Pc(95) int local95;
-				if (local71 == 0 || local71 == 1 || local71 == 2) {
-					local93 = new String(arg1.gjstr().method3148());
-					local95 = 0;
-					local104 = new String(arg1.gjstr().method3148());
-					if (local71 == 1) {
-						local95 = arg1.g4();
-					}
-					local17.anIntArray139[local59] = local71;
-					local17.anIntArray137[local59] = local95;
-					local17.aClass212Array2[local59] = arg0.getDeclaredField(local104, Static6.method85(local93));
-				} else if (local71 == 3 || local71 == 4) {
-					local93 = new String(arg1.gjstr().method3148());
-					local104 = new String(arg1.gjstr().method3148());
-					local95 = arg1.g1();
-					@Pc(171) String[] local171 = new String[local95];
-					for (@Pc(173) int local173 = 0; local173 < local95; local173++) {
-						local171[local173] = new String(arg1.gjstr().method3148());
-					}
-					@Pc(193) byte[][] local193 = new byte[local95][];
-					@Pc(210) int local210;
-					if (local71 == 3) {
-						for (@Pc(199) int local199 = 0; local199 < local95; local199++) {
-							local210 = arg1.g4();
-							local193[local199] = new byte[local210];
-							arg1.gBytes(local210, local193[local199]);
-						}
-					}
-					local17.anIntArray139[local59] = local71;
-					@Pc(234) Class[] local234 = new Class[local95];
-					for (local210 = 0; local210 < local95; local210++) {
-						local234[local210] = Static6.method85(local171[local210]);
-					}
-					local17.aClass212Array1[local59] = arg0.getDeclaredMethod(Static6.method85(local93), local234, local104);
-					local17.aByteArrayArrayArray6[local59] = local193;
-				}
-			} catch (@Pc(269) ClassNotFoundException local269) {
-				local17.anIntArray138[local59] = -1;
-			} catch (@Pc(276) SecurityException local276) {
-				local17.anIntArray138[local59] = -2;
-			} catch (@Pc(283) NullPointerException local283) {
-				local17.anIntArray138[local59] = -3;
-			} catch (@Pc(290) Exception local290) {
-				local17.anIntArray138[local59] = -4;
-			} catch (@Pc(297) Throwable local297) {
-				local17.anIntArray138[local59] = -5;
-			}
-		}
-		Static204.aClass69_113.addTail(local17);
-	}
-
 	@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IZI)V")
 	public static void setVarbitClient(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(7) VarbitType local7 = VarbitTypeList.get(arg0);
diff --git a/client/src/main/java/rt4/Static207.java b/client/src/main/java/rt4/Static207.java
index 79fa182..41e75a2 100644
--- a/client/src/main/java/rt4/Static207.java
+++ b/client/src/main/java/rt4/Static207.java
@@ -9,10 +9,7 @@ public final class Static207 {
 	@OriginalMember(owner = "client!ql", name = "h", descriptor = "Lclient!na;")
 	public static final JagString aClass100_903 = JagString.parse("Hidden)2");
 
-	@OriginalMember(owner = "client!ql", name = "i", descriptor = "Lclient!na;")
-	public static final JagString WM2 = JagString.parse("::wm2");
-
-	@OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I")
+    @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I")
 	public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) {
 		@Pc(20) int local20;
 		if (arg9 == 1) {
diff --git a/client/src/main/java/rt4/Static208.java b/client/src/main/java/rt4/Static208.java
deleted file mode 100644
index 0754766..0000000
--- a/client/src/main/java/rt4/Static208.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static208 {
-
-	@OriginalMember(owner = "client!r", name = "d", descriptor = "Z")
-	public static final boolean aBoolean237 = false;
-}
diff --git a/client/src/main/java/rt4/Static209.java b/client/src/main/java/rt4/Static209.java
index 77995f9..050e1e0 100644
--- a/client/src/main/java/rt4/Static209.java
+++ b/client/src/main/java/rt4/Static209.java
@@ -2,7 +2,6 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static209 {
 
@@ -11,12 +10,4 @@ public final class Static209 {
 		return arg0 == (-arg0 & arg0);
 	}
 
-	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(BIII)V")
-	public static void method3707(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(12) DelayedStateChange local12 = DelayedStateChange.create(9, arg0);
-		local12.pushServer();
-		local12.intArg1 = arg2;
-		local12.intArg3 = arg1;
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static210.java b/client/src/main/java/rt4/Static210.java
index 3651d79..203915e 100644
--- a/client/src/main/java/rt4/Static210.java
+++ b/client/src/main/java/rt4/Static210.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static210 {
 
-	@OriginalMember(owner = "client!rb", name = "f", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_87;
-
 	@OriginalMember(owner = "client!rb", name = "a", descriptor = "(I)V")
 	public static void method3711() {
 		for (@Pc(7) int local7 = 0; local7 < 104; local7++) {
diff --git a/client/src/main/java/rt4/Static211.java b/client/src/main/java/rt4/Static211.java
index 293c3d4..e5bb81e 100644
--- a/client/src/main/java/rt4/Static211.java
+++ b/client/src/main/java/rt4/Static211.java
@@ -6,6 +6,8 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static211 {
 
+	@OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;")
+	public static final JagString aClass100_517 = JagString.parse("");
 	@OriginalMember(owner = "client!rc", name = "R", descriptor = "Z")
 	private static boolean aBoolean74;
 
@@ -18,16 +20,13 @@ public final class Static211 {
 	@OriginalMember(owner = "client!rc", name = "G", descriptor = "Lclient!na;")
 	public static final JagString aClass100_230 = JagString.parse("");
 
-	@OriginalMember(owner = "client!rc", name = "I", descriptor = "Lclient!na;")
-	public static final JagString aClass100_231 = JagString.parse(")3)3)3");
-
 	@OriginalMember(owner = "client!rc", name = "M", descriptor = "Z")
 	public static boolean aBoolean73 = false;
 
 	@OriginalMember(owner = "client!rc", name = "a", descriptor = "(Lclient!na;Z)Lclient!na;")
 	public static JagString method923(@OriginalArg(0) JagString arg0) {
 		@Pc(12) int local12 = Static171.method3218(arg0);
-		return local12 == -1 ? Static93.aClass100_517 : WorldMap.labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
+		return local12 == -1 ? aClass100_517 : WorldMap.labels.aClass100Array153[local12].method3140(Static101.aClass100_538, Static197.aClass100_872);
 	}
 
     @OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
diff --git a/client/src/main/java/rt4/Static215.java b/client/src/main/java/rt4/Static215.java
index 58749be..f7a9d32 100644
--- a/client/src/main/java/rt4/Static215.java
+++ b/client/src/main/java/rt4/Static215.java
@@ -13,7 +13,4 @@ public final class Static215 {
 	@OriginalMember(owner = "client!rh", name = "g", descriptor = "I")
 	public static final int anInt4868 = -1;
 
-	@OriginalMember(owner = "client!rh", name = "k", descriptor = "I")
-	public static int anInt4870 = 0;
-
 }
diff --git a/client/src/main/java/rt4/Static217.java b/client/src/main/java/rt4/Static217.java
index c18dd03..7d50f1f 100644
--- a/client/src/main/java/rt4/Static217.java
+++ b/client/src/main/java/rt4/Static217.java
@@ -18,72 +18,6 @@ public final class Static217 {
 	@OriginalMember(owner = "client!rj", name = "ab", descriptor = "Lclient!na;")
 	public static final JagString aClass100_916 = JagString.parse(":clanreq:");
 
-	@OriginalMember(owner = "client!rj", name = "a", descriptor = "(IIILclient!e;I)V")
-	public static void method3767(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Player arg2, @OriginalArg(4) int arg3) {
-		if (PlayerList.self == arg2 || MiniMenu.size >= 400) {
-			return;
-		}
-		@Pc(158) JagString local158;
-		if (arg2.anInt1671 == 0) {
-			@Pc(22) boolean local22 = true;
-			if (PlayerList.self.anInt1667 != -1 && arg2.anInt1667 != -1) {
-				@Pc(43) int local43 = arg2.combatLevel < PlayerList.self.combatLevel ? PlayerList.self.combatLevel : arg2.combatLevel;
-				@Pc(58) int local58 = PlayerList.self.anInt1667 < arg2.anInt1667 ? PlayerList.self.anInt1667 : arg2.anInt1667;
-				@Pc(69) int local69 = local43 * 10 / 100 + local58 + 5;
-				@Pc(76) int local76 = PlayerList.self.combatLevel - arg2.combatLevel;
-				if (local76 < 0) {
-					local76 = -local76;
-				}
-				if (local69 < local76) {
-					local22 = false;
-				}
-			}
-			@Pc(95) JagString local95 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-			if (arg2.combatLevel < arg2.anInt1656) {
-				local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? MiniMenu.getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.combatLevel), Static78.aClass100_465, Static123.parseInt(arg2.anInt1656 - arg2.combatLevel), Static72.aClass100_448 });
-			} else {
-				local158 = JagString.concatenate(new JagString[] { arg2.getName(), local22 ? MiniMenu.getCombatLevelColor(arg2.combatLevel, PlayerList.self.combatLevel) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.parseInt(arg2.combatLevel), Static72.aClass100_448 });
-			}
-		} else {
-			local158 = JagString.concatenate(new JagString[] { arg2.getName(), Static123.aClass100_593, LocalizedText.SKILL, Static123.parseInt(arg2.anInt1671), Static72.aClass100_448 });
-		}
-		@Pc(275) int local275;
-		if (Static260.anInt5014 == 1) {
-			MiniMenu.add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] { MiniMenu.aClass100_203, Static105.aClass100_561, local158 }), arg3, (short) 1, LocalizedText.USE, arg1);
-		} else if (!Static241.aBoolean302) {
-			for (local275 = 7; local275 >= 0; local275--) {
-				if (Player.options[local275] != null) {
-					@Pc(291) short local291 = 0;
-					if (client.game == 0 && Player.options[local275].equalsIgnoreCase(LocalizedText.ATTACK)) {
-						if (arg2.combatLevel > PlayerList.self.combatLevel) {
-							local291 = 2000;
-						}
-						if (PlayerList.self.anInt1650 != 0 && arg2.anInt1650 != 0) {
-							if (PlayerList.self.anInt1650 == arg2.anInt1650) {
-								local291 = 2000;
-							} else {
-								local291 = 0;
-							}
-						}
-					} else if (Player.secondaryOptions[local275]) {
-						local291 = 2000;
-					}
-					@Pc(353) short local353 = Static5.aShortArray2[local275];
-					@Pc(358) short local358 = (short) (local353 + local291);
-					MiniMenu.add(Player.cursors[local275], (long) arg0, JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 }), arg3, local358, Player.options[local275], arg1);
-				}
-			}
-		} else if ((Static274.anInt4999 & 0x8) != 0) {
-			MiniMenu.add(Static246.anInt5393, (long) arg0, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static105.aClass100_561, local158 }), arg3, (short) 15, MiniMenu.aClass100_545, arg1);
-		}
-		for (local275 = 0; local275 < MiniMenu.size; local275++) {
-			if (MiniMenu.actions[local275] == 60) {
-				MiniMenu.opBases[local275] = JagString.concatenate(new JagString[] { Static204.aClass100_896, local158 });
-				break;
-			}
-		}
-	}
-
 	@OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V")
 	public static void method3771(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
 		@Pc(7) int local7 = -1;
diff --git a/client/src/main/java/rt4/Static22.java b/client/src/main/java/rt4/Static22.java
index 787f68a..f8a1416 100644
--- a/client/src/main/java/rt4/Static22.java
+++ b/client/src/main/java/rt4/Static22.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static22 {
 
-    @OriginalMember(owner = "client!bl", name = "T", descriptor = "I")
-	public static int anInt726 = 0;
-
     @OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
 	public static int anInt730 = -1;
 
diff --git a/client/src/main/java/rt4/Static220.java b/client/src/main/java/rt4/Static220.java
index 5a13e32..426f1a1 100644
--- a/client/src/main/java/rt4/Static220.java
+++ b/client/src/main/java/rt4/Static220.java
@@ -14,7 +14,7 @@ public final class Static220 {
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(IBI)V")
 	public static void spawnGroundObject(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(9) LinkedList local9 = Static159.aClass69ArrayArrayArray1[Player.level][arg1][arg0];
+		@Pc(9) LinkedList local9 = Static159.objStacks[Player.level][arg1][arg0];
 		if (local9 == null) {
 			Static187.method3420(Player.level, arg1, arg0);
 			return;
@@ -23,10 +23,10 @@ public final class Static220 {
 		@Pc(30) ObjStackNode local30 = null;
 		@Pc(35) ObjStackNode local35;
 		for (local35 = (ObjStackNode) local9.head(); local35 != null; local35 = (ObjStackNode) local9.next()) {
-			@Pc(44) ObjType local44 = ObjTypeList.get(local35.aClass8_Sub7_1.anInt5555);
+			@Pc(44) ObjType local44 = ObjTypeList.get(local35.value.type);
 			@Pc(47) int local47 = local44.cost;
 			if (local44.stackable == 1) {
-				local47 *= local35.aClass8_Sub7_1.anInt5550 + 1;
+				local47 *= local35.value.anInt5550 + 1;
 			}
 			if (local28 < local47) {
 				local28 = local47;
@@ -41,28 +41,28 @@ public final class Static220 {
 		@Pc(89) ObjStack local89 = null;
 		@Pc(91) ObjStack local91 = null;
 		for (local35 = (ObjStackNode) local9.head(); local35 != null; local35 = (ObjStackNode) local9.next()) {
-			@Pc(103) ObjStack local103 = local35.aClass8_Sub7_1;
-			if (local103.anInt5555 != local30.aClass8_Sub7_1.anInt5555) {
+			@Pc(103) ObjStack local103 = local35.value;
+			if (local103.type != local30.value.type) {
 				if (local89 == null) {
 					local89 = local103;
 				}
-				if (local103.anInt5555 != local89.anInt5555 && local91 == null) {
+				if (local103.type != local89.type && local91 == null) {
 					local91 = local103;
 				}
 			}
 		}
 		@Pc(152) long local152 = (long) ((arg0 << 7) + arg1 + 1610612736);
-		Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.aClass8_Sub7_1, local152, local89, local91);
+		Static69.method1543(Player.level, arg1, arg0, SceneGraph.getTileHeight(Player.level, arg1 * 128 + 64, arg0 * 128 + 64), local30.value, local152, local89, local91);
 	}
 
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(III)V")
 	public static void method3801() {
 		for (@Pc(1) int local1 = 0; local1 < Static126.anInt3114; local1++) {
-			for (@Pc(6) int local6 = 0; local6 < Static152.mapSizeX; local6++) {
-				for (@Pc(11) int local11 = 0; local11 < Static99.mapSizeZ; local11++) {
+			for (@Pc(6) int local6 = 0; local6 < SceneGraph.mapSizeX; local6++) {
+				for (@Pc(11) int local11 = 0; local11 < SceneGraph.mapSizeZ; local11++) {
 					@Pc(22) Tile local22 = SceneGraph.tiles[local1][local6][local11];
 					if (local22 != null) {
-						@Pc(27) Wall local27 = local22.aClass77_1;
+						@Pc(27) Wall local27 = local22.wall;
 						if (local27 != null && local27.primary.method4543()) {
 							Static69.method1544(local27.primary, local1, local6, local11, 1, 1);
 							if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) {
@@ -72,14 +72,14 @@ public final class Static220 {
 							}
 							local27.primary = local27.primary.method4539();
 						}
-						for (@Pc(83) int local83 = 0; local83 < local22.anInt662; local83++) {
-							@Pc(92) Scenery local92 = local22.aClass31Array1[local83];
+						for (@Pc(83) int local83 = 0; local83 < local22.sceneryLen; local83++) {
+							@Pc(92) Scenery local92 = local22.scenery[local83];
 							if (local92 != null && local92.primary.method4543()) {
 								Static69.method1544(local92.primary, local1, local6, local11, local92.anInt1713 + 1 - local92.anInt1701, local92.anInt1698 - local92.anInt1696 + 1);
 								local92.primary = local92.primary.method4539();
 							}
 						}
-						@Pc(131) GroundDecor local131 = local22.aClass15_1;
+						@Pc(131) GroundDecor local131 = local22.groundDecor;
 						if (local131 != null && local131.primary.method4543()) {
 							Static264.method3574(local131.primary, local1, local6, local11);
 							local131.primary = local131.primary.method4539();
diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java
index a6add5c..bb1d524 100644
--- a/client/src/main/java/rt4/Static221.java
+++ b/client/src/main/java/rt4/Static221.java
@@ -9,10 +9,7 @@ public final class Static221 {
 	@OriginalMember(owner = "client!s", name = "a", descriptor = "[I")
 	public static int[] tt;
 
-	@OriginalMember(owner = "client!s", name = "i", descriptor = "[I")
-	public static int[] anIntArray376;
-
-    @OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V")
+	@OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V")
 	public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
 		if (Static250.anInt5434 > 0) {
 			Static267.method4528(Static250.anInt5434);
@@ -133,10 +130,10 @@ public final class Static221 {
 						}
 						@Pc(275) Scenery local275 = SceneGraph.getScenery(arg4, local114, local72);
 						if (local275 != null) {
-							@Pc(287) int local287 = (int) (local275.aLong56 >> 14) & 0x3F;
+							@Pc(287) int local287 = (int) (local275.key >> 14) & 0x3F;
 							if (local287 == 9) {
 								local234 = null;
-								@Pc(302) int local302 = (int) (local275.aLong56 >> 20) & 0x3;
+								@Pc(302) int local302 = (int) (local275.key >> 20) & 0x3;
 								@Pc(315) boolean local315;
 								@Pc(343) short local343;
 								@Pc(349) int local349;
@@ -253,10 +250,10 @@ public final class Static221 {
 						}
 						@Pc(899) Scenery local899 = SceneGraph.getScenery(arg4, local114, local72);
 						if (local899 != null) {
-							@Pc(911) int local911 = (int) (local899.aLong56 >> 14) & 0x3F;
+							@Pc(911) int local911 = (int) (local899.key >> 14) & 0x3F;
 							if (local911 == 9) {
 								@Pc(917) int[] local917 = null;
-								@Pc(925) int local925 = (int) (local899.aLong56 >> 20) & 0x3;
+								@Pc(925) int local925 = (int) (local899.key >> 20) & 0x3;
 								@Pc(973) int local973;
 								@Pc(947) boolean local947;
 								@Pc(961) short local961;
diff --git a/client/src/main/java/rt4/Static222.java b/client/src/main/java/rt4/Static222.java
index b6b9058..6f05184 100644
--- a/client/src/main/java/rt4/Static222.java
+++ b/client/src/main/java/rt4/Static222.java
@@ -3,7 +3,6 @@ package rt4;
 import java.awt.Font;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static222 {
 
@@ -16,12 +15,6 @@ public final class Static222 {
 	@OriginalMember(owner = "client!sa", name = "W", descriptor = "Z")
 	public static boolean instantScreenFade = true;
 
-    @OriginalMember(owner = "client!sa", name = "c", descriptor = "(III)I")
-	public static int method3825(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
-		@Pc(12) int local12 = arg0 >>> 31;
-		return (arg0 + local12) / arg1 - local12;
-	}
-
 	@OriginalMember(owner = "client!sa", name = "a", descriptor = "(IIIBI)V")
 	public static void method3826(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		if (arg3 <= arg2) {
diff --git a/client/src/main/java/rt4/Static223.java b/client/src/main/java/rt4/Static223.java
index b66f38f..c6aab53 100644
--- a/client/src/main/java/rt4/Static223.java
+++ b/client/src/main/java/rt4/Static223.java
@@ -44,12 +44,12 @@ public final class Static223 {
 
 	@OriginalMember(owner = "client!sc", name = "a", descriptor = "()V")
 	public static void method3858() {
-		for (@Pc(1) int local1 = 0; local1 < Static22.anInt726; local1++) {
-			@Pc(8) Scenery local8 = Static243.aClass31Array3[local1];
+		for (@Pc(1) int local1 = 0; local1 < SceneGraph.anInt726; local1++) {
+			@Pc(8) Scenery local8 = SceneGraph.aClass31Array3[local1];
 			Static266.method4193(local8);
-			Static243.aClass31Array3[local1] = null;
+			SceneGraph.aClass31Array3[local1] = null;
 		}
-		Static22.anInt726 = 0;
+		SceneGraph.anInt726 = 0;
 	}
 
 	@OriginalMember(owner = "client!sc", name = "a", descriptor = "(IZ)Lclient!j;")
diff --git a/client/src/main/java/rt4/Static224.java b/client/src/main/java/rt4/Static224.java
index 16374dd..25f5c0e 100644
--- a/client/src/main/java/rt4/Static224.java
+++ b/client/src/main/java/rt4/Static224.java
@@ -22,9 +22,9 @@ public final class Static224 {
 			@Pc(30) Tile local30 = SceneGraph.tiles[local9][arg0][arg1] = SceneGraph.tiles[local9 + 1][arg0][arg1];
 			if (local30 != null) {
 				local30.anInt672--;
-				for (@Pc(40) int local40 = 0; local40 < local30.anInt662; local40++) {
-					@Pc(49) Scenery local49 = local30.aClass31Array1[local40];
-					if ((local49.aLong56 >> 29 & 0x3L) == 2L && local49.anInt1701 == arg0 && local49.anInt1696 == arg1) {
+				for (@Pc(40) int local40 = 0; local40 < local30.sceneryLen; local40++) {
+					@Pc(49) Scenery local49 = local30.scenery[local40];
+					if ((local49.key >> 29 & 0x3L) == 2L && local49.anInt1701 == arg0 && local49.anInt1696 == arg1) {
 						local49.anInt1709--;
 					}
 				}
diff --git a/client/src/main/java/rt4/Static225.java b/client/src/main/java/rt4/Static225.java
index 576a343..ae14e5b 100644
--- a/client/src/main/java/rt4/Static225.java
+++ b/client/src/main/java/rt4/Static225.java
@@ -12,9 +12,6 @@ public final class Static225 {
     @OriginalMember(owner = "client!se", name = "h", descriptor = "I")
 	public static int anInt5073 = -1;
 
-	@OriginalMember(owner = "client!se", name = "m", descriptor = "Lclient!na;")
-	public static final JagString aClass100_961 = JagString.parse(" )2>");
-
 	@OriginalMember(owner = "client!se", name = "a", descriptor = "(IIIIZ)I")
 	public static int method3891(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		@Pc(8) int local8 = arg3 & 0xF;
diff --git a/client/src/main/java/rt4/Static226.java b/client/src/main/java/rt4/Static226.java
index 9f10806..f317a1e 100644
--- a/client/src/main/java/rt4/Static226.java
+++ b/client/src/main/java/rt4/Static226.java
@@ -33,7 +33,7 @@ public final class Static226 {
 			local5 = Static35.method899(arg0.level, arg0.x, arg0.z);
 		}
 		if (arg0.anInt927 == 3) {
-			local5 = Static20.method602(arg0.level, arg0.x, arg0.z);
+			local5 = SceneGraph.method602(arg0.level, arg0.x, arg0.z);
 		}
 		if (local5 != 0L) {
 			local7 = Integer.MAX_VALUE & (int) (local5 >>> 32);
diff --git a/client/src/main/java/rt4/Static227.java b/client/src/main/java/rt4/Static227.java
index 2313754..1bdc9c1 100644
--- a/client/src/main/java/rt4/Static227.java
+++ b/client/src/main/java/rt4/Static227.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static227 {
 
-	@OriginalMember(owner = "client!sg", name = "i", descriptor = "Lclient!be;")
-	public static Component staticActiveComponent2;
-
     @OriginalMember(owner = "client!sg", name = "o", descriptor = "I")
 	public static int cameraType;
 
diff --git a/client/src/main/java/rt4/Static228.java b/client/src/main/java/rt4/Static228.java
index 1406bf4..ad0c01c 100644
--- a/client/src/main/java/rt4/Static228.java
+++ b/client/src/main/java/rt4/Static228.java
@@ -6,6 +6,8 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static228 {
 
+    @OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B")
+    public static final byte[][] aByteArrayArray6 = new byte[50][];
     @OriginalMember(owner = "client!sh", name = "c", descriptor = "I")
 	public static int anInt5101 = 0;
 
@@ -33,8 +35,8 @@ public final class Static228 {
 			Static12.aByteArrayArray2[Static251.anInt5459] = null;
 			return local22;
 		} else if (arg0 == 30000 && Static224.anInt5064 > 0) {
-			local22 = Static41.aByteArrayArray6[--Static224.anInt5064];
-			Static41.aByteArrayArray6[Static224.anInt5064] = null;
+			local22 = aByteArrayArray6[--Static224.anInt5064];
+			aByteArrayArray6[Static224.anInt5064] = null;
 			return local22;
 		} else {
 			return new byte[arg0];
diff --git a/client/src/main/java/rt4/Static229.java b/client/src/main/java/rt4/Static229.java
index 78ce080..055442e 100644
--- a/client/src/main/java/rt4/Static229.java
+++ b/client/src/main/java/rt4/Static229.java
@@ -2,7 +2,6 @@ package rt4;
 
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static229 {
 
@@ -12,11 +11,6 @@ public final class Static229 {
     @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;")
 	public static final JagString aClass100_974 = JagString.parse("<br>(X");
 
-	@OriginalMember(owner = "client!si", name = "a", descriptor = "(ZB)I")
-	public static int method3933(@OriginalArg(1) byte arg0) {
-		return arg0 & 0xFF;
-	}
-
 	@OriginalMember(owner = "client!si", name = "a", descriptor = "(IZ)V")
 	public static void method3935(@OriginalArg(0) int arg0) {
 		Static161.method3060(Static161.anInt3923, ((float) arg0 * 0.1F + 0.7F) * 1.1523438F, 0.69921875F, 0.69921875F);
@@ -25,10 +19,4 @@ public final class Static229 {
 		Static161.method3058();
 	}
 
-    @OriginalMember(owner = "client!si", name = "b", descriptor = "(IIB)V")
-	public static void method3938(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		@Pc(16) DelayedStateChange local16 = DelayedStateChange.create(12, arg1);
-		local16.pushServer();
-		local16.intArg1 = arg0;
-	}
 }
diff --git a/client/src/main/java/rt4/Static23.java b/client/src/main/java/rt4/Static23.java
index 55d19fb..aa0ad8e 100644
--- a/client/src/main/java/rt4/Static23.java
+++ b/client/src/main/java/rt4/Static23.java
@@ -19,7 +19,7 @@ public final class Static23 {
 		for (local3 = arg1; local3 <= arg3 + arg1; local3++) {
 			for (local10 = arg2; local10 <= arg4 + arg2; local10++) {
 				if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
-					Static118.aByteArrayArrayArray9[arg0][local10][local3] = 127;
+					SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127;
 				}
 			}
 		}
diff --git a/client/src/main/java/rt4/Static230.java b/client/src/main/java/rt4/Static230.java
index 3d6b28d..5da8e87 100644
--- a/client/src/main/java/rt4/Static230.java
+++ b/client/src/main/java/rt4/Static230.java
@@ -23,6 +23,8 @@ public final class Static230 {
 	public static final JagString aClass100_821 = JagString.parse("document)3cookie=(R");
 	@OriginalMember(owner = "client!sc", name = "f", descriptor = "Lclient!na;")
 	public static final JagString aClass100_946 = JagString.parse("(R");
+	@OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;")
+	public static final JagString aClass100_431 = JagString.parse("; Max)2Age=");
 	@OriginalMember(owner = "client!sj", name = "D", descriptor = "I")
 	public static int anInt5158;
 
@@ -32,9 +34,6 @@ public final class Static230 {
     @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z")
 	public static boolean dynamicMapRegion = false;
 
-	@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
-	public static final JagString aClass100_978 = JagString.parse("<)4col>");
-
 	@OriginalMember(owner = "client!sj", name = "H", descriptor = "I")
 	public static int anInt5161 = 0;
 
@@ -107,7 +106,7 @@ public final class Static230 {
 			if (arg0.length() == 0) {
 				local48 = JagString.concatenate(new JagString[] { local48, aClass100_1018 });
 			} else {
-				local48 = JagString.concatenate(new JagString[] { local48, aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
+				local48 = JagString.concatenate(new JagString[] { local48, aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), aClass100_431, Static154.method2929(94608000L) });
 			}
 			JagString.concatenate(new JagString[] { aClass100_821, local48, aClass100_946 }).method3134(GameShell.signLink.applet);
 		} catch (@Pc(124) Throwable local124) {
@@ -119,7 +118,7 @@ public final class Static230 {
 		if (MidiPlayer.anInt441 == 0) {
 			Static172.aClass3_Sub3_Sub4_2.method4447(arg0);
 		} else {
-			Static253.anInt5527 = arg0;
+			MidiPlayer.anInt5527 = arg0;
 		}
 	}
 }
diff --git a/client/src/main/java/rt4/Static231.java b/client/src/main/java/rt4/Static231.java
index 9d93f9b..7594677 100644
--- a/client/src/main/java/rt4/Static231.java
+++ b/client/src/main/java/rt4/Static231.java
@@ -12,7 +12,6 @@ public final class Static231 {
 	@OriginalMember(owner = "client!sk", name = "mb", descriptor = "I")
 	public static int anInt5205;
 
-
 	@OriginalMember(owner = "client!sk", name = "lb", descriptor = "Z")
 	public static boolean aBoolean252 = false;
 
diff --git a/client/src/main/java/rt4/Static232.java b/client/src/main/java/rt4/Static232.java
index 58e71bf..5fb3ea1 100644
--- a/client/src/main/java/rt4/Static232.java
+++ b/client/src/main/java/rt4/Static232.java
@@ -58,7 +58,7 @@ public final class Static232 {
 											local243.id = local222.mapElement;
 											Static172.aClass69_97.addTail(local243);
 										} else {
-											MapList.sprites[local222.mapElement].method1423(local65 - 7, local144 + -7);
+											MapList.sprites[local222.mapElement].renderTransparent(local65 - 7, local144 + -7);
 										}
 									}
 								}
@@ -73,7 +73,7 @@ public final class Static232 {
 			SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 13, local11);
 			SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 11, local11);
 			SoftwareRaster.method2502(local285.anInt4307, local285.anInt4314, 9, local11);
-			MapList.sprites[local285.id].method1423(local285.anInt4307 - 7, local285.anInt4314 + -7);
+			MapList.sprites[local285.id].renderTransparent(local285.anInt4307 - 7, local285.anInt4314 + -7);
 		}
 		Static172.aClass69_97.clear();
 	}
diff --git a/client/src/main/java/rt4/Static233.java b/client/src/main/java/rt4/Static233.java
index a8727bf..d0583f9 100644
--- a/client/src/main/java/rt4/Static233.java
+++ b/client/src/main/java/rt4/Static233.java
@@ -36,7 +36,7 @@ public final class Static233 {
 			if (local17 != null && local17.type == 2) {
 				Static198.method1026(arg0 >> 1, arg4, (local17.anInt4046 - Static142.originZ << 7) + local17.anInt4047, local17.anInt4050 * 2, arg2 >> 1, local17.anInt4045 + (local17.targetX - Static225.originX << 7), arg3);
 				if (Static65.anInt1951 > -1 && client.loop % 20 < 10) {
-					Sprites.headhints[local17.anInt4048].method1423(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
+					Sprites.headhints[local17.anInt4048].renderTransparent(arg1 + Static65.anInt1951 - 12, arg5 + -28 - -Static16.anInt548);
 				}
 			}
 			local3++;
diff --git a/client/src/main/java/rt4/Static236.java b/client/src/main/java/rt4/Static236.java
index 1843071..992104e 100644
--- a/client/src/main/java/rt4/Static236.java
+++ b/client/src/main/java/rt4/Static236.java
@@ -8,8 +8,10 @@ public final class Static236 {
 
 	@OriginalMember(owner = "client!df", name = "n", descriptor = "I")
 	public static int anInt1396 = 0;
+    @OriginalMember(owner = "client!di", name = "H", descriptor = "Z")
+    public static boolean aBoolean84 = false;
 
-	@OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I")
+    @OriginalMember(owner = "client!tc", name = "a", descriptor = "(B)I")
 	public static int method4047() {
 		if (Static127.neverRemoveRoofs) {
 			return 0;
@@ -22,12 +24,12 @@ public final class Static236 {
 
 	@OriginalMember(owner = "client!tc", name = "a", descriptor = "(IILclient!be;BIIII)V")
 	public static void method4049(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
-		if (Static45.aBoolean84) {
+		if (aBoolean84) {
 			anInt1396 = 32;
 		} else {
 			anInt1396 = 0;
 		}
-		Static45.aBoolean84 = false;
+		aBoolean84 = false;
 		@Pc(139) int local139;
 		if (Mouse.pressedButton != 0) {
 			if (arg4 <= arg3 && arg4 + 16 > arg3 && arg0 >= arg5 && arg5 + 16 > arg0) {
@@ -45,7 +47,7 @@ public final class Static236 {
 				@Pc(162) int local162 = arg0 - local139 / 2 - arg5 - 16;
 				arg2.scrollY = (arg6 - arg1) * local162 / local150;
 				InterfaceList.redraw(arg2);
-				Static45.aBoolean84 = true;
+				aBoolean84 = true;
 			}
 		}
 		if (Static58.wheelRotation == 0) {
diff --git a/client/src/main/java/rt4/Static243.java b/client/src/main/java/rt4/Static243.java
index 3b0dba7..7f71599 100644
--- a/client/src/main/java/rt4/Static243.java
+++ b/client/src/main/java/rt4/Static243.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static243 {
 
-    @OriginalMember(owner = "client!tk", name = "D", descriptor = "[Lclient!ec;")
-	public static Scenery[] aClass31Array3;
-
-	@OriginalMember(owner = "client!tk", name = "K", descriptor = "[I")
+    @OriginalMember(owner = "client!tk", name = "K", descriptor = "[I")
 	public static int[] anIntArray476 = new int[2];
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
diff --git a/client/src/main/java/rt4/Static244.java b/client/src/main/java/rt4/Static244.java
deleted file mode 100644
index c2a6473..0000000
--- a/client/src/main/java/rt4/Static244.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static244 {
-
-
-    @OriginalMember(owner = "client!tl", name = "f", descriptor = "Lclient!na;")
-	public static final JagString ASSIST = JagString.parse(":assist:");
-
-	@OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1017 = JagString.parse(")1");
-
-}
diff --git a/client/src/main/java/rt4/Static245.java b/client/src/main/java/rt4/Static245.java
index 842a4f3..c3daadd 100644
--- a/client/src/main/java/rt4/Static245.java
+++ b/client/src/main/java/rt4/Static245.java
@@ -12,12 +12,6 @@ public final class Static245 {
 	@OriginalMember(owner = "client!tm", name = "i", descriptor = "I")
 	public static int anInt5377 = 0;
 
-	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V")
-	public static void method4224(@OriginalArg(0) int arg0) {
-		@Pc(16) DelayedStateChange local16 = DelayedStateChange.create(6, arg0);
-		local16.pushClient();
-	}
-
 	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
 	public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
 		@Pc(17) int local17;
@@ -161,7 +155,7 @@ public final class Static245 {
 						if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
 							local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0;
 							local517.anInt2235 = SceneGraph.tileHeights[local517.anInt2241][local417][local255] - local517.anInt2235;
-							Static120.method2389(local517);
+							LightingManager.method2389(local517);
 						}
 					}
 				}
diff --git a/client/src/main/java/rt4/Static246.java b/client/src/main/java/rt4/Static246.java
index 03e9461..7643082 100644
--- a/client/src/main/java/rt4/Static246.java
+++ b/client/src/main/java/rt4/Static246.java
@@ -1,6 +1,5 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
@@ -29,97 +28,4 @@ public final class Static246 {
 		}
 	}
 
-	@OriginalMember(owner = "client!u", name = "a", descriptor = "(Lclient!me;IIII)V")
-	public static void method4240(@OriginalArg(0) NpcType arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
-		if (MiniMenu.size >= 400) {
-			return;
-		}
-		if (arg0.multiNpcs != null) {
-			arg0 = arg0.getMultiNpc();
-		}
-		if (arg0 == null || !arg0.aBoolean183) {
-			return;
-		}
-		@Pc(35) JagString local35 = arg0.name;
-		if (arg0.combatLevel != 0) {
-			@Pc(47) JagString local47 = client.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
-			local35 = JagString.concatenate(new JagString[] { local35, MiniMenu.getCombatLevelColor(arg0.combatLevel, PlayerList.self.combatLevel), Static123.aClass100_593, local47, Static123.parseInt(arg0.combatLevel), Static72.aClass100_448 });
-		}
-		if (Static260.anInt5014 == 1) {
-			MiniMenu.add(Static169.anInt4075, (long) arg2, JagString.concatenate(new JagString[] { MiniMenu.aClass100_203, Static201.aClass100_407, local35 }), arg1, (short) 26, LocalizedText.USE, arg3);
-		} else if (Static241.aBoolean302) {
-			@Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039);
-			if ((Static274.anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) {
-				MiniMenu.add(anInt5393, (long) arg2, JagString.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_407, local35 }), arg1, (short) 45, MiniMenu.aClass100_545, arg3);
-			}
-		} else {
-			@Pc(129) JagString[] local129 = arg0.ops;
-			if (Static208.aBoolean237) {
-				local129 = Static279.method4664(local129);
-			}
-			@Pc(140) int local140;
-			if (local129 != null) {
-				for (local140 = 4; local140 >= 0; local140--) {
-					if (local129[local140] != null && (client.game != 0 || !local129[local140].equalsIgnoreCase(LocalizedText.ATTACK))) {
-						@Pc(161) byte local161 = 0;
-						if (local140 == 0) {
-							local161 = 17;
-						}
-						if (local140 == 1) {
-							local161 = 16;
-						}
-						@Pc(176) int local176 = -1;
-						if (local140 == 2) {
-							local161 = 4;
-						}
-						if (local140 == 3) {
-							local161 = 19;
-						}
-						if (arg0.cursor1Op == local140) {
-							local176 = arg0.cursor1;
-						}
-						if (local140 == arg0.cursor2Op) {
-							local176 = arg0.cursor2;
-						}
-						if (local140 == 4) {
-							local161 = 2;
-						}
-						MiniMenu.add(local176, (long) arg2, JagString.concatenate(new JagString[] { MiniMenu.aClass100_965, local35 }), arg1, local161, local129[local140], arg3);
-					}
-				}
-			}
-			if (client.game == 0 && local129 != null) {
-				for (local140 = 4; local140 >= 0; local140--) {
-					if (local129[local140] != null && local129[local140].equalsIgnoreCase(LocalizedText.ATTACK)) {
-						@Pc(271) short local271 = 0;
-						if (arg0.combatLevel > PlayerList.self.combatLevel) {
-							local271 = 2000;
-						}
-						@Pc(281) short local281 = 0;
-						if (local140 == 0) {
-							local281 = 17;
-						}
-						if (local140 == 1) {
-							local281 = 16;
-						}
-						if (local140 == 2) {
-							local281 = 4;
-						}
-						if (local140 == 3) {
-							local281 = 19;
-						}
-						if (local140 == 4) {
-							local281 = 2;
-						}
-						if (local281 != 0) {
-							local281 += local271;
-						}
-						MiniMenu.add(arg0.anInt3752, (long) arg2, JagString.concatenate(new JagString[] { MiniMenu.aClass100_965, local35 }), arg1, local281, local129[local140], arg3);
-					}
-				}
-			}
-			MiniMenu.add(Static225.anInt5073, (long) arg2, JagString.concatenate(new JagString[] { MiniMenu.aClass100_965, local35 }), arg1, (short) 1007, LocalizedText.EXAMINE, arg3);
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static247.java b/client/src/main/java/rt4/Static247.java
index 8bfe426..69f56d4 100644
--- a/client/src/main/java/rt4/Static247.java
+++ b/client/src/main/java/rt4/Static247.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static247 {
 
-	@OriginalMember(owner = "client!ub", name = "h", descriptor = "[Lclient!pe;")
-	public static Class120[] aClass120Array2;
-
 	@OriginalMember(owner = "client!ub", name = "m", descriptor = "I")
 	public static int screenUpperX;
 
@@ -151,24 +148,24 @@ public final class Static247 {
 												} else {
 													Static132.method2610(local153.plainTile, 0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false);
 												}
-												var22 = local153.aClass77_1;
+												var22 = local153.wall;
 												if (var22 != null) {
 													if (GlRenderer.enabled) {
 														if ((var22.anInt3049 & local8.anInt670) == 0) {
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 														} else {
-															Static120.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
+															LightingManager.method2388(var22.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
 														}
 													}
 													var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
 												}
-												for (local65 = 0; local65 < local153.anInt662; local65++) {
-													var25 = local153.aClass31Array1[local65];
+												for (local65 = 0; local65 < local153.sceneryLen; local65++) {
+													var25 = local153.scenery[local65];
 													if (var25 != null) {
 														if (GlRenderer.enabled) {
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
-														var25.primary.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null);
+														var25.primary.render(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static123.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.key, local24, null);
 													}
 												}
 												if (GlRenderer.enabled) {
@@ -189,20 +186,20 @@ public final class Static247 {
 												Static132.method2610(local8.plainTile, local27, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, true);
 											} else {
 												var24 = true;
-												if (local8.plainTile.anInt4865 != 12345678 || Static158.aBoolean187 && local24 <= Static160.anInt3902) {
+												if (local8.plainTile.anInt4865 != 12345678 || MiniMenu.aBoolean187 && local24 <= MiniMenu.anInt3902) {
 													Static132.method2610(local8.plainTile, local27, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local18, local21, false);
 												}
 											}
 											if (var24) {
-												@Pc(549) GroundDecor local549 = local8.aClass15_1;
-												if (local549 != null && (local549.aLong26 & 0x80000000L) != 0L) {
+												@Pc(549) GroundDecor local549 = local8.groundDecor;
+												if (local549 != null && (local549.key & 0x80000000L) != 0L) {
 													if (GlRenderer.enabled && local549.aBoolean49) {
 														GlRenderer.method4159(local33 + 50.0F - 1.5F);
 													}
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
-													local549.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null);
+													local549.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static123.anInt3947, local549.anInt736 - Static217.anInt4903, local549.key, local24, null);
 													if (GlRenderer.enabled && local549.aBoolean49) {
 														GlRenderer.method4159(local33);
 													}
@@ -210,8 +207,8 @@ public final class Static247 {
 											}
 											var10 = 0;
 											local65 = 0;
-											@Pc(616) Wall local616 = local8.aClass77_1;
-											@Pc(619) WallDecor local619 = local8.aClass24_1;
+											@Pc(616) Wall local616 = local8.wall;
+											@Pc(619) WallDecor local619 = local8.wallDecor;
 											if (local616 != null || local619 != null) {
 												if (Static167.anInt4069 == local18) {
 													var10++;
@@ -248,13 +245,13 @@ public final class Static247 {
 												}
 												if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) {
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
 													local616.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
 												}
 												if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) {
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
 													local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
 												}
@@ -265,7 +262,7 @@ public final class Static247 {
 												}
 												if ((local619.anInt1395 & local65) != 0) {
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
 													local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static123.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
 												} else if (local619.anInt1395 == 256) {
@@ -286,12 +283,12 @@ public final class Static247 {
 													}
 													if (local928 < var18) {
 														if (GlRenderer.enabled) {
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
 														local619.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.key, local24, null);
 													} else if (local619.aClass8_2 != null) {
 														if (GlRenderer.enabled) {
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
 														local619.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
 													}
@@ -301,15 +298,15 @@ public final class Static247 {
 												}
 											}
 											if (var24) {
-												@Pc(1001) GroundDecor local1001 = local8.aClass15_1;
-												if (local1001 != null && (local1001.aLong26 & 0x80000000L) == 0L) {
+												@Pc(1001) GroundDecor local1001 = local8.groundDecor;
+												if (local1001 != null && (local1001.key & 0x80000000L) == 0L) {
 													if (GlRenderer.enabled && local1001.aBoolean49) {
 														GlRenderer.method4159(local33 + 50.0F - 1.5F);
 													}
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
-													local1001.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null);
+													local1001.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static123.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.key, local24, null);
 													if (GlRenderer.enabled && local1001.aBoolean49) {
 														GlRenderer.method4159(local33);
 													}
@@ -317,7 +314,7 @@ public final class Static247 {
 												@Pc(1064) ObjStackEntity local1064 = local8.aClass79_1;
 												if (local1064 != null && local1064.anInt3063 == 0) {
 													if (GlRenderer.enabled) {
-														Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
 													if (local1064.aClass8_7 != null) {
 														local1064.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1064.anInt3064 - Static149.anInt3555, local1064.anInt3057 - Static123.anInt3947, local1064.anInt3061 - Static217.anInt4903, local1064.aLong108, local24, null);
@@ -361,14 +358,14 @@ public final class Static247 {
 										}
 										if (local8.anInt663 != 0) {
 											var24 = true;
-											for (var10 = 0; var10 < local8.anInt662; var10++) {
-												if (local8.aClass31Array1[var10].anInt1707 != Static13.anInt437 && (local8.anIntArray59[var10] & local8.anInt663) == local8.anInt665) {
+											for (var10 = 0; var10 < local8.sceneryLen; var10++) {
+												if (local8.scenery[var10].anInt1707 != Static13.anInt437 && (local8.anIntArray59[var10] & local8.anInt663) == local8.anInt665) {
 													var24 = false;
 													break;
 												}
 											}
 											if (var24) {
-												var22 = local8.aClass77_1;
+												var22 = local8.wall;
 												if (!Static260.method3850(local27, local18, local21, var22.anInt3049)) {
 													if (GlRenderer.enabled) {
 														label882: {
@@ -379,34 +376,34 @@ public final class Static247 {
 																if (local1332 == 0) {
 																	local65 -= 64;
 																	local115 += 64;
-																	if (local115 < local65 && local18 > 0 && local21 < Static99.mapSizeZ - 1) {
-																		Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1);
+																	if (local115 < local65 && local18 > 0 && local21 < SceneGraph.mapSizeZ - 1) {
+																		LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 + 1);
 																		break label882;
 																	}
 																} else if (local1332 == 1) {
 																	local65 += 64;
 																	local115 += 64;
-																	if (local115 < -local65 && local18 < Static152.mapSizeX - 1 && local21 < Static99.mapSizeZ - 1) {
-																		Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1);
+																	if (local115 < -local65 && local18 < SceneGraph.mapSizeX - 1 && local21 < SceneGraph.mapSizeZ - 1) {
+																		LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 + 1);
 																		break label882;
 																	}
 																} else if (local1332 == 2) {
 																	local65 += 64;
 																	local115 -= 64;
-																	if (local115 > local65 && local18 < Static152.mapSizeX - 1 && local21 > 0) {
-																		Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1);
+																	if (local115 > local65 && local18 < SceneGraph.mapSizeX - 1 && local21 > 0) {
+																		LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 + 1, local21 - 1);
 																		break label882;
 																	}
 																} else if (local1332 == 3) {
 																	local65 -= 64;
 																	local115 -= 64;
 																	if (local115 > -local65 && local18 > 0 && local21 > 0) {
-																		Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1);
+																		LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18 - 1, local21 - 1);
 																		break label882;
 																	}
 																}
 															}
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
 													}
 													var22.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static123.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
@@ -418,11 +415,11 @@ public final class Static247 {
 											break;
 										}
 										try {
-											var9 = local8.anInt662;
+											var9 = local8.sceneryLen;
 											local8.aBoolean47 = false;
 											var10 = 0;
 											label767: for (local65 = 0; local65 < var9; local65++) {
-												var25 = local8.aClass31Array1[local65];
+												var25 = local8.scenery[local65];
 												if (var25.anInt1707 != Static13.anInt437) {
 													for (local1332 = var25.anInt1701; local1332 <= var25.anInt1713; local1332++) {
 														for (local894 = var25.anInt1696; local894 <= var25.anInt1698; local894++) {
@@ -452,7 +449,7 @@ public final class Static247 {
 															}
 														}
 													}
-													Static25.aClass31Array2[var10++] = var25;
+													SceneGraph.aClass31Array2[var10++] = var25;
 													local1332 = Static167.anInt4069 - var25.anInt1701;
 													local894 = var25.anInt1713 - Static167.anInt4069;
 													if (local894 > local1332) {
@@ -471,7 +468,7 @@ public final class Static247 {
 												local65 = -50;
 												local115 = -1;
 												for (local1332 = 0; local1332 < var10; local1332++) {
-													@Pc(1628) Scenery local1628 = Static25.aClass31Array2[local1332];
+													@Pc(1628) Scenery local1628 = SceneGraph.aClass31Array2[local1332];
 													if (local1628.anInt1707 != Static13.anInt437) {
 														if (local1628.anInt1705 > local65) {
 															local65 = local1628.anInt1705;
@@ -479,8 +476,8 @@ public final class Static247 {
 														} else if (local1628.anInt1705 == local65) {
 															local899 = local1628.anInt1699 - Static149.anInt3555;
 															local904 = local1628.anInt1703 - Static217.anInt4903;
-															var17 = Static25.aClass31Array2[local115].anInt1699 - Static149.anInt3555;
-															var18 = Static25.aClass31Array2[local115].anInt1703 - Static217.anInt4903;
+															var17 = SceneGraph.aClass31Array2[local115].anInt1699 - Static149.anInt3555;
+															var18 = SceneGraph.aClass31Array2[local115].anInt1703 - Static217.anInt4903;
 															if (local899 * local899 + local904 * local904 > var17 * var17 + var18 * var18) {
 																local115 = local1332;
 															}
@@ -490,31 +487,31 @@ public final class Static247 {
 												if (local115 == -1) {
 													break;
 												}
-												@Pc(1697) Scenery local1697 = Static25.aClass31Array2[local115];
+												@Pc(1697) Scenery local1697 = SceneGraph.aClass31Array2[local115];
 												local1697.anInt1707 = Static13.anInt437;
 												if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.primary.getMaxY())) {
 													if (GlRenderer.enabled) {
-														if ((local1697.aLong56 & 0xFC000L) == 147456L) {
-															Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+														if ((local1697.key & 0xFC000L) == 147456L) {
+															LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 															local894 = local1697.anInt1699 - Static149.anInt3555;
 															local899 = local1697.anInt1703 - Static217.anInt4903;
-															local904 = (int) (local1697.aLong56 >> 20 & 0x3L);
+															local904 = (int) (local1697.key >> 20 & 0x3L);
 															if (local904 == 1 || local904 == 3) {
 																if (local899 > -local894) {
-																	Static120.method2397(local24, local18, local21 - 1, local18 - 1, local21);
+																	LightingManager.method2397(local24, local18, local21 - 1, local18 - 1, local21);
 																} else {
-																	Static120.method2397(local24, local18, local21 + 1, local18 + 1, local21);
+																	LightingManager.method2397(local24, local18, local21 + 1, local18 + 1, local21);
 																}
 															} else if (local899 > local894) {
-																Static120.method2397(local24, local18, local21 - 1, local18 + 1, local21);
+																LightingManager.method2397(local24, local18, local21 - 1, local18 + 1, local21);
 															} else {
-																Static120.method2397(local24, local18, local21 + 1, local18 - 1, local21);
+																LightingManager.method2397(local24, local18, local21 + 1, local18 - 1, local21);
 															}
 														} else {
-															Static120.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698);
+															LightingManager.method2391(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local1697.anInt1701, local1697.anInt1696, local1697.anInt1713, local1697.anInt1698);
 														}
 													}
-													local1697.primary.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.aLong56, local24, null);
+													local1697.primary.render(local1697.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1697.anInt1699 - Static149.anInt3555, local1697.anInt1706 - Static123.anInt3947, local1697.anInt1703 - Static217.anInt4903, local1697.key, local24, null);
 												}
 												for (local894 = local1697.anInt1701; local894 <= local1697.anInt1713; local894++) {
 													for (local899 = local1697.anInt1696; local899 <= local1697.anInt1698; local899++) {
@@ -562,7 +559,7 @@ public final class Static247 {
 			@Pc(1999) ObjStackEntity local1999 = local8.aClass79_1;
 			if (local1999 != null && local1999.anInt3063 != 0) {
 				if (GlRenderer.enabled) {
-					Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+					LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 				}
 				if (local1999.aClass8_7 != null) {
 					local1999.aClass8_7.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1999.anInt3064 - Static149.anInt3555, local1999.anInt3057 - Static123.anInt3947 - local1999.anInt3063, local1999.anInt3061 - Static217.anInt4903, local1999.aLong108, local24, null);
@@ -575,11 +572,11 @@ public final class Static247 {
 				}
 			}
 			if (local8.anInt670 != 0) {
-				@Pc(2109) WallDecor local2109 = local8.aClass24_1;
+				@Pc(2109) WallDecor local2109 = local8.wallDecor;
 				if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) {
 					if ((local2109.anInt1395 & local8.anInt670) != 0) {
 						if (GlRenderer.enabled) {
-							Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+							LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 						}
 						local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static123.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
 					} else if (local2109.anInt1395 == 256) {
@@ -599,28 +596,28 @@ public final class Static247 {
 						}
 						if (local904 >= local899) {
 							if (GlRenderer.enabled) {
-								Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+								LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 							}
 							local2109.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.key, local24, null);
 						} else if (local2109.aClass8_2 != null) {
 							if (GlRenderer.enabled) {
-								Static120.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
+								LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
 							}
 							local2109.aClass8_2.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
 						}
 					}
 				}
-				@Pc(2275) Wall local2275 = local8.aClass77_1;
+				@Pc(2275) Wall local2275 = local8.wall;
 				if (local2275 != null) {
 					if ((local2275.anInt3052 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3052)) {
 						if (GlRenderer.enabled) {
-							Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
+							LightingManager.method2388(local2275.anInt3052, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
 						}
 						local2275.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
 					}
 					if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) {
 						if (GlRenderer.enabled) {
-							Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
+							LightingManager.method2388(local2275.anInt3049, Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local27, local18, local21);
 						}
 						local2275.primary.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static123.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
 					}
@@ -669,10 +666,10 @@ public final class Static247 {
 			local19.arguments = local8.anObjectArray11;
 			ScriptRunner.run(local19);
 		}
-		Static15.anInt506 = arg1;
+		MiniMenu.anInt506 = arg1;
 		Static121.anInt3039 = arg3;
-		Static98.anInt2512 = arg0;
-		Static274.anInt4999 = arg2;
+		MiniMenu.anInt2512 = arg0;
+		MiniMenu.anInt4999 = arg2;
 		Static241.aBoolean302 = true;
 		Static246.anInt5393 = arg4;
 		Static35.anInt1092 = arg5;
diff --git a/client/src/main/java/rt4/Static248.java b/client/src/main/java/rt4/Static248.java
index 39565b6..93a6316 100644
--- a/client/src/main/java/rt4/Static248.java
+++ b/client/src/main/java/rt4/Static248.java
@@ -13,16 +13,6 @@ public final class Static248 {
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "I")
 	public static int anInt4229 = 2;
 
-    @OriginalMember(owner = "client!uc", name = "a", descriptor = "(II)I")
-	public static int method3289(@OriginalArg(0) int arg0) {
-		@Pc(9) int local9 = (arg0 >>> 1 & 0xD5555555) + (arg0 & 0x55555555);
-		@Pc(19) int local19 = (local9 >>> 2 & 0x33333333) + (local9 & 0x33333333);
-		@Pc(31) int local31 = (local19 >>> 4) + local19 & 0xF0F0F0F;
-		@Pc(37) int local37 = local31 + (local31 >>> 8);
-		@Pc(43) int local43 = local37 + (local37 >>> 16);
-		return local43 & 0xFF;
-	}
-
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(III[[[BIBII)V")
 	public static void method3292(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte[][][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) byte arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) {
 		Static13.anInt437++;
@@ -43,7 +33,7 @@ public final class Static248 {
 						if (Static48.aBooleanArrayArray1[local32 + Static277.tileVisibilityDistance - Static167.anInt4069][local37 + Static277.tileVisibilityDistance - Static193.anInt4539] && (arg3 == null || local23 < arg4 || arg3[local23][local32][local37] != arg5)) {
 							local46.aBoolean45 = true;
 							local46.aBoolean46 = true;
-							if (local46.anInt662 > 0) {
+							if (local46.sceneryLen > 0) {
 								local46.aBoolean47 = true;
 							} else {
 								local46.aBoolean47 = false;
@@ -54,27 +44,27 @@ public final class Static248 {
 							local46.aBoolean46 = false;
 							local46.anInt663 = 0;
 							if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) {
-								if (local46.aClass77_1 != null) {
-									@Pc(103) Wall local103 = local46.aClass77_1;
+								if (local46.wall != null) {
+									@Pc(103) Wall local103 = local46.wall;
 									local103.primary.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
 									if (local103.aClass8_6 != null) {
 										local103.aClass8_6.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044);
 									}
 								}
-								if (local46.aClass24_1 != null) {
-									@Pc(134) WallDecor local134 = local46.aClass24_1;
+								if (local46.wallDecor != null) {
+									@Pc(134) WallDecor local134 = local46.wallDecor;
 									local134.primary.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
 									if (local134.aClass8_2 != null) {
 										local134.aClass8_2.method4545(local134.anInt1388, local23, local134.anInt1391, local134.anInt1390, local134.anInt1393);
 									}
 								}
-								if (local46.aClass15_1 != null) {
-									@Pc(167) GroundDecor local167 = local46.aClass15_1;
+								if (local46.groundDecor != null) {
+									@Pc(167) GroundDecor local167 = local46.groundDecor;
 									local167.primary.method4545(0, local23, local167.anInt733, local167.anInt732, local167.anInt736);
 								}
-								if (local46.aClass31Array1 != null) {
-									for (local183 = 0; local183 < local46.anInt662; local183++) {
-										@Pc(192) Scenery local192 = local46.aClass31Array1[local183];
+								if (local46.scenery != null) {
+									for (local183 = 0; local183 < local46.sceneryLen; local183++) {
+										@Pc(192) Scenery local192 = local46.scenery[local183];
 										local192.primary.method4545(local192.anInt1714, local23, local192.anInt1706, local192.anInt1699, local192.anInt1703);
 									}
 								}
@@ -111,7 +101,7 @@ public final class Static248 {
 				local32 = Static235.anInt5276;
 				while (true) {
 					if (local32 >= Static126.anInt3114) {
-						Static120.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles);
+						LightingManager.method2402(Static167.anInt4069, Static193.anInt4539, SceneGraph.tiles);
 						break;
 					}
 					for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) {
@@ -177,7 +167,7 @@ public final class Static248 {
 						}
 						if (Static211.anInt1142 == 0) {
 							if (!local240) {
-								Static158.aBoolean187 = false;
+								MiniMenu.aBoolean187 = false;
 							}
 							return;
 						}
@@ -224,7 +214,7 @@ public final class Static248 {
 						}
 						if (Static211.anInt1142 == 0) {
 							if (!local240) {
-								Static158.aBoolean187 = false;
+								MiniMenu.aBoolean187 = false;
 							}
 							return;
 						}
@@ -232,6 +222,6 @@ public final class Static248 {
 				}
 			}
 		}
-		Static158.aBoolean187 = false;
+		MiniMenu.aBoolean187 = false;
 	}
 }
diff --git a/client/src/main/java/rt4/Static25.java b/client/src/main/java/rt4/Static25.java
deleted file mode 100644
index f29d4a7..0000000
--- a/client/src/main/java/rt4/Static25.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static25 {
-
-	@OriginalMember(owner = "client!c", name = "bb", descriptor = "[Lclient!ec;")
-	public static Scenery[] aClass31Array2;
-
-}
diff --git a/client/src/main/java/rt4/Static250.java b/client/src/main/java/rt4/Static250.java
index d4e37b3..ce099a2 100644
--- a/client/src/main/java/rt4/Static250.java
+++ b/client/src/main/java/rt4/Static250.java
@@ -14,9 +14,6 @@ public final class Static250 {
 	@OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1042 = JagString.parse("Null");
 
-	@OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1043 = JagString.parse(" <col=00ff80>");
-
 	@OriginalMember(owner = "client!uf", name = "t", descriptor = "I")
 	public static int anInt5444 = 0;
 
@@ -24,15 +21,15 @@ public final class Static250 {
 	public static void method4273() {
 		@Pc(14) int playerX = PlayerList.self.xFine + Static132.anInt3291;
 		@Pc(20) int playerZ = PlayerList.self.zFine + Static206.anInt4774;
-		if (Static81.cameraX - playerX < -500 || Static81.cameraX - playerX > 500 || Static111.cameraZ - playerZ < -500 || Static111.cameraZ - playerZ > 500) {
-			Static81.cameraX = playerX;
-			Static111.cameraZ = playerZ;
+		if (Camera.cameraX - playerX < -500 || Camera.cameraX - playerX > 500 || Camera.cameraZ - playerZ < -500 || Camera.cameraZ - playerZ > 500) {
+			Camera.cameraX = playerX;
+			Camera.cameraZ = playerZ;
 		}
-		if (Static111.cameraZ != playerZ) {
-			Static111.cameraZ += (playerZ - Static111.cameraZ) / 16;
+		if (Camera.cameraZ != playerZ) {
+			Camera.cameraZ += (playerZ - Camera.cameraZ) / 16;
 		}
-		if (Static81.cameraX != playerX) {
-			Static81.cameraX += (playerX - Static81.cameraX) / 16;
+		if (Camera.cameraX != playerX) {
+			Camera.cameraX += (playerX - Camera.cameraX) / 16;
 		}
 		if (Preferences.aBoolean63) {
 			for (@Pc(93) int local93 = 0; local93 < InterfaceList.keyQueueSize; local93++) {
diff --git a/client/src/main/java/rt4/Static251.java b/client/src/main/java/rt4/Static251.java
index a4e494a..f2bb20e 100644
--- a/client/src/main/java/rt4/Static251.java
+++ b/client/src/main/java/rt4/Static251.java
@@ -5,10 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static251 {
 
-	@OriginalMember(owner = "client!ug", name = "d", descriptor = "[I")
-	public static int[] anIntArray479;
-
-	@OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
+    @OriginalMember(owner = "client!ug", name = "h", descriptor = "I")
 	public static int anInt5449;
 
 	@OriginalMember(owner = "client!ug", name = "p", descriptor = "I")
diff --git a/client/src/main/java/rt4/Static253.java b/client/src/main/java/rt4/Static253.java
index 858a18e..09fc462 100644
--- a/client/src/main/java/rt4/Static253.java
+++ b/client/src/main/java/rt4/Static253.java
@@ -6,12 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static253 {
 
-	@OriginalMember(owner = "client!ui", name = "Q", descriptor = "I")
-	public static int anInt5526;
-
-	@OriginalMember(owner = "client!ui", name = "R", descriptor = "I")
-	public static int anInt5527;
-
 	@OriginalMember(owner = "client!ui", name = "T", descriptor = "F")
 	public static float aFloat36;
 
@@ -50,7 +44,7 @@ public final class Static253 {
 			if (Static176.customCameraActive[4] && Static276.cameraAmplitude[4] + 128 > local59) {
 				local59 = Static276.cameraAmplitude[4] + 128;
 			}
-			Static18.method555(Static81.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
+			Static18.method555(Camera.cameraX, arg0, SceneGraph.getTileHeight(Player.level, PlayerList.self.xFine, PlayerList.self.zFine) - 50, 600 - -(local59 * 3), local57, Camera.cameraZ, local59);
 		}
 		local57 = Static5.anInt40;
 		local59 = Static138.renderX;
@@ -87,7 +81,7 @@ public final class Static253 {
 		}
 		Static252.method4302();
 		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg2, arg4, arg2 + arg3, arg4 - -arg0);
+			GlRaster.setClip(arg2, arg4, arg2 + arg3, arg4 - -arg0);
 			@Pc(248) float local248 = (float) Static240.cameraPitch * 0.17578125F;
 			@Pc(253) float local253 = (float) Static184.cameraYaw * 0.17578125F;
 			if (Static227.cameraType == 3) {
@@ -96,7 +90,7 @@ public final class Static253 {
 			}
 			GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029);
 		} else {
-			SoftwareRaster.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4);
+			SoftwareRaster.setClip(arg2, arg4, arg3 + arg2, arg0 + arg4);
 			Rasteriser.prepare();
 		}
 		if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) {
@@ -123,24 +117,24 @@ public final class Static253 {
 			} else {
 				local171 = Static103.method2235(Static178.anInt4247, PlayerList.self.movementQueueZ[0] >> 3, Preferences.brightness, PlayerList.self.movementQueueX[0] >> 3);
 			}
-			Static120.method2394(client.loop, !Preferences.flickeringEffectsOn);
+			LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn);
 			GlRenderer.clearColorAndDepthBuffers(local171);
 			Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw);
 			GlRenderer.anInt5323 = client.loop;
 			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
 			Static263.aBoolean299 = true;
-			Static120.method2390();
+			LightingManager.method2390();
 			Static143.method2731(0, 0, 0, 0, 0);
 			client.audioLoop();
 			Static223.method3858();
-			Static142.method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029);
+			method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029);
 			Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
 		} else {
 			SoftwareRaster.fillRect(arg2, arg4, arg3, arg0, 0);
 			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7);
 			client.audioLoop();
 			Static223.method3858();
-			Static142.method2726(arg4, arg3, arg2, 256, arg0, 256);
+			method2726(arg4, arg3, arg2, 256, arg0, 256);
 			Static233.method4000(arg3, arg2, arg0, 256, 256, arg4);
 		}
 		((Js5GlTextureProvider) Rasteriser.textureProvider).method3239(Static178.anInt4247);
@@ -162,7 +156,7 @@ public final class Static253 {
 			Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 		}
 		if (!arg1 && !Static19.aBoolean43 && !Static60.aBoolean108 && arg2 <= Static155.anInt3751 && arg3 + arg2 > Static155.anInt3751 && arg4 <= Static60.anInt1892 && arg0 + arg4 > Static60.anInt1892) {
-			Static176.method3304(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751);
+			MiniMenu.addEntries(arg4, arg3, arg0, arg2, Static60.anInt1892, Static155.anInt3751);
 		}
 	}
 
@@ -172,4 +166,301 @@ public final class Static253 {
 			MapList.aBooleanArray130[arg0] = !MapList.aBooleanArray130[arg0];
 		}
 	}
+
+    @OriginalMember(owner = "client!lc", name = "a", descriptor = "(IIIIIII)V")
+    public static void method2726(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) {
+        Static277.anInt5854 = 0;
+        @Pc(5) int local5;
+        @Pc(642) int local642;
+        @Pc(74) int local74;
+        @Pc(265) int local265;
+        @Pc(310) int local310;
+        @Pc(359) int local359;
+        @Pc(639) int local639;
+        for (local5 = -1; local5 < PlayerList.size + NpcList.size; local5++) {
+            @Pc(17) PathingEntity local17;
+            if (local5 == -1) {
+                local17 = PlayerList.self;
+            } else if (PlayerList.size > local5) {
+                local17 = PlayerList.players[PlayerList.ids[local5]];
+            } else {
+                local17 = NpcList.npcs[NpcList.ids[local5 - PlayerList.size]];
+            }
+            if (local17 != null && local17.method2682()) {
+                @Pc(58) NpcType local58;
+                if (local17 instanceof Npc) {
+                    local58 = ((Npc) local17).type;
+                    if (local58.multiNpcs != null) {
+                        local58 = local58.getMultiNpc();
+                    }
+                    if (local58 == null) {
+                        continue;
+                    }
+                }
+                @Pc(161) int local161;
+                if (local5 >= PlayerList.size) {
+                    local58 = ((Npc) local17).type;
+                    if (local58.multiNpcs != null) {
+                        local58 = local58.getMultiNpc();
+                    }
+                    if (local58.prayerIcon >= 0 && Sprites.headiconPrayers.length > local58.prayerIcon) {
+                        if (local58.anInt3730 == -1) {
+                            local265 = local17.method2691() + 15;
+                        } else {
+                            local265 = local58.anInt3730 + 15;
+                        }
+                        Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
+                        if (Static65.anInt1951 > -1) {
+                            Sprites.headiconPrayers[local58.prayerIcon].renderTransparent(arg2 + Static65.anInt1951 - 12, arg0 + -30 - -Static16.anInt548);
+                        }
+                    }
+                    @Pc(308) MapMarker[] local308 = Static143.hintMapMarkers;
+                    for (local310 = 0; local310 < local308.length; local310++) {
+                        @Pc(322) MapMarker local322 = local308[local310];
+                        if (local322 != null && local322.type == 1 && local322.actorTargetId == NpcList.ids[local5 - PlayerList.size] && client.loop % 20 < 10) {
+                            if (local58.anInt3730 == -1) {
+                                local359 = local17.method2691() + 15;
+                            } else {
+                                local359 = local58.anInt3730 + 15;
+                            }
+                            Static180.method3326(arg4 >> 1, arg3, local17, arg5, local359, arg1 >> 1);
+                            if (Static65.anInt1951 > -1) {
+                                Sprites.headhints[local322.anInt4048].renderTransparent(arg2 + Static65.anInt1951 - 12, Static16.anInt548 + -28 + arg0);
+                            }
+                        }
+                    }
+                } else {
+                    local74 = 30;
+                    @Pc(77) Player local77 = (Player) local17;
+                    if (local77.anInt1669 != -1 || local77.anInt1649 != -1) {
+                        Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
+                        if (Static65.anInt1951 > -1) {
+                            if (local77.anInt1669 != -1) {
+                                Sprites.headiconPks[local77.anInt1669].renderTransparent(Static65.anInt1951 + arg2 - 12, arg0 + -30 + Static16.anInt548);
+                                local74 += 25;
+                            }
+                            if (local77.anInt1649 != -1) {
+                                Sprites.headiconPrayers[local77.anInt1649].renderTransparent(arg2 + Static65.anInt1951 - 12, arg0 - (-Static16.anInt548 + local74));
+                                local74 += 25;
+                            }
+                        }
+                    }
+                    if (local5 >= 0) {
+                        @Pc(159) MapMarker[] local159 = Static143.hintMapMarkers;
+                        for (local161 = 0; local161 < local159.length; local161++) {
+                            @Pc(173) MapMarker local173 = local159[local161];
+                            if (local173 != null && local173.type == 10 && PlayerList.ids[local5] == local173.actorTargetId) {
+                                Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691() + 15, arg1 >> 1);
+                                if (Static65.anInt1951 > -1) {
+                                    Sprites.headhints[local173.anInt4048].renderTransparent(arg2 + Static65.anInt1951 - 12, arg0 + (Static16.anInt548 - local74));
+                                }
+                            }
+                        }
+                    }
+                }
+                if (local17.chatMessage != null && (local5 >= PlayerList.size || Chat.publicFilter == 0 || Chat.publicFilter == 3 || Chat.publicFilter == 1 && FriendsList.contains(((Player) local17).username))) {
+                    Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
+                    if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
+                        Static191.anIntArray389[Static277.anInt5854] = Fonts.b12Full.getStringWidth(local17.chatMessage) / 2;
+                        Static191.anIntArray387[Static277.anInt5854] = Fonts.b12Full.lineHeight;
+                        Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
+                        Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
+                        Static191.anIntArray390[Static277.anInt5854] = local17.chatColor;
+                        Static191.anIntArray391[Static277.anInt5854] = local17.chatEffect;
+                        Static191.anIntArray384[Static277.anInt5854] = local17.chatLoops;
+                        Static191.aClass100Array132[Static277.anInt5854] = local17.chatMessage;
+                        Static277.anInt5854++;
+                    }
+                }
+                if (local17.hitpointsBarVisibleUntil > client.loop) {
+                    @Pc(508) Sprite local508 = Sprites.hitbars[0];
+                    @Pc(512) Sprite local512 = Sprites.hitbars[1];
+                    if (local17 instanceof Npc) {
+                        @Pc(518) Npc local518 = (Npc) local17;
+                        @Pc(528) Sprite[] local528 = (Sprite[]) HitBarList.hitBars.get((long) local518.type.hitBarId);
+                        if (local528 == null) {
+                            local528 = SpriteLoader.loadAlphaSprites(local518.type.hitBarId, client.js5Archive8);
+                            if (local528 != null) {
+                                HitBarList.hitBars.put(local528, (long) local518.type.hitBarId);
+                            }
+                        }
+                        if (local528 != null && local528.length == 2) {
+                            local512 = local528[1];
+                            local508 = local528[0];
+                        }
+                        @Pc(571) NpcType local571 = local518.type;
+                        if (local571.anInt3730 == -1) {
+                            local310 = local17.method2691();
+                        } else {
+                            local310 = local571.anInt3730;
+                        }
+                    } else {
+                        local310 = local17.method2691();
+                    }
+                    Static180.method3326(arg4 >> 1, arg3, local17, arg5, local508.height + local310 + 10, arg1 >> 1);
+                    if (Static65.anInt1951 > -1) {
+                        local161 = Static65.anInt1951 + arg2 - (local508.width >> 1);
+                        local359 = Static16.anInt548 + arg0 - 3;
+                        local508.renderTransparent(local161, local359);
+                        local639 = local508.width * local17.hitpointsBar / 255;
+                        local642 = local508.height;
+                        if (GlRenderer.enabled) {
+                            GlRaster.method1183(local161, local359, local161 + local639, local359 + local642);
+                        } else {
+                            SoftwareRaster.method2498(local161, local359, local161 + local639, local642 + local359);
+                        }
+                        local512.renderTransparent(local161, local359);
+                        if (GlRenderer.enabled) {
+                            GlRaster.setClip(arg2, arg0, arg1 + arg2, arg0 - -arg4);
+                        } else {
+                            SoftwareRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0);
+                        }
+                    }
+                }
+                for (local74 = 0; local74 < 4; local74++) {
+                    if (local17.anIntArray319[local74] > client.loop) {
+                        if (local17 instanceof Npc) {
+                            @Pc(725) Npc local725 = (Npc) local17;
+                            @Pc(728) NpcType local728 = local725.type;
+                            if (local728.anInt3730 == -1) {
+                                local265 = local17.method2691() / 2;
+                            } else {
+                                local265 = local728.anInt3730 / 2;
+                            }
+                        } else {
+                            local265 = local17.method2691() / 2;
+                        }
+                        Static180.method3326(arg4 >> 1, arg3, local17, arg5, local265, arg1 >> 1);
+                        if (Static65.anInt1951 > -1) {
+                            if (local74 == 1) {
+                                Static16.anInt548 -= 20;
+                            }
+                            if (local74 == 2) {
+                                Static16.anInt548 -= 10;
+                                Static65.anInt1951 -= 15;
+                            }
+                            if (local74 == 3) {
+                                Static16.anInt548 -= 10;
+                                Static65.anInt1951 += 15;
+                            }
+                            Sprites.hitmarks[local17.anIntArray321[local74]].renderTransparent(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
+                            Fonts.p11Full.renderCenter(JagString.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
+                        }
+                    }
+                }
+            }
+        }
+        for (local5 = 0; local5 < Static277.anInt5854; local5++) {
+            local74 = Static191.anIntArray392[local5];
+            @Pc(859) int local859 = Static191.anIntArray385[local5];
+            local310 = Static191.anIntArray387[local5];
+            local265 = Static191.anIntArray389[local5];
+            @Pc(869) boolean local869 = true;
+            while (local869) {
+                local869 = false;
+                for (local359 = 0; local359 < local5; local359++) {
+                    if (Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74 + 2 && local74 - local310 < Static191.anIntArray392[local359] - -2 && local859 - local265 < Static191.anIntArray385[local359] + Static191.anIntArray389[local359] && Static191.anIntArray385[local359] - Static191.anIntArray389[local359] < local265 + local859 && Static191.anIntArray392[local359] - Static191.anIntArray387[local359] < local74) {
+                        local74 = Static191.anIntArray392[local359] - Static191.anIntArray387[local359];
+                        local869 = true;
+                    }
+                }
+            }
+            Static65.anInt1951 = Static191.anIntArray385[local5];
+            Static16.anInt548 = Static191.anIntArray392[local5] = local74;
+            @Pc(962) JagString local962 = Static191.aClass100Array132[local5];
+            if (Static79.anInt2157 == 0) {
+                local639 = 16776960;
+                if (Static191.anIntArray390[local5] < 6) {
+                    local639 = Static16.anIntArray52[Static191.anIntArray390[local5]];
+                }
+                if (Static191.anIntArray390[local5] == 6) {
+                    local639 = Static136.anInt3325 % 20 >= 10 ? 16776960 : 16711680;
+                }
+                if (Static191.anIntArray390[local5] == 7) {
+                    local639 = Static136.anInt3325 % 20 < 10 ? 255 : 65535;
+                }
+                if (Static191.anIntArray390[local5] == 8) {
+                    local639 = Static136.anInt3325 % 20 >= 10 ? 8454016 : 45056;
+                }
+                if (Static191.anIntArray390[local5] == 9) {
+                    local642 = 150 - Static191.anIntArray384[local5];
+                    if (local642 < 50) {
+                        local639 = local642 * 1280 + 16711680;
+                    } else if (local642 < 100) {
+                        local639 = 16776960 + 16384000 - local642 * 327680;
+                    } else if (local642 < 150) {
+                        local639 = local642 * 5 + 65280 - 500;
+                    }
+                }
+                if (Static191.anIntArray390[local5] == 10) {
+                    local642 = 150 - Static191.anIntArray384[local5];
+                    if (local642 < 50) {
+                        local639 = local642 * 5 + 16711680;
+                    } else if (local642 < 100) {
+                        local639 = 16711935 - (local642 - 50) * 327680;
+                    } else if (local642 < 150) {
+                        local639 = local642 * 327680 + 255 + 500 - local642 * 5 - 32768000;
+                    }
+                }
+                if (Static191.anIntArray390[local5] == 11) {
+                    local642 = 150 - Static191.anIntArray384[local5];
+                    if (local642 < 50) {
+                        local639 = 16777215 - local642 * 327685;
+                    } else if (local642 < 100) {
+                        local639 = local642 * 327685 + 65280 - 16384250;
+                    } else if (local642 < 150) {
+                        local639 = 16777215 + 32768000 - local642 * 327680;
+                    }
+                }
+                if (Static191.anIntArray391[local5] == 0) {
+                    Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
+                }
+                if (Static191.anIntArray391[local5] == 1) {
+                    Fonts.b12Full.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
+                }
+                if (Static191.anIntArray391[local5] == 2) {
+                    Fonts.b12Full.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
+                }
+                if (Static191.anIntArray391[local5] == 3) {
+                    Fonts.b12Full.renderShake(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
+                }
+                if (Static191.anIntArray391[local5] == 4) {
+                    local642 = (150 - Static191.anIntArray384[local5]) * (Fonts.b12Full.getStringWidth(local962) + 100) / 150;
+                    if (GlRenderer.enabled) {
+                        GlRaster.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
+                    } else {
+                        SoftwareRaster.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
+                    }
+                    Fonts.b12Full.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0);
+                    if (GlRenderer.enabled) {
+                        GlRaster.setClip(arg2, arg0, arg1 + arg2, arg4 + arg0);
+                    } else {
+                        SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4);
+                    }
+                }
+                if (Static191.anIntArray391[local5] == 5) {
+                    @Pc(1372) int local1372 = 0;
+                    local642 = 150 - Static191.anIntArray384[local5];
+                    if (GlRenderer.enabled) {
+                        GlRaster.method1183(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
+                    } else {
+                        SoftwareRaster.method2498(arg2, Static16.anInt548 + arg0 - Fonts.b12Full.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
+                    }
+                    if (local642 < 25) {
+                        local1372 = local642 - 25;
+                    } else if (local642 > 125) {
+                        local1372 = local642 - 125;
+                    }
+                    Fonts.b12Full.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
+                    if (GlRenderer.enabled) {
+                        GlRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4);
+                    } else {
+                        SoftwareRaster.setClip(arg2, arg0, arg2 + arg1, arg0 + arg4);
+                    }
+                }
+            } else {
+                Fonts.b12Full.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
+            }
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/Static254.java b/client/src/main/java/rt4/Static254.java
index de8e881..cf38e4f 100644
--- a/client/src/main/java/rt4/Static254.java
+++ b/client/src/main/java/rt4/Static254.java
@@ -51,31 +51,31 @@ public final class Static254 {
 						@Pc(227) int local227;
 						@Pc(358) int local358;
 						if (local130 && arg3[local150][local108][local122] != null) {
-							if (arg3[local150][local108][local122].aClass77_1 != null) {
+							if (arg3[local150][local108][local122].wall != null) {
 								local191 = Static104.method2251(local94);
-								if (arg3[local150][local108][local122].aClass77_1.anInt3049 == local191 || arg3[local150][local108][local122].aClass77_1.anInt3052 == local191) {
+								if (arg3[local150][local108][local122].wall.anInt3049 == local191 || arg3[local150][local108][local122].wall.anInt3052 == local191) {
 									continue;
 								}
 								if (local102 != 0) {
 									local227 = Static104.method2251(local102);
-									if (local227 == arg3[local150][local108][local122].aClass77_1.anInt3049 || arg3[local150][local108][local122].aClass77_1.anInt3052 == local227) {
+									if (local227 == arg3[local150][local108][local122].wall.anInt3049 || arg3[local150][local108][local122].wall.anInt3052 == local227) {
 										continue;
 									}
 								}
 								if (local116 != 0) {
 									local227 = Static104.method2251(local116);
-									if (local227 == arg3[local150][local108][local122].aClass77_1.anInt3049 || local227 == arg3[local150][local108][local122].aClass77_1.anInt3052) {
+									if (local227 == arg3[local150][local108][local122].wall.anInt3049 || local227 == arg3[local150][local108][local122].wall.anInt3052) {
 										continue;
 									}
 								}
 							}
-							if (arg3[local150][local108][local122].aClass31Array1 != null) {
-								for (local191 = 0; local191 < arg3[local150][local108][local122].anInt662; local191++) {
-									local227 = (int) (arg3[local150][local108][local122].aClass31Array1[local191].aLong56 >> 14 & 0x3FL);
+							if (arg3[local150][local108][local122].scenery != null) {
+								for (local191 = 0; local191 < arg3[local150][local108][local122].sceneryLen; local191++) {
+									local227 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 14 & 0x3FL);
 									if (local227 == 21) {
 										local227 = 19;
 									}
-									@Pc(352) int local352 = (int) (arg3[local150][local108][local122].aClass31Array1[local191].aLong56 >> 20 & 0x3L);
+									@Pc(352) int local352 = (int) (arg3[local150][local108][local122].scenery[local191].key >> 20 & 0x3L);
 									local358 = local227 | local352 << 6;
 									if (local358 == local94 || local102 != 0 && local358 == local102 || local116 != 0 && local116 == local358) {
 										continue label238;
@@ -85,9 +85,9 @@ public final class Static254 {
 						}
 						local132 = true;
 						@Pc(395) Tile local395 = arg3[local150][local108][local122];
-						if (local395 != null && local395.anInt662 > 0) {
-							for (local227 = 0; local227 < local395.anInt662; local227++) {
-								@Pc(418) Scenery local418 = local395.aClass31Array1[local227];
+						if (local395 != null && local395.sceneryLen > 0) {
+							for (local227 = 0; local227 < local395.sceneryLen; local227++) {
+								@Pc(418) Scenery local418 = local395.scenery[local227];
 								if (local418.anInt1713 != local418.anInt1701 || local418.anInt1698 != local418.anInt1696) {
 									for (local358 = local418.anInt1701; local358 <= local418.anInt1713; local358++) {
 										for (@Pc(450) int local450 = local418.anInt1696; local450 <= local418.anInt1698; local450++) {
@@ -195,7 +195,7 @@ public final class Static254 {
 			}
 			@Pc(15) byte[] local15 = new byte[local7];
 			arg0.offset += WordPack.codec.method1552(0, local7, local15, arg0.data, arg0.offset);
-			return Static10.decodeString(local15, local7, 0);
+			return JagString.decodeString(local15, local7, 0);
 		} catch (@Pc(47) Exception local47) {
 			return WordPack.CABBAGE;
 		}
diff --git a/client/src/main/java/rt4/Static256.java b/client/src/main/java/rt4/Static256.java
deleted file mode 100644
index b353eae..0000000
--- a/client/src/main/java/rt4/Static256.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static256 {
-
-	@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
-	public static void method4392() {
-		Player.inTutorialIsland = 0;
-		@Pc(17) int local17 = Static225.originX + (PlayerList.self.xFine >> 7);
-		@Pc(25) int local25 = (PlayerList.self.zFine >> 7) + Static142.originZ;
-		if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
-			Player.inTutorialIsland = 1;
-		}
-		if (local17 >= 3072 && local17 <= 3118 && local25 >= 9492 && local25 <= 9535) {
-			Player.inTutorialIsland = 1;
-		}
-		if (Player.inTutorialIsland == 1 && local17 >= 3139 && local17 <= 3199 && local25 >= 3008 && local25 <= 3062) {
-			Player.inTutorialIsland = 0;
-		}
-	}
-
-	@OriginalMember(owner = "client!um", name = "c", descriptor = "(III)Z")
-	public static boolean method4394(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		for (@Pc(1) int local1 = 0; local1 < Static215.anInt4870; local1++) {
-			@Pc(8) Class120 local8 = Static247.aClass120Array2[local1];
-			@Pc(17) int local17;
-			@Pc(29) int local29;
-			@Pc(39) int local39;
-			@Pc(49) int local49;
-			@Pc(59) int local59;
-			if (local8.anInt4462 == 1) {
-				local17 = local8.anInt4460 - arg0;
-				if (local17 > 0) {
-					local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
-					local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
-					local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
-					local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
-					if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
-						return true;
-					}
-				}
-			} else if (local8.anInt4462 == 2) {
-				local17 = arg0 - local8.anInt4460;
-				if (local17 > 0) {
-					local29 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
-					local39 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
-					local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
-					local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
-					if (arg2 >= local29 && arg2 <= local39 && arg1 >= local49 && arg1 <= local59) {
-						return true;
-					}
-				}
-			} else if (local8.anInt4462 == 3) {
-				local17 = local8.anInt4458 - arg2;
-				if (local17 > 0) {
-					local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
-					local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
-					local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
-					local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
-					if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
-						return true;
-					}
-				}
-			} else if (local8.anInt4462 == 4) {
-				local17 = arg2 - local8.anInt4458;
-				if (local17 > 0) {
-					local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
-					local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
-					local49 = local8.anInt4444 + (local8.anInt4459 * local17 >> 8);
-					local59 = local8.anInt4447 + (local8.anInt4463 * local17 >> 8);
-					if (arg0 >= local29 && arg0 <= local39 && arg1 >= local49 && arg1 <= local59) {
-						return true;
-					}
-				}
-			} else if (local8.anInt4462 == 5) {
-				local17 = arg1 - local8.anInt4444;
-				if (local17 > 0) {
-					local29 = local8.anInt4460 + (local8.anInt4448 * local17 >> 8);
-					local39 = local8.anInt4445 + (local8.anInt4456 * local17 >> 8);
-					local49 = local8.anInt4458 + (local8.anInt4454 * local17 >> 8);
-					local59 = local8.anInt4449 + (local8.anInt4450 * local17 >> 8);
-					if (arg0 >= local29 && arg0 <= local39 && arg2 >= local49 && arg2 <= local59) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static257.java b/client/src/main/java/rt4/Static257.java
deleted file mode 100644
index 9e94374..0000000
--- a/client/src/main/java/rt4/Static257.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static257 {
-
-	@OriginalMember(owner = "client!v", name = "b", descriptor = "Lclient!be;")
-	public static Component aClass13_7;
-
-	@OriginalMember(owner = "client!v", name = "a", descriptor = "Lclient!na;")
-	public static final JagString aClass100_98 = JagString.parse(")4a=");
-
-	@OriginalMember(owner = "client!v", name = "a", descriptor = "(IIIJ)Z")
-	public static boolean method523(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) {
-		@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
-		if (local7 == null) {
-			return false;
-		} else if (local7.aClass77_1 != null && local7.aClass77_1.key == arg3) {
-			return true;
-		} else if (local7.aClass24_1 != null && local7.aClass24_1.key == arg3) {
-			return true;
-		} else if (local7.aClass15_1 != null && local7.aClass15_1.aLong26 == arg3) {
-			return true;
-		} else {
-			for (@Pc(46) int local46 = 0; local46 < local7.anInt662; local46++) {
-				if (local7.aClass31Array1[local46].aLong56 == arg3) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static26.java b/client/src/main/java/rt4/Static26.java
index 8becd59..a15ae91 100644
--- a/client/src/main/java/rt4/Static26.java
+++ b/client/src/main/java/rt4/Static26.java
@@ -34,11 +34,11 @@ public final class Static26 {
 			for (@Pc(97) int local97 = (local23 - 6) / 8; local97 <= (local23 + 6) / 8; local97++) {
 				@Pc(115) int local115 = (local80 << 8) + local97;
 				Static238.regionBitPacked[local74] = local115;
-				Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
-				Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
-				Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
-				Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
-				Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, Static123.parseInt(local80), Static86.aClass100_488, Static123.parseInt(local97) }));
+				Static36.mapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static103.aClass100_558, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static172.locationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static270.aClass100_1090, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static175.npcSpawnsFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static179.aClass100_807, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static99.underWaterMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static165.aClass100_772, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
+				Static35.underWaterLocationsMapFileIds[local74] = client.js5Archive5.getGroupId(JagString.concatenate(new JagString[] { Static278.aClass100_1103, JagString.parseInt(local80), Static86.aClass100_488, JagString.parseInt(local97) }));
 				if (Static175.npcSpawnsFileIds[local74] == -1) {
 					Static36.mapFileIds[local74] = -1;
 					Static172.locationsMapFileIds[local74] = -1;
diff --git a/client/src/main/java/rt4/Static260.java b/client/src/main/java/rt4/Static260.java
index 677a7c7..6bce356 100644
--- a/client/src/main/java/rt4/Static260.java
+++ b/client/src/main/java/rt4/Static260.java
@@ -6,23 +6,22 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static260 {
 
-    @OriginalMember(owner = "client!vd", name = "C", descriptor = "I")
-	public static int anInt5014 = 0;
-
-	@OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!vd", name = "F", descriptor = "Lclient!na;")
 	public static final JagString aClass100_945 = JagString.parse("0");
+    @OriginalMember(owner = "client!eg", name = "a", descriptor = "I")
+    public static int anInt1744;
 
-	@OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
+    @OriginalMember(owner = "client!vd", name = "a", descriptor = "(IIIIBI)V")
 	public static void method3849(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
 		Static133.anInt5230 = arg2;
 		Static265.anInt5765 = arg1;
 		Static233.anInt5217 = arg4;
 		Static251.anInt5449 = arg3;
-		Static57.anInt1744 = arg0;
+		anInt1744 = arg0;
 		if (Static233.anInt5217 >= 100) {
 			@Pc(30) int local30 = Static251.anInt5449 * 128 + 64;
 			@Pc(36) int local36 = Static265.anInt5765 * 128 + 64;
-			@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - Static57.anInt1744;
+			@Pc(44) int local44 = SceneGraph.getTileHeight(Player.level, local30, local36) - anInt1744;
 			@Pc(49) int local49 = local44 - Static5.anInt40;
 			@Pc(54) int local54 = local30 - Static138.renderX;
 			@Pc(59) int local59 = local36 - Static134.renderZ;
@@ -53,115 +52,115 @@ public final class Static260 {
 		if (arg3 < 16) {
 			if (arg3 == 1) {
 				if (local10 > Static149.anInt3555) {
-					if (!Static256.method4394(local10, local24, local14)) {
+					if (!SceneGraph.method4394(local10, local24, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10, local24, local14 + 128)) {
+					if (!SceneGraph.method4394(local10, local24, local14 + 128)) {
 						return false;
 					}
 				}
 				if (arg0 > 0) {
-					if (!Static256.method4394(local10, local28, local14)) {
+					if (!SceneGraph.method4394(local10, local28, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10, local28, local14 + 128)) {
+					if (!SceneGraph.method4394(local10, local28, local14 + 128)) {
 						return false;
 					}
 				}
-				if (!Static256.method4394(local10, local32, local14)) {
+				if (!SceneGraph.method4394(local10, local32, local14)) {
 					return false;
 				}
-				if (!Static256.method4394(local10, local32, local14 + 128)) {
+				if (!SceneGraph.method4394(local10, local32, local14 + 128)) {
 					return false;
 				}
 				return true;
 			}
 			if (arg3 == 2) {
 				if (local14 < Static217.anInt4903) {
-					if (!Static256.method4394(local10, local24, local14 + 128)) {
+					if (!SceneGraph.method4394(local10, local24, local14 + 128)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local24, local14 + 128)) {
+					if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) {
 						return false;
 					}
 				}
 				if (arg0 > 0) {
-					if (!Static256.method4394(local10, local28, local14 + 128)) {
+					if (!SceneGraph.method4394(local10, local28, local14 + 128)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local28, local14 + 128)) {
+					if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) {
 						return false;
 					}
 				}
-				if (!Static256.method4394(local10, local32, local14 + 128)) {
+				if (!SceneGraph.method4394(local10, local32, local14 + 128)) {
 					return false;
 				}
-				if (!Static256.method4394(local10 + 128, local32, local14 + 128)) {
+				if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) {
 					return false;
 				}
 				return true;
 			}
 			if (arg3 == 4) {
 				if (local10 < Static149.anInt3555) {
-					if (!Static256.method4394(local10 + 128, local24, local14)) {
+					if (!SceneGraph.method4394(local10 + 128, local24, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local24, local14 + 128)) {
+					if (!SceneGraph.method4394(local10 + 128, local24, local14 + 128)) {
 						return false;
 					}
 				}
 				if (arg0 > 0) {
-					if (!Static256.method4394(local10 + 128, local28, local14)) {
+					if (!SceneGraph.method4394(local10 + 128, local28, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local28, local14 + 128)) {
+					if (!SceneGraph.method4394(local10 + 128, local28, local14 + 128)) {
 						return false;
 					}
 				}
-				if (!Static256.method4394(local10 + 128, local32, local14)) {
+				if (!SceneGraph.method4394(local10 + 128, local32, local14)) {
 					return false;
 				}
-				if (!Static256.method4394(local10 + 128, local32, local14 + 128)) {
+				if (!SceneGraph.method4394(local10 + 128, local32, local14 + 128)) {
 					return false;
 				}
 				return true;
 			}
 			if (arg3 == 8) {
 				if (local14 > Static217.anInt4903) {
-					if (!Static256.method4394(local10, local24, local14)) {
+					if (!SceneGraph.method4394(local10, local24, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local24, local14)) {
+					if (!SceneGraph.method4394(local10 + 128, local24, local14)) {
 						return false;
 					}
 				}
 				if (arg0 > 0) {
-					if (!Static256.method4394(local10, local28, local14)) {
+					if (!SceneGraph.method4394(local10, local28, local14)) {
 						return false;
 					}
-					if (!Static256.method4394(local10 + 128, local28, local14)) {
+					if (!SceneGraph.method4394(local10 + 128, local28, local14)) {
 						return false;
 					}
 				}
-				if (!Static256.method4394(local10, local32, local14)) {
+				if (!SceneGraph.method4394(local10, local32, local14)) {
 					return false;
 				}
-				if (!Static256.method4394(local10 + 128, local32, local14)) {
+				if (!SceneGraph.method4394(local10 + 128, local32, local14)) {
 					return false;
 				}
 				return true;
 			}
 		}
-		if (!Static256.method4394(local10 + 64, local36, local14 + 64)) {
+		if (!SceneGraph.method4394(local10 + 64, local36, local14 + 64)) {
 			return false;
 		} else if (arg3 == 16) {
-			return Static256.method4394(local10, local32, local14 + 128);
+			return SceneGraph.method4394(local10, local32, local14 + 128);
 		} else if (arg3 == 32) {
-			return Static256.method4394(local10 + 128, local32, local14 + 128);
+			return SceneGraph.method4394(local10 + 128, local32, local14 + 128);
 		} else if (arg3 == 64) {
-			return Static256.method4394(local10 + 128, local32, local14);
+			return SceneGraph.method4394(local10 + 128, local32, local14);
 		} else if (arg3 == 128) {
-			return Static256.method4394(local10, local32, local14);
+			return SceneGraph.method4394(local10, local32, local14);
 		} else {
 			return true;
 		}
diff --git a/client/src/main/java/rt4/Static262.java b/client/src/main/java/rt4/Static262.java
index b46fd7e..e896e15 100644
--- a/client/src/main/java/rt4/Static262.java
+++ b/client/src/main/java/rt4/Static262.java
@@ -31,11 +31,11 @@ public final class Static262 {
 				SceneGraph.tiles[local42][arg1][arg2] = new Tile(local42, arg1, arg2);
 			}
 		}
-		SceneGraph.tiles[arg0][arg1][arg2].aClass77_1 = local8;
+		SceneGraph.tiles[arg0][arg1][arg2].wall = local8;
 	}
 
 	@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
 	public static JagString method4510(@OriginalArg(0) int arg0) {
-		return arg0 >= 999999999 ? Static220.aClass100_930 : Static123.parseInt(arg0);
+		return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0);
 	}
 }
diff --git a/client/src/main/java/rt4/Static264.java b/client/src/main/java/rt4/Static264.java
index 3a289c1..0acb964 100644
--- a/client/src/main/java/rt4/Static264.java
+++ b/client/src/main/java/rt4/Static264.java
@@ -32,28 +32,28 @@ public final class Static264 {
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!th;III)V")
 	public static void method3574(@OriginalArg(0) Entity arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
 		@Pc(12) Tile local12;
-		if (arg2 < Static152.mapSizeX) {
+		if (arg2 < SceneGraph.mapSizeX) {
 			local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3];
-			if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
-				arg0.method4544(local12.aClass15_1.primary, 128, 0, 0, true);
+			if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
+				arg0.method4544(local12.groundDecor.primary, 128, 0, 0, true);
 			}
 		}
-		if (arg3 < Static152.mapSizeX) {
+		if (arg3 < SceneGraph.mapSizeX) {
 			local12 = SceneGraph.tiles[arg1][arg2][arg3 + 1];
-			if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
-				arg0.method4544(local12.aClass15_1.primary, 0, 0, 128, true);
+			if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
+				arg0.method4544(local12.groundDecor.primary, 0, 0, 128, true);
 			}
 		}
-		if (arg2 < Static152.mapSizeX && arg3 < Static99.mapSizeZ) {
+		if (arg2 < SceneGraph.mapSizeX && arg3 < SceneGraph.mapSizeZ) {
 			local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 + 1];
-			if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
-				arg0.method4544(local12.aClass15_1.primary, 128, 0, 128, true);
+			if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
+				arg0.method4544(local12.groundDecor.primary, 128, 0, 128, true);
 			}
 		}
-		if (arg2 < Static152.mapSizeX && arg3 > 0) {
+		if (arg2 < SceneGraph.mapSizeX && arg3 > 0) {
 			local12 = SceneGraph.tiles[arg1][arg2 + 1][arg3 - 1];
-			if (local12 != null && local12.aClass15_1 != null && local12.aClass15_1.primary.method4543()) {
-				arg0.method4544(local12.aClass15_1.primary, 128, 0, -128, true);
+			if (local12 != null && local12.groundDecor != null && local12.groundDecor.primary.method4543()) {
+				arg0.method4544(local12.groundDecor.primary, 128, 0, -128, true);
 			}
 		}
 	}
diff --git a/client/src/main/java/rt4/Static265.java b/client/src/main/java/rt4/Static265.java
index 0dd676f..0d21364 100644
--- a/client/src/main/java/rt4/Static265.java
+++ b/client/src/main/java/rt4/Static265.java
@@ -12,7 +12,7 @@ public final class Static265 {
 	@OriginalMember(owner = "client!vj", name = "a", descriptor = "(III)J")
 	public static long method4521(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(7) Tile local7 = SceneGraph.tiles[arg0][arg1][arg2];
-		return local7 == null || local7.aClass77_1 == null ? 0L : local7.aClass77_1.key;
+		return local7 == null || local7.wall == null ? 0L : local7.wall.key;
 	}
 
 }
diff --git a/client/src/main/java/rt4/Static266.java b/client/src/main/java/rt4/Static266.java
index e99d406..5c6c014 100644
--- a/client/src/main/java/rt4/Static266.java
+++ b/client/src/main/java/rt4/Static266.java
@@ -48,19 +48,19 @@ public final class Static266 {
 				@Pc(22) Tile local22 = SceneGraph.tiles[arg0.anInt1709][local2][local9];
 				if (local22 != null) {
 					@Pc(26) int local26;
-					for (local26 = 0; local26 < local22.anInt662; local26++) {
-						if (local22.aClass31Array1[local26] == arg0) {
-							local22.anInt662--;
-							for (@Pc(44) int local44 = local26; local44 < local22.anInt662; local44++) {
-								local22.aClass31Array1[local44] = local22.aClass31Array1[local44 + 1];
+					for (local26 = 0; local26 < local22.sceneryLen; local26++) {
+						if (local22.scenery[local26] == arg0) {
+							local22.sceneryLen--;
+							for (@Pc(44) int local44 = local26; local44 < local22.sceneryLen; local44++) {
+								local22.scenery[local44] = local22.scenery[local44 + 1];
 								local22.anIntArray59[local44] = local22.anIntArray59[local44 + 1];
 							}
-							local22.aClass31Array1[local22.anInt662] = null;
+							local22.scenery[local22.sceneryLen] = null;
 							break;
 						}
 					}
 					local22.anInt664 = 0;
-					for (local26 = 0; local26 < local22.anInt662; local26++) {
+					for (local26 = 0; local26 < local22.sceneryLen; local26++) {
 						local22.anInt664 |= local22.anIntArray59[local26];
 					}
 				}
diff --git a/client/src/main/java/rt4/Static267.java b/client/src/main/java/rt4/Static267.java
index 8d38597..d8f2695 100644
--- a/client/src/main/java/rt4/Static267.java
+++ b/client/src/main/java/rt4/Static267.java
@@ -8,6 +8,8 @@ public final class Static267 {
 
 	@OriginalMember(owner = "client!vl", name = "e", descriptor = "[I")
 	public static final int[] anIntArray517 = new int[] { 1, 2, 4, 8 };
+	@OriginalMember(owner = "client!je", name = "U", descriptor = "Lclient!na;")
+	public static final JagString aClass100_588 = JagString.parse("showingVideoAd");
 
 	@OriginalMember(owner = "client!vl", name = "i", descriptor = "[I")
 	public static int[] anIntArray518 = new int[2];
@@ -24,8 +26,8 @@ public final class Static267 {
 		if (local7 == null) {
 			return null;
 		} else {
-			@Pc(14) GroundDecor local14 = local7.aClass15_1;
-			local7.aClass15_1 = null;
+			@Pc(14) GroundDecor local14 = local7.groundDecor;
+			local7.groundDecor = null;
 			return local14;
 		}
 	}
@@ -34,7 +36,7 @@ public final class Static267 {
 	public static boolean isShowingVideoAd() {
 		if (client.objectTag) {
 			try {
-				return !((Boolean) Static119.aClass100_588.browserControlCall(GameShell.signLink.applet));
+				return !((Boolean) aClass100_588.browserControlCall(GameShell.signLink.applet));
 			} catch (@Pc(21) Throwable local21) {
 			}
 		}
diff --git a/client/src/main/java/rt4/Static268.java b/client/src/main/java/rt4/Static268.java
deleted file mode 100644
index bdb27a6..0000000
--- a/client/src/main/java/rt4/Static268.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static268 {
-
-	@OriginalMember(owner = "client!w", name = "vb", descriptor = "[[I")
-	public static int[][] anIntArrayArray43;
-
-	@OriginalMember(owner = "client!w", name = "yb", descriptor = "[[I")
-	public static int[][] anIntArrayArray44;
-
-	@OriginalMember(owner = "client!w", name = "Bb", descriptor = "[I")
-	public static int[] anIntArray549;
-
-	@OriginalMember(owner = "client!w", name = "Db", descriptor = "[I")
-	public static int[] anIntArray550;
-
-	@OriginalMember(owner = "client!w", name = "Gb", descriptor = "I")
-	public static int anInt5791;
-
-	@OriginalMember(owner = "client!w", name = "Hb", descriptor = "[I")
-	public static int[] anIntArray552;
-
-	@OriginalMember(owner = "client!w", name = "Mb", descriptor = "I")
-	public static int anInt5792;
-
-	@OriginalMember(owner = "client!w", name = "Rb", descriptor = "I")
-	public static int anInt5793;
-
-	@OriginalMember(owner = "client!w", name = "Sb", descriptor = "[I")
-	public static int[] anIntArray558;
-
-	@OriginalMember(owner = "client!w", name = "ab", descriptor = "Lclient!w;")
-	public static final SoftwareModel aClass8_Sub1_Sub2_1 = new SoftwareModel();
-
-	@OriginalMember(owner = "client!w", name = "cb", descriptor = "[I")
-	public static int[] anIntArray535 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "db", descriptor = "[I")
-	public static int[] anIntArray536 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "eb", descriptor = "Lclient!w;")
-	public static final SoftwareModel aClass8_Sub1_Sub2_2 = new SoftwareModel();
-
-	@OriginalMember(owner = "client!w", name = "fb", descriptor = "[B")
-	public static byte[] aByteArray76 = new byte[1];
-
-	@OriginalMember(owner = "client!w", name = "hb", descriptor = "[I")
-	public static int[] anIntArray537 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "ib", descriptor = "[S")
-	public static short[] aShortArray93 = new short[1];
-
-	@OriginalMember(owner = "client!w", name = "jb", descriptor = "[I")
-	public static int[] anIntArray538 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "kb", descriptor = "[S")
-	public static short[] aShortArray94 = new short[1];
-
-	@OriginalMember(owner = "client!w", name = "lb", descriptor = "[I")
-	public static int[] anIntArray539 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "mb", descriptor = "[B")
-	public static byte[] aByteArray77 = new byte[1];
-
-	@OriginalMember(owner = "client!w", name = "nb", descriptor = "Lclient!w;")
-	public static final SoftwareModel aClass8_Sub1_Sub2_3 = new SoftwareModel();
-
-	@OriginalMember(owner = "client!w", name = "ob", descriptor = "[I")
-	public static int[] anIntArray540 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "pb", descriptor = "[Z")
-	public static final boolean[] aBooleanArray132 = new boolean[4096];
-
-	@OriginalMember(owner = "client!w", name = "qb", descriptor = "[I")
-	public static final int[] anIntArray541 = new int[12];
-
-	@OriginalMember(owner = "client!w", name = "rb", descriptor = "[I")
-	public static final int[] anIntArray542 = new int[10];
-
-	@OriginalMember(owner = "client!w", name = "sb", descriptor = "[I")
-	public static final int[] anIntArray543 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "tb", descriptor = "[I")
-	public static final int[] anIntArray544 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "ub", descriptor = "[I")
-	public static final int[] anIntArray545 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "wb", descriptor = "[I")
-	public static int[] anIntArray546 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "xb", descriptor = "[I")
-	public static final int[] anIntArray547 = new int[10];
-
-	@OriginalMember(owner = "client!w", name = "zb", descriptor = "Z")
-	public static boolean aBoolean306 = false;
-
-	@OriginalMember(owner = "client!w", name = "Ab", descriptor = "[I")
-	public static final int[] anIntArray548 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "Cb", descriptor = "I")
-	public static int anInt5790 = 0;
-
-	@OriginalMember(owner = "client!w", name = "Eb", descriptor = "[I")
-	public static final int[] anIntArray551 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "Fb", descriptor = "[B")
-	public static byte[] aByteArray78 = new byte[1];
-
-	@OriginalMember(owner = "client!w", name = "Ib", descriptor = "[I")
-	public static final int[] anIntArray553 = new int[10];
-
-	@OriginalMember(owner = "client!w", name = "Jb", descriptor = "[Z")
-	public static final boolean[] aBooleanArray133 = new boolean[4096];
-
-	@OriginalMember(owner = "client!w", name = "Kb", descriptor = "[[I")
-	public static final int[][] anIntArrayArray45 = new int[12][4096];
-
-	@OriginalMember(owner = "client!w", name = "Lb", descriptor = "[I")
-	public static int[] anIntArray554 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "Nb", descriptor = "[I")
-	public static final int[] anIntArray555 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "Ob", descriptor = "Z")
-	public static boolean aBoolean307 = false;
-
-	@OriginalMember(owner = "client!w", name = "Pb", descriptor = "[I")
-	public static final int[] anIntArray556 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "Qb", descriptor = "[I")
-	public static final int[] anIntArray557 = new int[12];
-
-	@OriginalMember(owner = "client!w", name = "Tb", descriptor = "[I")
-	public static int[] anIntArray559 = new int[1];
-
-	@OriginalMember(owner = "client!w", name = "Ub", descriptor = "[I")
-	public static final int[] anIntArray560 = new int[4096];
-
-	@OriginalMember(owner = "client!w", name = "Vb", descriptor = "[S")
-	public static short[] aShortArray95 = new short[1];
-
-	@OriginalMember(owner = "client!w", name = "Wb", descriptor = "[I")
-	public static final int[] anIntArray561 = new int[8192];
-
-	@OriginalMember(owner = "client!w", name = "m", descriptor = "()V")
-	public static void method4580() {
-		aBoolean307 = true;
-		anIntArray550 = new int[4096];
-		anIntArray549 = new int[4096];
-		anIntArray558 = null;
-		anIntArrayArray44 = null;
-		anIntArray552 = null;
-		anIntArrayArray43 = null;
-	}
-
-	@OriginalMember(owner = "client!w", name = "f", descriptor = "(I)I")
-	public static int method4582(@OriginalArg(0) int arg0) {
-		if (arg0 < 2) {
-			arg0 = 2;
-		} else if (arg0 > 126) {
-			arg0 = 126;
-		}
-		return arg0;
-	}
-
-	@OriginalMember(owner = "client!w", name = "o", descriptor = "()V")
-	public static void method4583() {
-		aBoolean307 = false;
-		anIntArray550 = null;
-		anIntArray549 = null;
-		anIntArray558 = new int[1600];
-		anIntArrayArray44 = new int[1600][64];
-		anIntArray552 = new int[32];
-		anIntArrayArray43 = new int[32][512];
-	}
-
-	@OriginalMember(owner = "client!w", name = "a", descriptor = "(II)I")
-	public static int method4585(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		arg1 = arg1 * (arg0 & 0x7F) >> 7;
-		if (arg1 < 2) {
-			arg1 = 2;
-		} else if (arg1 > 126) {
-			arg1 = 126;
-		}
-		return (arg0 & 0xFF80) + arg1;
-	}
-}
diff --git a/client/src/main/java/rt4/Static269.java b/client/src/main/java/rt4/Static269.java
index 98e0d97..c295bf0 100644
--- a/client/src/main/java/rt4/Static269.java
+++ b/client/src/main/java/rt4/Static269.java
@@ -176,7 +176,7 @@ public final class Static269 {
 					if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) {
 						local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0;
 						local529.anInt2235 = SceneGraph.tileHeights[local529.anInt2241][local190][local194] - local529.anInt2235;
-						Static120.method2389(local529);
+						LightingManager.method2389(local529);
 					}
 				}
 			}
@@ -219,9 +219,9 @@ public final class Static269 {
 			WorldMap.method3413();
 		}
 		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg0, arg1, arg0 + arg3, arg2 + arg1);
+			GlRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
 		} else {
-			SoftwareRaster.method2496(arg0, arg1, arg0 + arg3, arg2 + arg1);
+			SoftwareRaster.setClip(arg0, arg1, arg0 + arg3, arg2 + arg1);
 		}
 		@Pc(50) int local50;
 		@Pc(61) int local61;
@@ -259,13 +259,13 @@ public final class Static269 {
 			}
 			SoftwareRaster.method2491(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg3, arg2);
 			Static214.method4364(arg3, 0, local61, local50, 0, local236, arg2, local211);
-			Static48.method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
+			method1195(arg3, 0, local61, local236, arg2, 0, local211, local50);
 			Static38.method959(0, 0, local211, arg3, local236, local50, local61, arg2);
 			GlRaster.method1178(WorldMap.aClass3_Sub2_Sub1_Sub1_2.pixels, arg0, arg1, arg3, arg2);
 			SoftwareRaster.pixels = null;
 		} else {
 			Static214.method4364(arg3 + arg0, arg1, local61, local50, arg0, local236, arg1 + arg2, local211);
-			Static48.method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);
+			method1195(arg0 + arg3, arg0, local61, local236, arg2 + arg1, arg1, local211, local50);
 			Static38.method959(arg0, arg1, local211, arg0 + arg3, local236, local50, local61, arg2 + arg1);
 		}
 		if (Static201.anInt1864 > 0) {
@@ -279,7 +279,7 @@ public final class Static269 {
 		if (Cheat.displayFps) {
 			@Pc(405) int local405 = arg1 + arg2 - 8;
 			@Pc(412) int local412 = arg0 + arg3 - 5;
-			Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_FPS, Static123.parseInt((int)GameShell.framesPerSecond)}), local412, local405, 16776960, -1);
+			Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_FPS, JagString.parseInt((int)GameShell.framesPerSecond)}), local412, local405, 16776960, -1);
 			@Pc(434) Runtime runtime = Runtime.getRuntime();
 			@Pc(443) int memory = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L);
 			@Pc(445) int color = 16776960;
@@ -287,9 +287,17 @@ public final class Static269 {
 			if (memory > 95) {
 				color = 16711680;
 			}
-			Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_MEMORY, Static123.parseInt(memory), Cheat.DEBUG_MEMORY_UNIT}), local412, local446, color, -1);
+			Fonts.p12Full.renderRight(JagString.concatenate(new JagString[]{Cheat.DEBUG_MEMORY, JagString.parseInt(memory), Cheat.DEBUG_MEMORY_UNIT}), local412, local446, color, -1);
 			local405 = local446 - 15;
 		}
 	}
 
+    @OriginalMember(owner = "client!dl", name = "a", descriptor = "(IIIIIIIII)V")
+    public static void method1195(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
+        @Pc(13) int local13 = arg2 - arg6;
+        @Pc(17) int local17 = arg3 - arg7;
+        @Pc(26) int local26 = (arg0 - arg1 << 16) / local13;
+        @Pc(35) int local35 = (arg4 - arg5 << 16) / local17;
+        Static232.method3991(arg1, arg3, arg2, local35, arg6, local26, arg7, arg5);
+    }
 }
diff --git a/client/src/main/java/rt4/Static27.java b/client/src/main/java/rt4/Static27.java
index 06118e3..0896c49 100644
--- a/client/src/main/java/rt4/Static27.java
+++ b/client/src/main/java/rt4/Static27.java
@@ -7,7 +7,4 @@ public final class Static27 {
 	@OriginalMember(owner = "client!cb", name = "ab", descriptor = "Lclient!na;")
 	public static final JagString aClass100_164 = JagString.parse(" )2> <col=00ffff>");
 
-	@OriginalMember(owner = "client!cb", name = "fb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_168 = JagString.parse(": ");
-
 }
diff --git a/client/src/main/java/rt4/Static270.java b/client/src/main/java/rt4/Static270.java
index 3e15c61..378972e 100644
--- a/client/src/main/java/rt4/Static270.java
+++ b/client/src/main/java/rt4/Static270.java
@@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static270 {
 
-	@OriginalMember(owner = "client!wb", name = "b", descriptor = "[I")
+    @OriginalMember(owner = "client!ii", name = "e", descriptor = "Lclient!na;")
+	public static final JagString aClass100_570 = JagString.parse(")2");
+    @OriginalMember(owner = "client!wb", name = "b", descriptor = "[I")
 	public static int[] anIntArray562;
 
 	@OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;")
@@ -15,10 +17,7 @@ public final class Static270 {
 	@OriginalMember(owner = "client!wb", name = "c", descriptor = "I")
 	public static int anInt5794 = -1;
 
-	@OriginalMember(owner = "client!wb", name = "d", descriptor = "I")
-	public static int minimapState = 0;
-
-	@OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!wb", name = "e", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1090 = JagString.parse("l");
 
     @OriginalMember(owner = "client!wb", name = "a", descriptor = "(IIIIIIII)V")
@@ -140,15 +139,15 @@ public final class Static270 {
 		} else if (arg1 == 2) {
 			return arg0.getWorldInfo().name.method3126(arg2.getWorldInfo().name);
 		} else if (arg1 == 3) {
-			if (arg0.activity.strEquals(Static111.aClass100_570)) {
-				if (arg2.activity.strEquals(Static111.aClass100_570)) {
+			if (arg0.activity.strEquals(aClass100_570)) {
+				if (arg2.activity.strEquals(aClass100_570)) {
 					return 0;
 				} else if (arg3) {
 					return -1;
 				} else {
 					return 1;
 				}
-			} else if (arg2.activity.strEquals(Static111.aClass100_570)) {
+			} else if (arg2.activity.strEquals(aClass100_570)) {
 				return arg3 ? 1 : -1;
 			} else {
 				return arg0.activity.method3126(arg2.activity);
diff --git a/client/src/main/java/rt4/Static271.java b/client/src/main/java/rt4/Static271.java
index 58959c4..6a8846b 100644
--- a/client/src/main/java/rt4/Static271.java
+++ b/client/src/main/java/rt4/Static271.java
@@ -21,10 +21,4 @@ public final class Static271 {
 		arg0.offset += 24;
 	}
 
-	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V")
-	public static void method4600(@OriginalArg(1) int arg0) {
-		@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(4, arg0);
-		local8.pushClient();
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static272.java b/client/src/main/java/rt4/Static272.java
index 7150d39..7c5ee58 100644
--- a/client/src/main/java/rt4/Static272.java
+++ b/client/src/main/java/rt4/Static272.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static272 {
 
-    @OriginalMember(owner = "client!wd", name = "g", descriptor = "I")
-	public static int anInt5214 = 0;
-
-	@OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
+    @OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
 	public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(14) VarbitType local14 = VarbitTypeList.get(arg1);
 		@Pc(17) int local17 = local14.baseVar;
diff --git a/client/src/main/java/rt4/Static273.java b/client/src/main/java/rt4/Static273.java
index 58accdd..70ae9e6 100644
--- a/client/src/main/java/rt4/Static273.java
+++ b/client/src/main/java/rt4/Static273.java
@@ -9,17 +9,6 @@ public final class Static273 {
 	@OriginalMember(owner = "client!we", name = "H", descriptor = "[[B")
 	public static byte[][] mapFilesBuffer;
 
-	@OriginalMember(owner = "client!we", name = "w", descriptor = "I")
-	public static int anInt4130 = 0;
-
-	@OriginalMember(owner = "client!we", name = "a", descriptor = "(BI)I")
-	public static int method3211(@OriginalArg(1) int arg0) {
-		@Pc(13) int local13 = arg0 * (arg0 * arg0 >> 12) >> 12;
-		@Pc(26) int local26 = arg0 * 6 - 61440;
-		@Pc(34) int local34 = (arg0 * local26 >> 12) + 40960;
-		return local13 * local34 >> 12;
-	}
-
 	@OriginalMember(owner = "client!we", name = "a", descriptor = "(BILclient!be;)I")
 	public static int method3212(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
 		if (arg1.anIntArrayArray4 == null || arg0 >= arg1.anIntArrayArray4.length) {
@@ -152,17 +141,6 @@ public final class Static273 {
 		}
 	}
 
-	@OriginalMember(owner = "client!we", name = "b", descriptor = "(II)Z")
-	public static boolean method3213(@OriginalArg(1) int arg0) {
-		if (arg0 >= 32 && arg0 <= 126) {
-			return true;
-		} else if (arg0 >= 160 && arg0 <= 255) {
-			return true;
-		} else {
-			return arg0 == 128 || arg0 == 140 || arg0 == 151 || arg0 == 156 || arg0 == 159;
-		}
-	}
-
 	@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
 	public static void method3214(@OriginalArg(1) int arg0) {
 		for (@Pc(11) Node local11 = InterfaceList.properties.head(); local11 != null; local11 = InterfaceList.properties.next()) {
diff --git a/client/src/main/java/rt4/Static274.java b/client/src/main/java/rt4/Static274.java
deleted file mode 100644
index d9be0c8..0000000
--- a/client/src/main/java/rt4/Static274.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static274 {
-
-    @OriginalMember(owner = "client!wf", name = "d", descriptor = "I")
-	public static int anInt4997;
-
-	@OriginalMember(owner = "client!wf", name = "f", descriptor = "I")
-	public static int anInt4999;
-
-	@OriginalMember(owner = "client!wf", name = "j", descriptor = "Lclient!be;")
-	public static Component staticActiveComponent1;
-
-}
diff --git a/client/src/main/java/rt4/Static276.java b/client/src/main/java/rt4/Static276.java
index 970aca8..ab3fa97 100644
--- a/client/src/main/java/rt4/Static276.java
+++ b/client/src/main/java/rt4/Static276.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static276 {
 
-	@OriginalMember(owner = "client!wh", name = "c", descriptor = "[[[Lclient!bj;")
-	public static Tile[][][] underWaterGroundTiles;
-
 	@OriginalMember(owner = "client!wh", name = "j", descriptor = "[Lclient!cl;")
 	public static final AnimFrameset[] aClass3_Sub2_Sub7Array8 = new AnimFrameset[14];
 
@@ -23,7 +20,7 @@ public final class Static276 {
 		if (Static9.method187(arg0, arg1, arg2)) {
 			@Pc(10) int local10 = arg1 << 7;
 			@Pc(14) int local14 = arg2 << 7;
-			return Static256.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && Static256.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && Static256.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
+			return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
 		} else {
 			return false;
 		}
diff --git a/client/src/main/java/rt4/Static277.java b/client/src/main/java/rt4/Static277.java
index f21db90..72a34aa 100644
--- a/client/src/main/java/rt4/Static277.java
+++ b/client/src/main/java/rt4/Static277.java
@@ -9,9 +9,6 @@ public final class Static277 {
 	@OriginalMember(owner = "client!wi", name = "R", descriptor = "[Lclient!qf;")
 	public static Sprite[] hintMapEdge;
 
-	@OriginalMember(owner = "client!wi", name = "ab", descriptor = "I")
-	public static int anInt5853;
-
 	@OriginalMember(owner = "client!wi", name = "db", descriptor = "I")
 	public static int tileVisibilityDistance;
 
diff --git a/client/src/main/java/rt4/Static278.java b/client/src/main/java/rt4/Static278.java
index 3a9f25d..1774c8c 100644
--- a/client/src/main/java/rt4/Static278.java
+++ b/client/src/main/java/rt4/Static278.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static278 {
 
-	@OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1101 = JagString.parse(" <col=ffff00>");
-
-	@OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
+    @OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1103 = JagString.parse("ul");
 
 	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(IIIIIII)V")
@@ -26,19 +23,19 @@ public final class Static278 {
 		local3.anInt4449 = arg4;
 		local3.anInt4444 = arg5;
 		local3.anInt4447 = arg6;
-		Static91.aClass120Array1[Static28.anInt917++] = local3;
+		SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3;
 	}
 
 	@OriginalMember(owner = "client!wj", name = "a", descriptor = "(Z)V")
 	public static void setRenderTiles(@OriginalArg(0) boolean arg0) {
 		if (arg0) {
-			SceneGraph.tiles = Static276.underWaterGroundTiles;
+			SceneGraph.tiles = SceneGraph.underWaterGroundTiles;
 			SceneGraph.tileHeights = Static80.underWaterTileHeightMap;
-			Static182.aClass3_Sub14ArrayArray2 = Static195.underWaterHdTiles;
+			Static182.aClass3_Sub14ArrayArray2 = SceneGraph.underWaterHdTiles;
 		} else {
-			SceneGraph.tiles = Static197.surfaceGroundTiles;
+			SceneGraph.tiles = SceneGraph.surfaceGroundTiles;
 			SceneGraph.tileHeights = SceneGraph.surfaceTileHeights;
-			Static182.aClass3_Sub14ArrayArray2 = Static36.surfaceHdTiles;
+			Static182.aClass3_Sub14ArrayArray2 = SceneGraph.surfaceHdTiles;
 		}
 		Static126.anInt3114 = SceneGraph.tiles.length;
 	}
@@ -132,7 +129,7 @@ public final class Static278 {
 			Static143.hintMapMarkers[local19] = null;
 		}
 		PlayerList.size = 0;
-		Static272.anInt5214 = 0;
+		NpcList.size = 0;
 		for (local19 = 0; local19 < 2048; local19++) {
 			PlayerList.players[local19] = null;
 			PlayerList.appearanceCache[local19] = null;
@@ -143,13 +140,13 @@ public final class Static278 {
 		for (local19 = 0; local19 < 4; local19++) {
 			for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
 				for (@Pc(122) int local122 = 0; local122 < 104; local122++) {
-					Static159.aClass69ArrayArrayArray1[local19][local115][local122] = null;
+					Static159.objStacks[local19][local115][local122] = null;
 				}
 			}
 		}
 		Static35.resetCameraEffects();
 		Protocol.verifyId = 0;
-		Static8.resetTransientVars();
+		VarpDomain.reset();
 		Static73.method1596(true);
 	}
 }
diff --git a/client/src/main/java/rt4/Static279.java b/client/src/main/java/rt4/Static279.java
deleted file mode 100644
index f203b22..0000000
--- a/client/src/main/java/rt4/Static279.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static279 {
-
-	@OriginalMember(owner = "client!wk", name = "v", descriptor = "[I")
-	public static int[] anIntArray568;
-
-	@OriginalMember(owner = "client!wk", name = "x", descriptor = "Lclient!na;")
-	public static final JagString aClass100_1107 = JagString.parse(")4l=");
-
-	@OriginalMember(owner = "client!wk", name = "a", descriptor = "(I[Lclient!na;)[Lclient!na;")
-	public static JagString[] method4664(@OriginalArg(1) JagString[] arg0) {
-		@Pc(8) JagString[] local8 = new JagString[5];
-		for (@Pc(15) int local15 = 0; local15 < 5; local15++) {
-			local8[local15] = JagString.concatenate(new JagString[] { Static123.parseInt(local15), Static27.aClass100_168 });
-			if (arg0 != null && arg0[local15] != null) {
-				local8[local15] = JagString.concatenate(new JagString[] { local8[local15], arg0[local15] });
-			}
-		}
-		return local8;
-	}
-}
diff --git a/client/src/main/java/rt4/Static28.java b/client/src/main/java/rt4/Static28.java
index af919c1..ff5a17f 100644
--- a/client/src/main/java/rt4/Static28.java
+++ b/client/src/main/java/rt4/Static28.java
@@ -5,43 +5,40 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static28 {
 
-	@OriginalMember(owner = "client!cd", name = "s", descriptor = "I")
-	public static int anInt917;
-
 	@OriginalMember(owner = "client!cd", name = "a", descriptor = "(IIIIZ)V")
 	public static void method792(@OriginalArg(3) int tileVisibility, @OriginalArg(4) boolean hasUnderWaterMap) {
-		Static152.mapSizeX = 104;
-		Static99.mapSizeZ = 104;
+		SceneGraph.mapSizeX = 104;
+		SceneGraph.mapSizeZ = 104;
 		Static277.tileVisibilityDistance = tileVisibility;
-		Static197.surfaceGroundTiles = new Tile[4][Static152.mapSizeX][Static99.mapSizeZ];
-		SceneGraph.surfaceTileHeights = new int[4][Static152.mapSizeX + 1][Static99.mapSizeZ + 1];
+		SceneGraph.surfaceGroundTiles = new Tile[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
+		SceneGraph.surfaceTileHeights = new int[4][SceneGraph.mapSizeX + 1][SceneGraph.mapSizeZ + 1];
 		if (GlRenderer.enabled) {
-			Static36.surfaceHdTiles = new GlTile[4][];
+			SceneGraph.surfaceHdTiles = new GlTile[4][];
 		}
 		if (hasUnderWaterMap) {
-			Static276.underWaterGroundTiles = new Tile[1][Static152.mapSizeX][Static99.mapSizeZ];
-			Static62.anIntArrayArray11 = new int[Static152.mapSizeX][Static99.mapSizeZ];
-			Static80.underWaterTileHeightMap = new int[1][Static152.mapSizeX + 1][Static99.mapSizeZ + 1];
+			SceneGraph.underWaterGroundTiles = new Tile[1][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
+			Static62.anIntArrayArray11 = new int[SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
+			Static80.underWaterTileHeightMap = new int[1][SceneGraph.mapSizeX + 1][SceneGraph.mapSizeZ + 1];
 			if (GlRenderer.enabled) {
-				Static195.underWaterHdTiles = new GlTile[1][];
+				SceneGraph.underWaterHdTiles = new GlTile[1][];
 			}
 		} else {
-			Static276.underWaterGroundTiles = null;
+			SceneGraph.underWaterGroundTiles = null;
 			Static62.anIntArrayArray11 = null;
 			Static80.underWaterTileHeightMap = null;
-			Static195.underWaterHdTiles = null;
+			SceneGraph.underWaterHdTiles = null;
 		}
 		Static278.setRenderTiles(false);
-		Static91.aClass120Array1 = new Class120[500];
-		anInt917 = 0;
-		Static247.aClass120Array2 = new Class120[500];
-		Static215.anInt4870 = 0;
-		Static140.anIntArrayArrayArray12 = new int[4][Static152.mapSizeX + 1][Static99.mapSizeZ + 1];
-		Static243.aClass31Array3 = new Scenery[5000];
-		Static22.anInt726 = 0;
-		Static25.aClass31Array2 = new Scenery[100];
+		SceneGraph.aClass120Array1 = new Class120[500];
+		SceneGraph.anInt917 = 0;
+		SceneGraph.aClass120Array2 = new Class120[500];
+		SceneGraph.anInt4870 = 0;
+		Static140.anIntArrayArrayArray12 = new int[4][SceneGraph.mapSizeX + 1][SceneGraph.mapSizeZ + 1];
+		SceneGraph.aClass31Array3 = new Scenery[5000];
+		SceneGraph.anInt726 = 0;
+		SceneGraph.aClass31Array2 = new Scenery[100];
 		Static48.aBooleanArrayArray1 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 1];
 		Static89.aBooleanArrayArray3 = new boolean[Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2][Static277.tileVisibilityDistance + Static277.tileVisibilityDistance + 2];
-		Static232.aByteArrayArrayArray13 = new byte[4][Static152.mapSizeX][Static99.mapSizeZ];
+		Static232.aByteArrayArrayArray13 = new byte[4][SceneGraph.mapSizeX][SceneGraph.mapSizeZ];
 	}
 }
diff --git a/client/src/main/java/rt4/Static280.java b/client/src/main/java/rt4/Static280.java
index 8bae8b5..9020eea 100644
--- a/client/src/main/java/rt4/Static280.java
+++ b/client/src/main/java/rt4/Static280.java
@@ -657,10 +657,10 @@ public final class Static280 {
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIIIB)V")
 	public static void updateContainer(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(12) Inv local12 = (Inv) Static20.objectContainerCache.get((long) arg3);
+		@Pc(12) Inv local12 = (Inv) Inv.objectContainerCache.get((long) arg3);
 		if (local12 == null) {
 			local12 = new Inv();
-			Static20.objectContainerCache.put(local12, (long) arg3);
+			Inv.objectContainerCache.put(local12, (long) arg3);
 		}
 		if (arg1 >= local12.objectIds.length) {
 			@Pc(39) int[] local39 = new int[arg1 + 1];
@@ -681,9 +681,4 @@ public final class Static280 {
 		local12.anIntArray422[arg1] = arg2;
 	}
 
-	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(II)V")
-	public static void method4675(@OriginalArg(1) int arg0) {
-		@Pc(17) DelayedStateChange local17 = DelayedStateChange.create(11, arg0);
-		local17.pushClient();
-	}
 }
diff --git a/client/src/main/java/rt4/Static29.java b/client/src/main/java/rt4/Static29.java
deleted file mode 100644
index 9cbcdad..0000000
--- a/client/src/main/java/rt4/Static29.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static29 {
-
-    @OriginalMember(owner = "client!ce", name = "a", descriptor = "(I[B)Lclient!rk;")
-	public static Font method799(@OriginalArg(1) byte[] arg0) {
-		if (arg0 == null) {
-			return null;
-		}
-		@Pc(27) Font local27;
-		if (GlRenderer.enabled) {
-			local27 = new GlFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
-		} else {
-			local27 = new SoftwareFont(arg0, SpriteLoader.xOffsets, SpriteLoader.yOffsets, SpriteLoader.innerWidths, SpriteLoader.innerHeights, SpriteLoader.pixels);
-		}
-		SpriteLoader.clear();
-		return local27;
-	}
-
-}
diff --git a/client/src/main/java/rt4/Static3.java b/client/src/main/java/rt4/Static3.java
index 23e1760..401c6ed 100644
--- a/client/src/main/java/rt4/Static3.java
+++ b/client/src/main/java/rt4/Static3.java
@@ -9,9 +9,6 @@ public final class Static3 {
 	@OriginalMember(owner = "client!ab", name = "b", descriptor = "I")
 	public static int anInt5868 = 0;
 
-	@OriginalMember(owner = "client!ab", name = "c", descriptor = "[Z")
-	public static final boolean[] aBooleanArray135 = new boolean[200];
-
 	@OriginalMember(owner = "client!ab", name = "a", descriptor = "(Lclient!na;I)V")
 	public static void method4656(@OriginalArg(0) JagString arg0) {
 		@Pc(9) int local9 = Static171.method3218(arg0);
diff --git a/client/src/main/java/rt4/Static30.java b/client/src/main/java/rt4/Static30.java
deleted file mode 100644
index 7d8afac..0000000
--- a/client/src/main/java/rt4/Static30.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static30 {
-
-	@OriginalMember(owner = "client!cg", name = "e", descriptor = "Lclient!na;")
-	public static final JagString aClass100_184 = JagString.parse("1");
-
-    @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;")
-	public static final JagString aClass100_185 = JagString.parse(")3");
-
-}
diff --git a/client/src/main/java/rt4/Static31.java b/client/src/main/java/rt4/Static31.java
index e30749d..b141e28 100644
--- a/client/src/main/java/rt4/Static31.java
+++ b/client/src/main/java/rt4/Static31.java
@@ -7,12 +7,6 @@ public final class Static31 {
 	@OriginalMember(owner = "client!ch", name = "w", descriptor = "I")
 	public static int anInt987;
 
-	@OriginalMember(owner = "client!ch", name = "v", descriptor = "[B")
-	public static final byte[] aByteArray12 = new byte[] { 95, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 };
-
-	@OriginalMember(owner = "client!ch", name = "x", descriptor = "Lclient!na;")
-	public static final JagString aClass100_193 = JagString.parse(":");
-
 	@OriginalMember(owner = "client!ch", name = "z", descriptor = "[I")
 	public static final int[] anIntArray76 = new int[5];
 
diff --git a/client/src/main/java/rt4/Static33.java b/client/src/main/java/rt4/Static33.java
index f726176..887f853 100644
--- a/client/src/main/java/rt4/Static33.java
+++ b/client/src/main/java/rt4/Static33.java
@@ -1,5 +1,6 @@
 package rt4;
 
+import java.util.Calendar;
 import java.util.Date;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
@@ -7,12 +8,13 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static33 {
 
-    @OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;")
+	@OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;")
+	public static final JagString aClass100_351 = JagString.parse(" ");
+	@OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;")
+	public static final JagString aClass100_461 = JagString.parse(")1 ");
+	@OriginalMember(owner = "client!cj", name = "n", descriptor = "Lsignlink!im;")
 	public static PrivilegedRequest openUrlRequest;
 
-	@OriginalMember(owner = "client!cj", name = "i", descriptor = "[I")
-	public static final int[] anIntArray79 = new int[32768];
-
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ILclient!pb;ZIIII)Z")
 	public static boolean method867(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(5) int arg2, @OriginalArg(6) int arg3) {
 		@Pc(10) MsiType local10 = MsiTypeList.get(arg1.mapSceneId);
@@ -49,34 +51,17 @@ public final class Static33 {
 		return true;
 	}
 
-	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZI[B)Ljava/lang/Object;")
-	public static Object method869(@OriginalArg(2) byte[] arg0) {
-		if (arg0 == null) {
-			return null;
-		}
-		if (arg0.length > 136 && !Static84.aBoolean127) {
-			try {
-				@Pc(27) ByteArray local27 = new DirectByteArray();
-				local27.set(arg0);
-				return local27;
-			} catch (@Pc(34) Throwable local34) {
-				Static84.aBoolean127 = true;
-			}
-		}
-		return arg0;
-	}
-
-    @OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;")
+	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(JB)Lclient!na;")
 	public static JagString method873(@OriginalArg(0) long arg0) {
 		Static35.aCalendar1.setTime(new Date(arg0));
-		@Pc(13) int local13 = Static35.aCalendar1.get(7);
-		@Pc(17) int local17 = Static35.aCalendar1.get(5);
-		@Pc(21) int local21 = Static35.aCalendar1.get(2);
-		@Pc(32) int local32 = Static35.aCalendar1.get(1);
-		@Pc(36) int local36 = Static35.aCalendar1.get(11);
-		@Pc(40) int local40 = Static35.aCalendar1.get(12);
-		@Pc(44) int local44 = Static35.aCalendar1.get(13);
-		return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], Static74.aClass100_461, Static123.parseInt(local17 / 10), Static123.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, Static123.parseInt(local32), Static49.aClass100_351, Static123.parseInt(local36 / 10), Static123.parseInt(local36 % 10), Static264.COLON, Static123.parseInt(local40 / 10), Static123.parseInt(local40 % 10), Static264.COLON, Static123.parseInt(local44 / 10), Static123.parseInt(local44 % 10), Static55.aClass100_376 });
+		@Pc(13) int local13 = Static35.aCalendar1.get(Calendar.DAY_OF_WEEK);
+		@Pc(17) int local17 = Static35.aCalendar1.get(Calendar.DATE);
+		@Pc(21) int local21 = Static35.aCalendar1.get(Calendar.MONTH);
+		@Pc(32) int local32 = Static35.aCalendar1.get(Calendar.YEAR);
+		@Pc(36) int local36 = Static35.aCalendar1.get(Calendar.HOUR_OF_DAY);
+		@Pc(40) int local40 = Static35.aCalendar1.get(Calendar.MINUTE);
+		@Pc(44) int local44 = Static35.aCalendar1.get(Calendar.SECOND);
+		return JagString.concatenate(new JagString[] { Static219.aClass100Array149[local13 - 1], aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), Static270.aClass100_1089, Static138.aClass100Array102[local21], Static270.aClass100_1089, JagString.parseInt(local32), aClass100_351, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), Static264.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), Static264.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), Static55.aClass100_376 });
 	}
 
 	@OriginalMember(owner = "client!cj", name = "a", descriptor = "(ZIIIIIIFB)[[I")
diff --git a/client/src/main/java/rt4/Static35.java b/client/src/main/java/rt4/Static35.java
index 3ee3501..6d04d1c 100644
--- a/client/src/main/java/rt4/Static35.java
+++ b/client/src/main/java/rt4/Static35.java
@@ -90,10 +90,10 @@ public final class Static35 {
 		if (local7 == null) {
 			return 0L;
 		}
-		for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) {
-			@Pc(22) Scenery local22 = local7.aClass31Array1[local13];
-			if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
-				return local22.aLong56;
+		for (@Pc(13) int local13 = 0; local13 < local7.sceneryLen; local13++) {
+			@Pc(22) Scenery local22 = local7.scenery[local13];
+			if ((local22.key >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
+				return local22.key;
 			}
 		}
 		return 0L;
diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java
index 9d92ab0..9e4c3e5 100644
--- a/client/src/main/java/rt4/Static36.java
+++ b/client/src/main/java/rt4/Static36.java
@@ -6,13 +6,12 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static36 {
 
-	@OriginalMember(owner = "client!client", name = "kb", descriptor = "[[Lclient!hg;")
-	public static GlTile[][] surfaceHdTiles;
-
-	@OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
+    @OriginalMember(owner = "client!client", name = "lb", descriptor = "[I")
 	public static int[] mapFileIds;
+    @OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
+    public static int anInt1885;
 
-	@OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
+    @OriginalMember(owner = "client!client", name = "a", descriptor = "(Lclient!be;)Lclient!be;")
 	public static Component method938(@OriginalArg(0) Component arg0) {
 		@Pc(4) int local4 = InterfaceList.getServerActiveProperties(arg0).method505();
 		if (local4 == 0) {
@@ -181,12 +180,12 @@ public final class Static36 {
 									if (local212 && Static137.anInt3337 > 0) {
 										if (Static137.anInt3337 == 1 && (Static246.anInt5388 != Mouse.anInt4873 || Static165.anInt4035 != Mouse.anInt5032)) {
 											Static197.anInt4620 = WorldMap.anInt435;
-											Static71.anInt1885 = WorldMap.anInt919;
+											anInt1885 = WorldMap.anInt919;
 											Static137.anInt3337 = 2;
 										}
 										if (Static137.anInt3337 == 2) {
 											WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static246.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom));
-											WorldMap.method4641(Static71.anInt1885 + (int) ((double) (Static165.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom));
+											WorldMap.method4641(anInt1885 + (int) ((double) (Static165.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom));
 										}
 										continue;
 									}
diff --git a/client/src/main/java/rt4/Static37.java b/client/src/main/java/rt4/Static37.java
index 5f9f221..02bfb7c 100644
--- a/client/src/main/java/rt4/Static37.java
+++ b/client/src/main/java/rt4/Static37.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static37 {
 
-	@OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;")
-	public static TextureProvider anInterface1_1;
-
 	@OriginalMember(owner = "client!cm", name = "c", descriptor = "I")
 	public static int anInt1176;
 
diff --git a/client/src/main/java/rt4/Static38.java b/client/src/main/java/rt4/Static38.java
index 6f653a8..5eea936 100644
--- a/client/src/main/java/rt4/Static38.java
+++ b/client/src/main/java/rt4/Static38.java
@@ -6,7 +6,9 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static38 {
 
-	@OriginalMember(owner = "client!cn", name = "B", descriptor = "I")
+    @OriginalMember(owner = "client!di", name = "q", descriptor = "[Lclient!na;")
+    public static final JagString[] aClass100Array53 = new JagString[5];
+    @OriginalMember(owner = "client!cn", name = "B", descriptor = "I")
 	public static int anInt1196 = 1;
 
 	@OriginalMember(owner = "client!cn", name = "L", descriptor = "I")
@@ -70,11 +72,11 @@ public final class Static38 {
 					local82 = WorldMap.labels.anIntArray444[local11];
 				}
 				if (local84 != null) {
-					@Pc(211) int local211 = Fonts.p11Full.splitParagraph(WorldMap.labels.aClass100Array153[local11], null, Static45.aClass100Array53);
+					@Pc(211) int local211 = Fonts.p11Full.splitParagraph(WorldMap.labels.aClass100Array153[local11], null, aClass100Array53);
 					local80 -= local84.method1503() * (local211 - 1) / 2;
 					local80 += local84.method1511() / 2;
 					for (@Pc(231) int local231 = 0; local231 < local211; local231++) {
-						@Pc(242) JagString local242 = Static45.aClass100Array53[local231];
+						@Pc(242) JagString local242 = aClass100Array53[local231];
 						if (local211 - 1 > local231) {
 							local242.method3133(local242.length() - 4);
 						}
@@ -140,7 +142,7 @@ public final class Static38 {
 	@OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I")
 	public static int poll(@OriginalArg(0) boolean arg0) {
 		@Pc(4) long local4 = MonotonicClock.currentTimeMillis();
-		for (@Pc(28) LongNode local28 = arg0 ? (LongNode) Static199.aClass133_20.head() : (LongNode) Static199.aClass133_20.next(); local28 != null; local28 = (LongNode) Static199.aClass133_20.next()) {
+		for (@Pc(28) LongNode local28 = arg0 ? (LongNode) VarpDomain.aClass133_20.head() : (LongNode) VarpDomain.aClass133_20.next(); local28 != null; local28 = (LongNode) VarpDomain.aClass133_20.next()) {
 			if ((local28.value & 0x3FFFFFFFFFFFFFFFL) < local4) {
 				if ((local28.value & 0x4000000000000000L) != 0L) {
 					@Pc(58) int local58 = (int) local28.key;
diff --git a/client/src/main/java/rt4/Static4.java b/client/src/main/java/rt4/Static4.java
index 54de001..a9a37dc 100644
--- a/client/src/main/java/rt4/Static4.java
+++ b/client/src/main/java/rt4/Static4.java
@@ -12,9 +12,6 @@ public final class Static4 {
 	@OriginalMember(owner = "client!ac", name = "k", descriptor = "S")
 	public static short aShort1 = 32767;
 
-	@OriginalMember(owner = "client!ac", name = "l", descriptor = "Lclient!ck;")
-	public static final BasType aClass20_1 = new BasType();
-
 	@OriginalMember(owner = "client!ac", name = "n", descriptor = "I")
 	public static int anInt36 = 0;
 
@@ -35,12 +32,6 @@ public final class Static4 {
 		Static228.method3909(arg0.length - 1, arg0, 0, arg1);
 	}
 
-	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(BI)V")
-	public static void method24(@OriginalArg(1) int arg0) {
-		@Pc(16) DelayedStateChange local16 = DelayedStateChange.create(1, arg0);
-		local16.pushClient();
-	}
-
 	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(Lclient!na;I)I")
 	public static int method25(@OriginalArg(0) JagString arg0) {
 		if (arg0 == null) {
diff --git a/client/src/main/java/rt4/Static40.java b/client/src/main/java/rt4/Static40.java
index 06c36ec..a695ee9 100644
--- a/client/src/main/java/rt4/Static40.java
+++ b/client/src/main/java/rt4/Static40.java
@@ -9,9 +9,6 @@ public final class Static40 {
 	@OriginalMember(owner = "client!da", name = "ab", descriptor = "I")
 	public static int anInt1275;
 
-	@OriginalMember(owner = "client!da", name = "O", descriptor = "Lclient!na;")
-	public static final JagString aClass100_253 = JagString.parse("(U0a )2 via: ");
-
 	@OriginalMember(owner = "client!da", name = "d", descriptor = "(I)V")
 	public static void updateLoginScreenCamera() {
 		if (Static155.anInt3718 == -1 || Static52.anInt1694 == -1) {
diff --git a/client/src/main/java/rt4/Static41.java b/client/src/main/java/rt4/Static41.java
index 28ce909..26dff64 100644
--- a/client/src/main/java/rt4/Static41.java
+++ b/client/src/main/java/rt4/Static41.java
@@ -4,19 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static41 {
 
-    @OriginalMember(owner = "client!dc", name = "E", descriptor = "Lclient!na;")
-	private static final JagString aClass100_267 = JagString.parse("wave:");
-
-	@OriginalMember(owner = "client!dc", name = "M", descriptor = "Lclient!na;")
-	public static final JagString aClass100_268 = JagString.parse(")4");
-
-	@OriginalMember(owner = "client!dc", name = "R", descriptor = "Lclient!na;")
-	private static final JagString aClass100_269 = JagString.parse("Drop");
-
-    @OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
+	@OriginalMember(owner = "client!dc", name = "ab", descriptor = "I")
 	public static int anInt1316 = 0;
 
-	@OriginalMember(owner = "client!dc", name = "db", descriptor = "[[B")
-	public static final byte[][] aByteArrayArray6 = new byte[50][];
-
 }
diff --git a/client/src/main/java/rt4/Static43.java b/client/src/main/java/rt4/Static43.java
index 69bb1c9..181a4ed 100644
--- a/client/src/main/java/rt4/Static43.java
+++ b/client/src/main/java/rt4/Static43.java
@@ -49,7 +49,7 @@ public final class Static43 {
 		} else if (arg3 == 2) {
 			local9 = Static35.method899(arg2, arg1, arg0);
 		} else if (arg3 == 3) {
-			local9 = Static20.method602(arg2, arg1, arg0);
+			local9 = SceneGraph.method602(arg2, arg1, arg0);
 		}
 		@Pc(57) int local57 = (int) local9 >> 14 & 0x1F;
 		@Pc(70) int local70 = (int) (local9 >>> 32) & Integer.MAX_VALUE;
@@ -102,52 +102,52 @@ public final class Static43 {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, 0, local92 + 4, 0, local57, arg1, arg0, arg4);
+				Loc.method181(local74, 0, local92 + 4, 0, local57, arg1, arg0, arg4);
 			}
 			if (local102 instanceof Loc) {
 				((Loc) local102).method1046();
 			} else {
-				Static9.method181(local74, 0, local92 + 1 & 0x3, 0, local57, arg1, arg0, arg4);
+				Loc.method181(local74, 0, local92 + 1 & 0x3, 0, local57, arg1, arg0, arg4);
 			}
 		} else if (local57 == 5) {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, Static238.anIntArray469[local92] * 8, local92, Static34.anIntArray80[local92] * 8, 4, arg1, arg0, arg4);
+				Loc.method181(local74, Static238.anIntArray469[local92] * 8, local92, Static34.anIntArray80[local92] * 8, 4, arg1, arg0, arg4);
 			}
 		} else if (local57 == 6) {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
+				Loc.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
 			}
 		} else if (local57 == 7) {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, 0, (local92 + 2 & 0x3) + 4, 0, 4, arg1, arg0, arg4);
+				Loc.method181(local74, 0, (local92 + 2 & 0x3) + 4, 0, 4, arg1, arg0, arg4);
 			}
 		} else if (local57 == 8) {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
+				Loc.method181(local74, Static64.anIntArray154[local92] * 8, local92 + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
 			}
 			if (local102 instanceof Loc) {
 				((Loc) local102).method1046();
 			} else {
-				Static9.method181(local74, Static64.anIntArray154[local92] * 8, (local92 + 2 & 0x3) + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
+				Loc.method181(local74, Static64.anIntArray154[local92] * 8, (local92 + 2 & 0x3) + 4, Static114.anIntArray565[local92] * 8, 4, arg1, arg0, arg4);
 			}
 		} else if (local57 == 11) {
 			if (local100 instanceof Loc) {
 				((Loc) local100).method1046();
 			} else {
-				Static9.method181(local74, 0, local92 + 4, 0, 10, arg1, arg0, arg4);
+				Loc.method181(local74, 0, local92 + 4, 0, 10, arg1, arg0, arg4);
 			}
 		} else if (local100 instanceof Loc) {
 			((Loc) local100).method1046();
 		} else {
-			Static9.method181(local74, 0, local92, 0, local57, arg1, arg0, arg4);
+			Loc.method181(local74, 0, local92, 0, local57, arg1, arg0, arg4);
 		}
 	}
 }
diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java
index 8ded871..45f5fd1 100644
--- a/client/src/main/java/rt4/Static44.java
+++ b/client/src/main/java/rt4/Static44.java
@@ -21,7 +21,7 @@ public final class Static44 {
 		Static115.mapFlagX = 0;
 		MiniMenu.size = 0;
 		Protocol.opcode2 = -1;
-		Static270.minimapState = 0;
+		MiniMap.state = 0;
 		Player.rebootTimer = 0;
 		Protocol.opcode4 = -1;
 		Protocol.inboundBuffer.offset = 0;
diff --git a/client/src/main/java/rt4/Static45.java b/client/src/main/java/rt4/Static45.java
index dcd7108..ca16a21 100644
--- a/client/src/main/java/rt4/Static45.java
+++ b/client/src/main/java/rt4/Static45.java
@@ -6,12 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static45 {
 
-	@OriginalMember(owner = "client!di", name = "q", descriptor = "[Lclient!na;")
-	public static final JagString[] aClass100Array53 = new JagString[5];
-
-	@OriginalMember(owner = "client!di", name = "H", descriptor = "Z")
-	public static boolean aBoolean84 = false;
-
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V")
 	public static void method1169(@OriginalArg(0) CollisionMap[] collisionMaps, @OriginalArg(1) boolean underwater) {
 		@Pc(10) int level;
@@ -70,7 +64,7 @@ public final class Static45 {
 		@Pc(254) int local254;
 		@Pc(267) int local267;
 		for (local152 = 0; local152 < local128; local152++) {
-			@Pc(159) byte[][] local159 = Static118.aByteArrayArrayArray9[local152];
+			@Pc(159) byte[][] local159 = SceneGraph.aByteArrayArrayArray9[local152];
 			@Pc(273) int local273;
 			@Pc(326) int local326;
 			@Pc(332) int local332;
@@ -119,11 +113,11 @@ public final class Static45 {
 				}
 			}
 			for (local168 = 0; local168 < 104; local168++) {
-				Static221.anIntArray376[local168] = 0;
-				Static139.anIntArray325[local168] = 0;
-				Static279.anIntArray568[local168] = 0;
-				Static251.anIntArray479[local168] = 0;
-				Static128.anIntArray293[local168] = 0;
+				SceneGraph.anIntArray376[local168] = 0;
+				SceneGraph.anIntArray325[local168] = 0;
+				SceneGraph.anIntArray568[local168] = 0;
+				SceneGraph.anIntArray479[local168] = 0;
+				SceneGraph.anIntArray293[local168] = 0;
 			}
 			for (local168 = -5; local168 < 104; local168++) {
 				for (local173 = 0; local173 < 104; local173++) {
@@ -133,11 +127,11 @@ public final class Static45 {
 						local194 = SceneGraph.tileUnderlays[local152][local178][local173] & 0xFF;
 						if (local194 > 0) {
 							@Pc(693) FluType local693 = FluTypeList.get(local194 - 1);
-							Static221.anIntArray376[local173] += local693.weightedHue;
-							Static139.anIntArray325[local173] += local693.saturation;
-							Static279.anIntArray568[local173] += local693.lightness;
-							Static251.anIntArray479[local173] += local693.chroma;
-							local729 = Static128.anIntArray293[local173]++;
+							SceneGraph.anIntArray376[local173] += local693.weightedHue;
+							SceneGraph.anIntArray325[local173] += local693.saturation;
+							SceneGraph.anIntArray568[local173] += local693.lightness;
+							SceneGraph.anIntArray479[local173] += local693.chroma;
+							local729 = SceneGraph.anIntArray293[local173]++;
 						}
 					}
 					local194 = local168 - 5;
@@ -145,11 +139,11 @@ public final class Static45 {
 						local200 = SceneGraph.tileUnderlays[local152][local194][local173] & 0xFF;
 						if (local200 > 0) {
 							@Pc(758) FluType local758 = FluTypeList.get(local200 - 1);
-							Static221.anIntArray376[local173] -= local758.weightedHue;
-							Static139.anIntArray325[local173] -= local758.saturation;
-							Static279.anIntArray568[local173] -= local758.lightness;
-							Static251.anIntArray479[local173] -= local758.chroma;
-							local729 = Static128.anIntArray293[local173]--;
+							SceneGraph.anIntArray376[local173] -= local758.weightedHue;
+							SceneGraph.anIntArray325[local173] -= local758.saturation;
+							SceneGraph.anIntArray568[local173] -= local758.lightness;
+							SceneGraph.anIntArray479[local173] -= local758.chroma;
+							local729 = SceneGraph.anIntArray293[local173]--;
 						}
 					}
 				}
@@ -162,19 +156,19 @@ public final class Static45 {
 					for (local209 = -5; local209 < 104; local209++) {
 						local349 = local209 + 5;
 						if (local349 < 104) {
-							local178 += Static139.anIntArray325[local349];
-							local202 += Static128.anIntArray293[local349];
-							local173 += Static221.anIntArray376[local349];
-							local200 += Static251.anIntArray479[local349];
-							local194 += Static279.anIntArray568[local349];
+							local178 += SceneGraph.anIntArray325[local349];
+							local202 += SceneGraph.anIntArray293[local349];
+							local173 += SceneGraph.anIntArray376[local349];
+							local200 += SceneGraph.anIntArray479[local349];
+							local194 += SceneGraph.anIntArray568[local349];
 						}
 						local234 = local209 - 5;
 						if (local234 >= 0) {
-							local178 -= Static139.anIntArray325[local234];
-							local200 -= Static251.anIntArray479[local234];
-							local173 -= Static221.anIntArray376[local234];
-							local202 -= Static128.anIntArray293[local234];
-							local194 -= Static279.anIntArray568[local234];
+							local178 -= SceneGraph.anIntArray325[local234];
+							local200 -= SceneGraph.anIntArray479[local234];
+							local173 -= SceneGraph.anIntArray376[local234];
+							local202 -= SceneGraph.anIntArray293[local234];
+							local194 -= SceneGraph.anIntArray568[local234];
 						}
 						if (local209 >= 0 && local202 > 0) {
 							local142[local168][local209] = Static54.method1309(local194 / local202, local178 / local202, local173 * 256 / local200);
@@ -185,8 +179,8 @@ public final class Static45 {
 			for (local168 = 1; local168 < 103; local168++) {
 				label771: for (local173 = 1; local173 < 103; local173++) {
 					if (underwater || SceneGraph.allLevelsAreVisible() || (SceneGraph.tileFlags[0][local168][local173] & 0x2) != 0 || (SceneGraph.tileFlags[local152][local168][local173] & 0x10) == 0 && Static4.method22(local173, local168, local152) == Static41.anInt1316) {
-						if (Static146.anInt3508 > local152) {
-							Static146.anInt3508 = local152;
+						if (SceneGraph.firstVisibleLevel > local152) {
+							SceneGraph.firstVisibleLevel = local152;
 						}
 						local178 = SceneGraph.tileUnderlays[local152][local168][local173] & 0xFF;
 						local194 = SceneGraph.tileOverlays[local152][local168][local173] & 0xFF;
@@ -204,7 +198,7 @@ public final class Static45 {
 									local1067 = false;
 								}
 								if (local1067 && local200 == local202 && local200 == local209 && local349 == local200) {
-									Static60.anIntArrayArrayArray6[local152][local168][local173] |= 0x4;
+									SceneGraph.anIntArrayArrayArray6[local152][local168][local173] |= 0x4;
 								}
 							}
 							if (local178 <= 0) {
@@ -358,7 +352,7 @@ public final class Static45 {
 			SceneGraph.tileOverlays[local152] = null;
 			SceneGraph.tileShapes[local152] = null;
 			SceneGraph.tileAngles[local152] = null;
-			Static118.aByteArrayArrayArray9[local152] = null;
+			SceneGraph.aByteArrayArrayArray9[local152] = null;
 		}
 		Static220.method3801();
 		if (underwater) {
@@ -375,16 +369,16 @@ public final class Static45 {
 		for (local152 = 0; local152 < 4; local152++) {
 			for (local2204 = 0; local2204 <= 104; local2204++) {
 				for (local168 = 0; local168 <= 104; local168++) {
-					if ((Static60.anIntArrayArrayArray6[local152][local168][local2204] & 0x1) != 0) {
+					if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x1) != 0) {
 						local200 = local152;
-						for (local173 = local2204; local173 > 0 && (Static60.anIntArrayArrayArray6[local152][local168][local173 - 1] & 0x1) != 0; local173--) {
+						for (local173 = local2204; local173 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local173 - 1] & 0x1) != 0; local173--) {
 						}
 						local194 = local152;
-						for (local178 = local2204; local178 < 104 && (Static60.anIntArrayArrayArray6[local152][local168][local178 + 1] & 0x1) != 0; local178++) {
+						for (local178 = local2204; local178 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local178 + 1] & 0x1) != 0; local178++) {
 						}
 						label454: while (local194 > 0) {
 							for (local202 = local173; local202 <= local178; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local194 - 1][local168][local202] & 0x1) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local194 - 1][local168][local202] & 0x1) == 0) {
 									break label454;
 								}
 							}
@@ -392,7 +386,7 @@ public final class Static45 {
 						}
 						label443: while (local200 < 3) {
 							for (local202 = local173; local202 <= local178; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local200 + 1][local168][local202] & 0x1) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local200 + 1][local168][local202] & 0x1) == 0) {
 									break label443;
 								}
 							}
@@ -405,21 +399,21 @@ public final class Static45 {
 							Static278.method4647(1, local168 * 128, local168 * 128, local173 * 128, local178 * 128 + 128, local349, local234);
 							for (local254 = local194; local254 <= local200; local254++) {
 								for (local267 = local173; local267 <= local178; local267++) {
-									Static60.anIntArrayArrayArray6[local254][local168][local267] &= 0xFFFFFFFE;
+									SceneGraph.anIntArrayArrayArray6[local254][local168][local267] &= 0xFFFFFFFE;
 								}
 							}
 						}
 					}
-					if ((Static60.anIntArrayArrayArray6[local152][local168][local2204] & 0x2) != 0) {
-						for (local173 = local168; local173 > 0 && (Static60.anIntArrayArrayArray6[local152][local173 - 1][local2204] & 0x2) != 0; local173--) {
+					if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x2) != 0) {
+						for (local173 = local168; local173 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local173 - 1][local2204] & 0x2) != 0; local173--) {
 						}
 						local200 = local152;
 						local194 = local152;
-						for (local178 = local168; local178 < 104 && (Static60.anIntArrayArrayArray6[local152][local178 + 1][local2204] & 0x2) != 0; local178++) {
+						for (local178 = local168; local178 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local178 + 1][local2204] & 0x2) != 0; local178++) {
 						}
 						label508: while (local194 > 0) {
 							for (local202 = local173; local202 <= local178; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local194 - 1][local202][local2204] & 0x2) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local194 - 1][local202][local2204] & 0x2) == 0) {
 									break label508;
 								}
 							}
@@ -427,7 +421,7 @@ public final class Static45 {
 						}
 						label497: while (local200 < 3) {
 							for (local202 = local173; local202 <= local178; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local200 + 1][local202][local2204] & 0x2) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local200 + 1][local202][local2204] & 0x2) == 0) {
 									break label497;
 								}
 							}
@@ -440,21 +434,21 @@ public final class Static45 {
 							Static278.method4647(2, local173 * 128, local178 * 128 + 128, local2204 * 128, local2204 * 128, local349, local234);
 							for (local254 = local194; local254 <= local200; local254++) {
 								for (local267 = local173; local267 <= local178; local267++) {
-									Static60.anIntArrayArrayArray6[local254][local267][local2204] &= 0xFFFFFFFD;
+									SceneGraph.anIntArrayArrayArray6[local254][local267][local2204] &= 0xFFFFFFFD;
 								}
 							}
 						}
 					}
-					if ((Static60.anIntArrayArrayArray6[local152][local168][local2204] & 0x4) != 0) {
+					if ((SceneGraph.anIntArrayArrayArray6[local152][local168][local2204] & 0x4) != 0) {
 						local173 = local168;
 						local178 = local168;
-						for (local194 = local2204; local194 > 0 && (Static60.anIntArrayArrayArray6[local152][local168][local194 - 1] & 0x4) != 0; local194--) {
+						for (local194 = local2204; local194 > 0 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local194 - 1] & 0x4) != 0; local194--) {
 						}
-						for (local200 = local2204; local200 < 104 && (Static60.anIntArrayArrayArray6[local152][local168][local200 + 1] & 0x4) != 0; local200++) {
+						for (local200 = local2204; local200 < 104 && (SceneGraph.anIntArrayArrayArray6[local152][local168][local200 + 1] & 0x4) != 0; local200++) {
 						}
 						label562: while (local173 > 0) {
 							for (local202 = local194; local202 <= local200; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local152][local173 - 1][local202] & 0x4) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local152][local173 - 1][local202] & 0x4) == 0) {
 									break label562;
 								}
 							}
@@ -462,7 +456,7 @@ public final class Static45 {
 						}
 						label551: while (local178 < 104) {
 							for (local202 = local194; local202 <= local200; local202++) {
-								if ((Static60.anIntArrayArrayArray6[local152][local178 + 1][local202] & 0x4) == 0) {
+								if ((SceneGraph.anIntArrayArrayArray6[local152][local178 + 1][local202] & 0x4) == 0) {
 									break label551;
 								}
 							}
@@ -473,7 +467,7 @@ public final class Static45 {
 							Static278.method4647(4, local173 * 128, local178 * 128 + 128, local194 * 128, local200 * 128 + 128, local202, local202);
 							for (local209 = local173; local209 <= local178; local209++) {
 								for (local349 = local194; local349 <= local200; local349++) {
-									Static60.anIntArrayArrayArray6[local152][local209][local349] &= 0xFFFFFFFB;
+									SceneGraph.anIntArrayArrayArray6[local152][local209][local349] &= 0xFFFFFFFB;
 								}
 							}
 						}
diff --git a/client/src/main/java/rt4/Static47.java b/client/src/main/java/rt4/Static47.java
index 093e10b..cd540fe 100644
--- a/client/src/main/java/rt4/Static47.java
+++ b/client/src/main/java/rt4/Static47.java
@@ -12,9 +12,9 @@ public final class Static47 {
 		if (local7 == null) {
 			return null;
 		}
-		for (@Pc(13) int local13 = 0; local13 < local7.anInt662; local13++) {
-			@Pc(22) Scenery local22 = local7.aClass31Array1[local13];
-			if ((local22.aLong56 >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
+		for (@Pc(13) int local13 = 0; local13 < local7.sceneryLen; local13++) {
+			@Pc(22) Scenery local22 = local7.scenery[local13];
+			if ((local22.key >> 29 & 0x3L) == 2L && local22.anInt1701 == arg1 && local22.anInt1696 == arg2) {
 				Static266.method4193(local22);
 				return local22;
 			}
diff --git a/client/src/main/java/rt4/Static48.java b/client/src/main/java/rt4/Static48.java
index 1240bb0..f363c5c 100644
--- a/client/src/main/java/rt4/Static48.java
+++ b/client/src/main/java/rt4/Static48.java
@@ -1,28 +1,10 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static48 {
 
     @OriginalMember(owner = "client!dl", name = "h", descriptor = "[[Z")
 	public static boolean[][] aBooleanArrayArray1;
 
-	@OriginalMember(owner = "client!dl", name = "a", descriptor = "(IIIIIIIII)V")
-	public static void method1195(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
-		@Pc(13) int local13 = arg2 - arg6;
-		@Pc(17) int local17 = arg3 - arg7;
-		@Pc(26) int local26 = (arg0 - arg1 << 16) / local13;
-		@Pc(35) int local35 = (arg4 - arg5 << 16) / local17;
-		Static232.method3991(arg1, arg3, arg2, local35, arg6, local26, arg7, arg5);
-	}
-
-	@OriginalMember(owner = "client!dl", name = "a", descriptor = "(II)V")
-	public static void setIdleLoops(@OriginalArg(1) int arg0) {
-		@Pc(10) Mouse local10 = Mouse.instance;
-		synchronized (Mouse.instance) {
-			Mouse.anInt2467 = arg0;
-		}
-	}
 }
diff --git a/client/src/main/java/rt4/Static49.java b/client/src/main/java/rt4/Static49.java
index 8dd1678..226d0eb 100644
--- a/client/src/main/java/rt4/Static49.java
+++ b/client/src/main/java/rt4/Static49.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static49 {
 
-	@OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;")
-	public static final JagString aClass100_351 = JagString.parse(" ");
-
 	@OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
 	public static final JagString PERCENT_SIGN = JagString.parse("(U");
 
@@ -100,10 +97,10 @@ public final class Static49 {
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(Lclient!be;III)V")
 	public static void method1207(@OriginalArg(0) Component arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		if (MiniMenu.size < 2 && Static260.anInt5014 == 0 && !Static241.aBoolean302) {
+		if (MiniMenu.size < 2 && MiniMenu.anInt5014 == 0 && !Static241.aBoolean302) {
 			return;
 		}
-		@Pc(24) JagString local24 = Static13.method471();
+		@Pc(24) JagString local24 = MiniMenu.method471();
 		if (arg0 == null) {
 			@Pc(40) int local40 = Fonts.b12Full.method2859(local24, arg2 + 4, arg1 - -15, client.aRandom1, Static60.gregorianDateSeed);
 			Static133.method4012(arg2 + 4, Fonts.b12Full.getStringWidth(local24) + local40, arg1, 15);
diff --git a/client/src/main/java/rt4/Static5.java b/client/src/main/java/rt4/Static5.java
index ecc0eeb..92d6cac 100644
--- a/client/src/main/java/rt4/Static5.java
+++ b/client/src/main/java/rt4/Static5.java
@@ -15,18 +15,6 @@ public final class Static5 {
 	@OriginalMember(owner = "client!af", name = "m", descriptor = "Lclient!na;")
 	public static final JagString aClass100_10 = JagString.parse("<br>");
 
-	@OriginalMember(owner = "client!af", name = "a", descriptor = "(ILjava/lang/String;)V")
-	public static void method31(@OriginalArg(1) String arg0) {
-		System.out.println("Error: " + Static40.method1014("%0a", "\n", arg0));
-	}
-
-	@OriginalMember(owner = "client!af", name = "b", descriptor = "(B)V")
-	public static void resetWorldMap() {
-		WorldMap.clear(false);
-		System.gc();
-		client.setGameState(25);
-	}
-
 	@OriginalMember(owner = "client!af", name = "a", descriptor = "(IIIIIILclient!th;IJ)Z")
 	public static boolean method35(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) Entity arg6, @OriginalArg(8) long arg7) {
 		if (arg6 == null) {
diff --git a/client/src/main/java/rt4/Static50.java b/client/src/main/java/rt4/Static50.java
index e5806b9..fa4c298 100644
--- a/client/src/main/java/rt4/Static50.java
+++ b/client/src/main/java/rt4/Static50.java
@@ -16,6 +16,4 @@ public final class Static50 {
     @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;")
 	public static final JagString aClass100_363 = JagString.parse("_labels");
 
-	@OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;")
-	public static final JagString aClass100_365 = JagString.parse("www)2wtqa");
 }
diff --git a/client/src/main/java/rt4/Static52.java b/client/src/main/java/rt4/Static52.java
index 1d7ea37..345bde6 100644
--- a/client/src/main/java/rt4/Static52.java
+++ b/client/src/main/java/rt4/Static52.java
@@ -6,6 +6,14 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static52 {
 
+	@OriginalMember(owner = "client!kl", name = "u", descriptor = "Lclient!na;")
+	public static final JagString aClass100_637 = JagString.parse("<col=ffffff>");
+	@OriginalMember(owner = "client!ol", name = "Y", descriptor = "Lclient!na;")
+	public static final JagString aClass100_819 = JagString.parse("<col=00ff80>");
+	@OriginalMember(owner = "client!ib", name = "g", descriptor = "Lclient!na;")
+	public static final JagString aClass100_559 = JagString.parse("<col=ffff00>");
+	@OriginalMember(owner = "client!jj", name = "m", descriptor = "Lclient!na;")
+	public static final JagString aClass100_594 = JagString.parse("<)4col>");
 	@OriginalMember(owner = "client!eb", name = "u", descriptor = "I")
 	public static int anInt1695;
 
@@ -34,11 +42,11 @@ public final class Static52 {
 	@OriginalMember(owner = "client!eb", name = "b", descriptor = "(II)Lclient!na;")
 	public static JagString method1288(@OriginalArg(1) int arg0) {
 		if (arg0 < 100000) {
-			return JagString.concatenate(new JagString[] { Static105.aClass100_559, Static123.parseInt(arg0), Static123.aClass100_594 });
+			return JagString.concatenate(new JagString[] { aClass100_559, JagString.parseInt(arg0), aClass100_594 });
 		} else if (arg0 >= 10000000) {
-			return JagString.concatenate(new JagString[] { Static184.aClass100_819, Static123.parseInt(arg0 / 1000000), LocalizedText.MILLION, Static123.aClass100_594 });
+			return JagString.concatenate(new JagString[] { aClass100_819, JagString.parseInt(arg0 / 1000000), LocalizedText.MILLION, aClass100_594 });
 		} else {
-			return JagString.concatenate(new JagString[] { Static137.aClass100_637, Static123.parseInt(arg0 / 1000), LocalizedText.THOUSAND, Static123.aClass100_594 });
+			return JagString.concatenate(new JagString[] { aClass100_637, JagString.parseInt(arg0 / 1000), LocalizedText.THOUSAND, aClass100_594 });
 		}
 	}
 }
diff --git a/client/src/main/java/rt4/Static53.java b/client/src/main/java/rt4/Static53.java
index 53a863e..2893e32 100644
--- a/client/src/main/java/rt4/Static53.java
+++ b/client/src/main/java/rt4/Static53.java
@@ -67,7 +67,7 @@ public final class Static53 {
 		if (!Static241.aBoolean302) {
 			return;
 		}
-		@Pc(19) Component local19 = Static201.method1418(Static98.anInt2512, Static15.anInt506);
+		@Pc(19) Component local19 = Static201.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
 		if (local19 != null && local19.anObjectArray27 != null) {
 			@Pc(29) HookRequest local29 = new HookRequest();
 			local29.arguments = local19.anObjectArray27;
diff --git a/client/src/main/java/rt4/Static54.java b/client/src/main/java/rt4/Static54.java
index 6ca9f4c..9dec128 100644
--- a/client/src/main/java/rt4/Static54.java
+++ b/client/src/main/java/rt4/Static54.java
@@ -19,194 +19,6 @@ public final class Static54 {
 		}
 	}
 
-	@OriginalMember(owner = "client!ed", name = "a", descriptor = "(IBIILclient!be;)V")
-	public static void method1305(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) {
-		client.audioLoop();
-		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
-		} else {
-			SoftwareRaster.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
-		}
-		if (Static270.minimapState != 2 && Static270.minimapState != 5 && MiniMap.sprite != null) {
-			@Pc(48) int local48 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
-			@Pc(57) int local57 = PlayerList.self.xFine / 32 + 48;
-			@Pc(67) int local67 = 464 - PlayerList.self.zFine / 32;
-			if (GlRenderer.enabled) {
-				((GlSprite) MiniMap.sprite).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false));
-			} else {
-				((SoftwareSprite) MiniMap.sprite).drawMinimapRegion(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45);
-			}
-			@Pc(146) int local146;
-			@Pc(181) int local181;
-			@Pc(150) int local150;
-			@Pc(154) int local154;
-			@Pc(231) int local231;
-			@Pc(200) int local200;
-			@Pc(239) int local239;
-			@Pc(271) int local271;
-			if (Static235.mapElementList != null) {
-				for (@Pc(117) int local117 = 0; local117 < Static235.mapElementList.anInt5074; local117++) {
-					if (Static235.mapElementList.method3892(local117)) {
-						local146 = (Static235.mapElementList.aShortArray73[local117] - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
-						local150 = MathUtils.sin[local48];
-						local154 = MathUtils.cos[local48];
-						@Pc(156) Font local156 = Fonts.p11Full;
-						@Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256);
-						local181 = (Static235.mapElementList.aShortArray72[local117] - Static142.originZ) * 4 + 2 - PlayerList.self.zFine / 32;
-						@Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256);
-						local200 = local181 * local189 - local146 * local164 >> 16;
-						if (Static235.mapElementList.method3894(local117) == 1) {
-							local156 = Fonts.p12Full;
-						}
-						if (Static235.mapElementList.method3894(local117) == 2) {
-							local156 = Fonts.b12Full;
-						}
-						local231 = local164 * local181 + local189 * local146 >> 16;
-						local239 = local156.method2856(Static235.mapElementList.aClass100Array153[local117], 100);
-						@Pc(245) int local245 = local231 - local239 / 2;
-						if (local245 >= -arg3.anInt445 && local245 <= arg3.anInt445 && local200 >= -arg3.anInt459 && local200 <= arg3.anInt459) {
-							local271 = 16777215;
-							if (Static235.mapElementList.anIntArray444[local117] != -1) {
-								local271 = Static235.mapElementList.anIntArray444[local117];
-							}
-							if (GlRenderer.enabled) {
-								GlFont.method1188((GlSprite) arg3.method489(false));
-							} else {
-								SoftwareRaster.method2486(arg3.anIntArray37, arg3.anIntArray45);
-							}
-							local156.renderParagraphAlpha(Static235.mapElementList.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
-							if (GlRenderer.enabled) {
-								GlFont.method1173();
-							} else {
-								SoftwareRaster.method2482();
-							}
-						}
-					}
-				}
-			}
-			for (local146 = 0; local146 < MiniMap.locs; local146++) {
-				local181 = MiniMap.locX[local146] * 4 + 2 - PlayerList.self.xFine / 32;
-				local150 = MiniMap.locZ[local146] * 4 + 2 - PlayerList.self.zFine / 32;
-				@Pc(382) LocType local382 = LocTypeList.get(MiniMap.locId[local146]);
-				if (local382.multiLocs != null) {
-					local382 = local382.getMultiLoc();
-					if (local382 == null || local382.mapElement == -1) {
-						continue;
-					}
-				}
-				Static60.method1446(arg3, Static67.mapfuncs[local382.mapElement], local150, local181, arg1, arg2);
-			}
-			for (local146 = 0; local146 < 104; local146++) {
-				for (local181 = 0; local181 < 104; local181++) {
-					@Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Player.level][local146][local181];
-					if (local439 != null) {
-						local154 = local146 * 4 + 2 - PlayerList.self.xFine / 32;
-						local231 = local181 * 4 + 2 - PlayerList.self.zFine / 32;
-						Static60.method1446(arg3, Sprites.mapdots[0], local231, local154, arg1, arg2);
-					}
-				}
-			}
-			for (local146 = 0; local146 < Static272.anInt5214; local146++) {
-				@Pc(498) Npc local498 = NpcList.npcs[Static33.anIntArray79[local146]];
-				if (local498 != null && local498.method2682()) {
-					@Pc(507) NpcType local507 = local498.type;
-					if (local507 != null && local507.multiNpcs != null) {
-						local507 = local507.getMultiNpc();
-					}
-					if (local507 != null && local507.aBoolean184 && local507.aBoolean183) {
-						local154 = local498.xFine / 32 - PlayerList.self.xFine / 32;
-						local231 = local498.zFine / 32 - PlayerList.self.zFine / 32;
-						if (local507.anInt3739 == -1) {
-							Static60.method1446(arg3, Sprites.mapdots[1], local231, local154, arg1, arg2);
-						} else {
-							Static60.method1446(arg3, Static67.mapfuncs[local507.anInt3739], local231, local154, arg1, arg2);
-						}
-					}
-				}
-			}
-			for (local146 = 0; local146 < PlayerList.size; local146++) {
-				@Pc(591) Player local591 = PlayerList.players[PlayerList.ids[local146]];
-				if (local591 != null && local591.method2682()) {
-					local154 = local591.zFine / 32 - PlayerList.self.zFine / 32;
-					local150 = local591.xFine / 32 - PlayerList.self.xFine / 32;
-					@Pc(624) long local624 = local591.username.encode37();
-					@Pc(626) boolean local626 = false;
-					for (local239 = 0; local239 < FriendsList.size; local239++) {
-						if (local624 == FriendsList.encodedUsernames[local239] && FriendsList.worlds[local239] != 0) {
-							local626 = true;
-							break;
-						}
-					}
-					@Pc(660) boolean local660 = false;
-					for (local271 = 0; local271 < ClanChat.size; local271++) {
-						if (local624 == ClanChat.members[local271].key) {
-							local660 = true;
-							break;
-						}
-					}
-					@Pc(682) boolean local682 = false;
-					if (PlayerList.self.anInt1650 != 0 && local591.anInt1650 != 0 && local591.anInt1650 == PlayerList.self.anInt1650) {
-						local682 = true;
-					}
-					if (local626) {
-						Static60.method1446(arg3, Sprites.mapdots[3], local154, local150, arg1, arg2);
-					} else if (local660) {
-						Static60.method1446(arg3, Sprites.mapdots[5], local154, local150, arg1, arg2);
-					} else if (local682) {
-						Static60.method1446(arg3, Sprites.mapdots[4], local154, local150, arg1, arg2);
-					} else {
-						Static60.method1446(arg3, Sprites.mapdots[2], local154, local150, arg1, arg2);
-					}
-				}
-			}
-			@Pc(756) MapMarker[] local756 = Static143.hintMapMarkers;
-			for (local181 = 0; local181 < local756.length; local181++) {
-				@Pc(770) MapMarker local770 = local756[local181];
-				if (local770 != null && local770.type != 0 && client.loop % 20 < 10) {
-					if (local770.type == 1 && local770.actorTargetId >= 0 && local770.actorTargetId < NpcList.npcs.length) {
-						@Pc(804) Npc local804 = NpcList.npcs[local770.actorTargetId];
-						if (local804 != null) {
-							local231 = local804.xFine / 32 - PlayerList.self.xFine / 32;
-							local200 = local804.zFine / 32 - PlayerList.self.zFine / 32;
-							Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
-						}
-					}
-					if (local770.type == 2) {
-						local154 = (local770.targetX - Static225.originX) * 4 + 2 - PlayerList.self.xFine / 32;
-						local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - PlayerList.self.zFine / 32;
-						Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
-					}
-					if (local770.type == 10 && local770.actorTargetId >= 0 && PlayerList.players.length > local770.actorTargetId) {
-						@Pc(905) Player local905 = PlayerList.players[local770.actorTargetId];
-						if (local905 != null) {
-							local200 = local905.zFine / 32 - PlayerList.self.zFine / 32;
-							local231 = local905.xFine / 32 - PlayerList.self.xFine / 32;
-							Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
-						}
-					}
-				}
-			}
-			if (Static115.mapFlagX != 0) {
-				local146 = Static115.mapFlagX * 4 + 2 - PlayerList.self.xFine / 32;
-				local181 = Static84.anInt2255 * 4 + 2 - PlayerList.self.zFine / 32;
-				Static60.method1446(arg3, Sprites.mapflags, local181, local146, arg1, arg2);
-			}
-			if (GlRenderer.enabled) {
-				GlRaster.method1186(arg2 + arg3.anInt445 / 2 - 1, arg1 + -1 - -(arg3.anInt459 / 2), 3, 3, 16777215);
-			} else {
-				SoftwareRaster.fillRect(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215);
-			}
-		} else if (GlRenderer.enabled) {
-			@Pc(1041) Sprite local1041 = arg3.method489(false);
-			if (local1041 != null) {
-				local1041.method1423(arg2, arg1);
-			}
-		} else {
-			SoftwareRaster.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45);
-		}
-		InterfaceList.rectangleRedraw[arg0] = true;
-	}
-
 	@OriginalMember(owner = "client!ed", name = "a", descriptor = "(ZIIII)V")
 	public static void method1306(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		if (arg3 >= TextureOp29.anInt4164 && arg3 <= TextureOp29.anInt5063) {
diff --git a/client/src/main/java/rt4/Static56.java b/client/src/main/java/rt4/Static56.java
index 094c936..91f78ef 100644
--- a/client/src/main/java/rt4/Static56.java
+++ b/client/src/main/java/rt4/Static56.java
@@ -7,10 +7,7 @@ public final class Static56 {
 	@OriginalMember(owner = "client!ef", name = "f", descriptor = "Lclient!na;")
 	public static final JagString DUELSTAKE = JagString.parse(":duelstake:");
 
-	@OriginalMember(owner = "client!ef", name = "g", descriptor = "I")
-	public static int anInt1742 = -1;
-
-	@OriginalMember(owner = "client!ef", name = "r", descriptor = "Lclient!be;")
+    @OriginalMember(owner = "client!ef", name = "r", descriptor = "Lclient!be;")
 	public static Component aClass13_12 = null;
 
 }
diff --git a/client/src/main/java/rt4/Static57.java b/client/src/main/java/rt4/Static57.java
index d2f1f6b..8ee227e 100644
--- a/client/src/main/java/rt4/Static57.java
+++ b/client/src/main/java/rt4/Static57.java
@@ -5,13 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static57 {
 
-	@OriginalMember(owner = "client!eg", name = "a", descriptor = "I")
-	public static int anInt1744;
-
-	@OriginalMember(owner = "client!eg", name = "t", descriptor = "I")
-	public static int anInt1757;
-
-    @OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V")
+	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(IIIIIIII)V")
 	public static void method1320(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
 		if (InterfaceList.load(arg4)) {
 			Static36.method946(InterfaceList.components[arg4], -1, arg5, arg1, arg3, arg6, arg0, arg2);
diff --git a/client/src/main/java/rt4/Static60.java b/client/src/main/java/rt4/Static60.java
index ffaf98e..9d5fd67 100644
--- a/client/src/main/java/rt4/Static60.java
+++ b/client/src/main/java/rt4/Static60.java
@@ -1,48 +1,16 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
 
 public final class Static60 {
 
-	@OriginalMember(owner = "client!em", name = "t", descriptor = "[[[I")
-	public static int[][][] anIntArrayArrayArray6;
-
     @OriginalMember(owner = "client!em", name = "w", descriptor = "I")
 	public static int anInt1892;
 
 	@OriginalMember(owner = "client!em", name = "D", descriptor = "I")
 	public static int gregorianDateSeed;
 
-	@OriginalMember(owner = "client!em", name = "u", descriptor = "Lclient!na;")
-	public static final JagString aClass100_420 = JagString.parse(")1o");
-
-    @OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
+	@OriginalMember(owner = "client!em", name = "z", descriptor = "Z")
 	public static boolean aBoolean108 = false;
 
-    @OriginalMember(owner = "client!em", name = "a", descriptor = "(Lclient!be;Lclient!qf;IIIBI)V")
-	public static void method1446(@OriginalArg(0) Component arg0, @OriginalArg(1) Sprite arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5) {
-		if (arg1 == null) {
-			return;
-		}
-		@Pc(21) int local21 = arg3 * arg3 + arg2 * arg2;
-		@Pc(27) int local27 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
-		@Pc(39) int local39 = Math.max(arg0.anInt445 / 2, arg0.anInt459 / 2) + 10;
-		if (local39 * local39 < local21) {
-			return;
-		}
-		@Pc(50) int local50 = MathUtils.sin[local27];
-		@Pc(58) int local58 = local50 * 256 / (Static273.anInt4130 + 256);
-		@Pc(62) int local62 = MathUtils.cos[local27];
-		@Pc(70) int local70 = local62 * 256 / (Static273.anInt4130 + 256);
-		@Pc(81) int local81 = local58 * arg2 + arg3 * local70 >> 16;
-		@Pc(92) int local92 = local70 * arg2 - arg3 * local58 >> 16;
-		if (GlRenderer.enabled) {
-			((GlSprite) arg1).method1425(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, arg0.anInt459 / 2 + arg4 - (local92 + arg1.anInt1866 / 2), (GlSprite) arg0.method489(false));
-		} else {
-			((SoftwareSprite) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45);
-		}
-	}
-
 }
diff --git a/client/src/main/java/rt4/Static61.java b/client/src/main/java/rt4/Static61.java
index 82edd73..cff9c2f 100644
--- a/client/src/main/java/rt4/Static61.java
+++ b/client/src/main/java/rt4/Static61.java
@@ -13,7 +13,4 @@ public final class Static61 {
 	@OriginalMember(owner = "client!en", name = "t", descriptor = "[I")
 	public static final int[] anIntArray148 = new int[14];
 
-	@OriginalMember(owner = "client!en", name = "x", descriptor = "Lclient!na;")
-	public static final JagString aClass100_424 = JagString.parse("http:)4)4");
-
 }
diff --git a/client/src/main/java/rt4/Static62.java b/client/src/main/java/rt4/Static62.java
index 2605010..8421847 100644
--- a/client/src/main/java/rt4/Static62.java
+++ b/client/src/main/java/rt4/Static62.java
@@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static62 {
 
-	@OriginalMember(owner = "client!f", name = "P", descriptor = "[I")
-	public static int[] anIntArray150;
-
 	@OriginalMember(owner = "client!f", name = "ab", descriptor = "[[I")
 	public static int[][] anIntArrayArray11;
 
diff --git a/client/src/main/java/rt4/Static64.java b/client/src/main/java/rt4/Static64.java
index c610ae3..8aeb249 100644
--- a/client/src/main/java/rt4/Static64.java
+++ b/client/src/main/java/rt4/Static64.java
@@ -7,10 +7,7 @@ public final class Static64 {
 	@OriginalMember(owner = "client!fb", name = "h", descriptor = "[I")
 	public static int[] anIntArray153;
 
-	@OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;")
-	public static final JagString aClass100_431 = JagString.parse("; Max)2Age=");
-
-    @OriginalMember(owner = "client!fb", name = "q", descriptor = "[I")
+	@OriginalMember(owner = "client!fb", name = "q", descriptor = "[I")
 	public static final int[] anIntArray154 = new int[] { -1, -1, 1, 1 };
 
 }
diff --git a/client/src/main/java/rt4/Static68.java b/client/src/main/java/rt4/Static68.java
index cfc533c..f3a2cc9 100644
--- a/client/src/main/java/rt4/Static68.java
+++ b/client/src/main/java/rt4/Static68.java
@@ -7,12 +7,6 @@ public final class Static68 {
 	@OriginalMember(owner = "client!fg", name = "d", descriptor = "[I")
 	public static final int[] anIntArray159 = new int[6];
 
-	@OriginalMember(owner = "client!fg", name = "i", descriptor = "[[I")
-	public static final int[][] anIntArrayArray12 = new int[][] { { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 6 }, { 1, 3, 5, 7, 2, 6 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 2, 8 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 11, 12 }, { 1, 3, 5, 7, 13, 14 } };
-
-	@OriginalMember(owner = "client!fg", name = "j", descriptor = "[[I")
-	public static final int[][] anIntArrayArray13 = new int[][] { { 0, 1, 2, 3, 0, 0, 1, 3 }, { 1, 1, 2, 3, 1, 0, 1, 3 }, { 0, 1, 2, 3, 1, 0, 1, 3 }, { 0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3 }, { 0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4 }, { 0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4 }, { 0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3 }, { 0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3 }, { 0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5 }, { 0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5 }, { 0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3 }, { 1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3 }, { 1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5 } };
-
 	@OriginalMember(owner = "client!fg", name = "l", descriptor = "[I")
 	public static final int[] anIntArray164 = new int[6];
 
diff --git a/client/src/main/java/rt4/Static69.java b/client/src/main/java/rt4/Static69.java
index 7191141..61a363f 100644
--- a/client/src/main/java/rt4/Static69.java
+++ b/client/src/main/java/rt4/Static69.java
@@ -37,9 +37,9 @@ public final class Static69 {
 		@Pc(34) int local34 = 0;
 		@Pc(42) Tile local42 = SceneGraph.tiles[arg0][arg1][arg2];
 		if (local42 != null) {
-			for (@Pc(46) int local46 = 0; local46 < local42.anInt662; local46++) {
-				@Pc(55) Scenery local55 = local42.aClass31Array1[local46];
-				if ((local55.aLong56 & 0x400000L) == 4194304L) {
+			for (@Pc(46) int local46 = 0; local46 < local42.sceneryLen; local46++) {
+				@Pc(55) Scenery local55 = local42.scenery[local46];
+				if ((local55.key & 0x400000L) == 4194304L) {
 					@Pc(66) int local66 = local55.primary.getMaxY();
 					if (local66 != -32768 && local66 < local34) {
 						local34 = local66;
@@ -64,13 +64,13 @@ public final class Static69 {
 		for (@Pc(17) int local17 = arg1; local17 <= arg1 + 1; local17++) {
 			if (local17 != Static126.anInt3114) {
 				for (@Pc(28) int local28 = local3; local28 <= local7; local28++) {
-					if (local28 >= 0 && local28 < Static152.mapSizeX) {
+					if (local28 >= 0 && local28 < SceneGraph.mapSizeX) {
 						for (@Pc(39) int local39 = local11; local39 <= local15; local39++) {
-							if (local39 >= 0 && local39 < Static99.mapSizeZ && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) {
+							if (local39 >= 0 && local39 < SceneGraph.mapSizeZ && (!local1 || local28 >= local7 || local39 >= local15 || local39 < arg3 && local28 != arg2)) {
 								@Pc(71) Tile local71 = SceneGraph.tiles[local17][local28][local39];
 								if (local71 != null) {
 									@Pc(158) int local158 = (SceneGraph.tileHeights[local17][local28][local39] + SceneGraph.tileHeights[local17][local28 + 1][local39] + SceneGraph.tileHeights[local17][local28][local39 + 1] + SceneGraph.tileHeights[local17][local28 + 1][local39 + 1]) / 4 - (SceneGraph.tileHeights[arg1][arg2][arg3] + SceneGraph.tileHeights[arg1][arg2 + 1][arg3] + SceneGraph.tileHeights[arg1][arg2][arg3 + 1] + SceneGraph.tileHeights[arg1][arg2 + 1][arg3 + 1]) / 4;
-									@Pc(161) Wall local161 = local71.aClass77_1;
+									@Pc(161) Wall local161 = local71.wall;
 									if (local161 != null) {
 										if (local161.primary.method4543()) {
 											arg0.method4544(local161.primary, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
@@ -79,8 +79,8 @@ public final class Static69 {
 											arg0.method4544(local161.aClass8_6, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1);
 										}
 									}
-									for (@Pc(232) int local232 = 0; local232 < local71.anInt662; local232++) {
-										@Pc(241) Scenery local241 = local71.aClass31Array1[local232];
+									for (@Pc(232) int local232 = 0; local232 < local71.sceneryLen; local232++) {
+										@Pc(241) Scenery local241 = local71.scenery[local232];
 										if (local241 != null && local241.primary.method4543() && (local28 == local241.anInt1701 || local28 == local3) && (local39 == local241.anInt1696 || local39 == local11)) {
 											@Pc(270) int local270 = local241.anInt1713 + 1 - local241.anInt1701;
 											@Pc(278) int local278 = local241.anInt1698 + 1 - local241.anInt1696;
diff --git a/client/src/main/java/rt4/Static70.java b/client/src/main/java/rt4/Static70.java
index 510cf66..71039fc 100644
--- a/client/src/main/java/rt4/Static70.java
+++ b/client/src/main/java/rt4/Static70.java
@@ -6,18 +6,33 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static70 {
 
-    @OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;")
+	@OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
+	public static final JagString aClass100_589 = JagString.parse(" <col=ffffff>");
+	@OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1043 = JagString.parse(" <col=00ff80>");
+	@OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;")
+	public static final JagString aClass100_1101 = JagString.parse(" <col=ffff00>");
+	@OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
+	public static final JagString aClass100_760 = JagString.parse(")1");
+	@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
+	public static final JagString aClass100_978 = JagString.parse("<)4col>");
+	@OriginalMember(owner = "client!jj", name = "g", descriptor = "Lclient!na;")
+	public static final JagString aClass100_593 = JagString.parse(" (X");
+	@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
+	public static final JagString aClass100_583 = JagString.parse("(Y<)4col>");
+
+	@OriginalMember(owner = "client!fi", name = "a", descriptor = "(BI)Lclient!na;")
 	public static JagString method1548(@OriginalArg(1) int arg0) {
-		@Pc(9) JagString local9 = Static123.parseInt(arg0);
+		@Pc(9) JagString local9 = JagString.parseInt(arg0);
 		for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) {
-			local9 = JagString.concatenate(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.substring(local21) });
+			local9 = JagString.concatenate(new JagString[] { local9.substring(local21, 0), aClass100_760, local9.substring(local21) });
 		}
 		if (local9.length() > 9) {
-			return JagString.concatenate(new JagString[] { Static250.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 });
+			return JagString.concatenate(new JagString[] { aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, aClass100_593, local9, aClass100_583 });
 		} else if (local9.length() > 6) {
-			return JagString.concatenate(new JagString[] { Static119.aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 });
+			return JagString.concatenate(new JagString[] { aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, aClass100_593, local9, aClass100_583 });
 		} else {
-			return JagString.concatenate(new JagString[] { Static278.aClass100_1101, local9, Static230.aClass100_978 });
+			return JagString.concatenate(new JagString[] { aClass100_1101, local9, aClass100_978 });
 		}
 	}
 
diff --git a/client/src/main/java/rt4/Static71.java b/client/src/main/java/rt4/Static71.java
index eda9f1d..4d0c3b4 100644
--- a/client/src/main/java/rt4/Static71.java
+++ b/client/src/main/java/rt4/Static71.java
@@ -1,25 +1,16 @@
 package rt4;
 
-import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 public final class Static71 {
 
-	@OriginalMember(owner = "client!fk", name = "e", descriptor = "I")
-	public static int anInt1885;
-
 	@OriginalMember(owner = "client!fk", name = "j", descriptor = "[[I")
 	public static int[][] anIntArrayArray10;
 
     @OriginalMember(owner = "client!fk", name = "k", descriptor = "[I")
 	public static final int[] anIntArray147 = new int[14];
 
-	@OriginalMember(owner = "client!fk", name = "a", descriptor = "([BIZ)I")
-	public static int method1442(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1) {
-		return Static169.crc32(0, arg1, arg0);
-	}
-
 	@OriginalMember(owner = "client!fk", name = "b", descriptor = "(I)V")
 	public static void method1444() {
 		for (@Pc(7) int local7 = -1; local7 < PlayerList.size; local7++) {
diff --git a/client/src/main/java/rt4/Static72.java b/client/src/main/java/rt4/Static72.java
index 01f6802..9f47908 100644
--- a/client/src/main/java/rt4/Static72.java
+++ b/client/src/main/java/rt4/Static72.java
@@ -6,22 +6,10 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static72 {
 
-	@OriginalMember(owner = "client!fl", name = "u", descriptor = "Z")
-	public static boolean aBoolean116;
-
 	@OriginalMember(owner = "client!fl", name = "D", descriptor = "[[I")
 	public static int[][] regionsXteaKeys;
 
-    @OriginalMember(owner = "client!fl", name = "H", descriptor = "Lclient!na;")
-	public static final JagString aClass100_446 = JagString.parse("<img=0>");
-
-	@OriginalMember(owner = "client!fl", name = "P", descriptor = "I")
-	public static int anInt2043 = 0;
-
-    @OriginalMember(owner = "client!fl", name = "V", descriptor = "Lclient!na;")
-	public static final JagString aClass100_448 = JagString.parse("(Y");
-
-    @OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
+	@OriginalMember(owner = "client!fl", name = "a", descriptor = "(IIIIII)V")
 	public static void method1568(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		Static131.method2576(Static71.anIntArrayArray10[arg0], arg1 - arg2, arg2 + arg1, arg4);
 		@Pc(17) int local17 = 0;
diff --git a/client/src/main/java/rt4/Static73.java b/client/src/main/java/rt4/Static73.java
index ff01834..0a6a314 100644
--- a/client/src/main/java/rt4/Static73.java
+++ b/client/src/main/java/rt4/Static73.java
@@ -78,17 +78,17 @@ public final class Static73 {
 			local16 = (arg1 << 7) + 1;
 			local20 = (arg3 << 7) + 2;
 			@Pc(156) int local156 = SceneGraph.tileHeights[arg0][arg1][arg3] + arg5;
-			if (!Static256.method4394(local16, local156, local20)) {
+			if (!SceneGraph.method4394(local16, local156, local20)) {
 				return false;
 			}
 			@Pc(169) int local169 = (arg2 << 7) - 1;
-			if (!Static256.method4394(local169, local156, local20)) {
+			if (!SceneGraph.method4394(local169, local156, local20)) {
 				return false;
 			}
 			@Pc(182) int local182 = (arg4 << 7) - 1;
-			if (!Static256.method4394(local16, local156, local182)) {
+			if (!SceneGraph.method4394(local16, local156, local182)) {
 				return false;
-			} else if (Static256.method4394(local169, local156, local182)) {
+			} else if (SceneGraph.method4394(local169, local156, local182)) {
 				return true;
 			} else {
 				return false;
@@ -96,7 +96,7 @@ public final class Static73 {
 		} else if (Static9.method187(arg0, arg1, arg3)) {
 			local16 = arg1 << 7;
 			local20 = arg3 << 7;
-			return Static256.method4394(local16 + 1, SceneGraph.tileHeights[arg0][arg1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && Static256.method4394(local16 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && Static256.method4394(local16 + 1, SceneGraph.tileHeights[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1);
+			return SceneGraph.method4394(local16 + 1, SceneGraph.tileHeights[arg0][arg1][arg3] + arg5, local20 + 1) && SceneGraph.method4394(local16 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg3] + arg5, local20 + 1) && SceneGraph.method4394(local16 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg3 + 1] + arg5, local20 + 128 - 1) && SceneGraph.method4394(local16 + 1, SceneGraph.tileHeights[arg0][arg1][arg3 + 1] + arg5, local20 + 128 - 1);
 		} else {
 			return false;
 		}
diff --git a/client/src/main/java/rt4/Static74.java b/client/src/main/java/rt4/Static74.java
index dcdc34b..7f8d750 100644
--- a/client/src/main/java/rt4/Static74.java
+++ b/client/src/main/java/rt4/Static74.java
@@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static74 {
 
-	@OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;")
-	public static final JagString aClass100_461 = JagString.parse(")1 ");
-
 	@OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V")
 	public static void method1623(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) {
 		if (arg3 == arg6) {
diff --git a/client/src/main/java/rt4/Static75.java b/client/src/main/java/rt4/Static75.java
index 1714865..7c317ab 100644
--- a/client/src/main/java/rt4/Static75.java
+++ b/client/src/main/java/rt4/Static75.java
@@ -25,8 +25,8 @@ public final class Static75 {
 		if (local7 == null) {
 			return null;
 		} else {
-			@Pc(14) WallDecor local14 = local7.aClass24_1;
-			local7.aClass24_1 = null;
+			@Pc(14) WallDecor local14 = local7.wallDecor;
+			local7.wallDecor = null;
 			return local14;
 		}
 	}
diff --git a/client/src/main/java/rt4/Static78.java b/client/src/main/java/rt4/Static78.java
index b3458e3..886418b 100644
--- a/client/src/main/java/rt4/Static78.java
+++ b/client/src/main/java/rt4/Static78.java
@@ -17,10 +17,7 @@ public final class Static78 {
 	@OriginalMember(owner = "client!gd", name = "h", descriptor = "[I")
 	public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 };
 
-	@OriginalMember(owner = "client!gd", name = "i", descriptor = "Lclient!na;")
-	public static JagString aClass100_466 = null;
-
-	@OriginalMember(owner = "client!gd", name = "j", descriptor = "I")
+    @OriginalMember(owner = "client!gd", name = "j", descriptor = "I")
 	public static int anInt2145 = 0;
 
 	@OriginalMember(owner = "client!gd", name = "a", descriptor = "(IIBI)I")
diff --git a/client/src/main/java/rt4/Static8.java b/client/src/main/java/rt4/Static8.java
index 469c09c..ce413f3 100644
--- a/client/src/main/java/rt4/Static8.java
+++ b/client/src/main/java/rt4/Static8.java
@@ -12,20 +12,6 @@ public final class Static8 {
 	@OriginalMember(owner = "client!aj", name = "Z", descriptor = "[I")
 	public static int[] anIntArray8;
 
-	@OriginalMember(owner = "client!aj", name = "R", descriptor = "Lclient!na;")
-	public static final JagString aClass100_32 = JagString.parse("<col=ff9040>");
-
-	@OriginalMember(owner = "client!aj", name = "a", descriptor = "(BILclient!be;)I")
-	public static int getOpCursor(@OriginalArg(1) int arg0, @OriginalArg(2) Component arg1) {
-		if (!InterfaceList.getServerActiveProperties(arg1).method503(arg0) && arg1.anObjectArray29 == null) {
-			return -1;
-		} else if (arg1.anIntArray39 == null || arg0 >= arg1.anIntArray39.length) {
-			return -1;
-		} else {
-			return arg1.anIntArray39[arg0];
-		}
-	}
-
 	@OriginalMember(owner = "client!aj", name = "a", descriptor = "(IIIZIII)V")
 	public static void method120(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		Static251.method4278(arg4);
@@ -111,15 +97,4 @@ public final class Static8 {
 		}
 	}
 
-	@OriginalMember(owner = "client!aj", name = "i", descriptor = "(I)V")
-	public static void resetTransientVars() {
-		for (@Pc(3) int local3 = 0; local3 < VarpTypeList.anInt4043; local3++) {
-			@Pc(19) VarpType local19 = VarpTypeList.get(local3);
-			if (local19 != null && local19.clientCode == 0) {
-				VarpDomain.varp[local3] = 0;
-				VarpDomain.activeVarps[local3] = 0;
-			}
-		}
-		Static199.aClass133_20 = new HashTable(16);
-	}
 }
diff --git a/client/src/main/java/rt4/Static80.java b/client/src/main/java/rt4/Static80.java
index 1894c3d..3abe30b 100644
--- a/client/src/main/java/rt4/Static80.java
+++ b/client/src/main/java/rt4/Static80.java
@@ -18,17 +18,9 @@ public final class Static80 {
 	@OriginalMember(owner = "client!gf", name = "R", descriptor = "I")
 	public static int centralZoneX;
 
-	@OriginalMember(owner = "client!gf", name = "I", descriptor = "Lclient!na;")
-	public static final JagString aClass100_886 = JagString.parse(")3runescape)3com)4l=");
-
 	@OriginalMember(owner = "client!gf", name = "S", descriptor = "[I")
 	public static final int[] anIntArray419 = new int[] { 0, 2, 2, 2, 1, 1, 2, 2, 1, 3, 1, 1 };
 
-	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!ve;IIB)Lclient!mm;")
-	public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
-		return SpriteLoader.decode(arg0, 0, arg1) ? Static102.method2071() : null;
-	}
-
 	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(BII)V")
 	public static void method3616(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		WorldMap.anInt3482 = arg0 - WorldMap.originX;
diff --git a/client/src/main/java/rt4/Static81.java b/client/src/main/java/rt4/Static81.java
index 91a7ca9..069bab1 100644
--- a/client/src/main/java/rt4/Static81.java
+++ b/client/src/main/java/rt4/Static81.java
@@ -11,13 +11,7 @@ public final class Static81 {
 	@OriginalMember(owner = "client!gg", name = "Z", descriptor = "I")
 	public static int anInt2222;
 
-	@OriginalMember(owner = "client!gg", name = "bb", descriptor = "I")
-	public static int cameraX;
-
-    @OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;")
-	public static final JagString aClass100_475 = JagString.parse("null");
-
-    @OriginalMember(owner = "client!gg", name = "db", descriptor = "I")
+	@OriginalMember(owner = "client!gg", name = "db", descriptor = "I")
 	public static int anInt2225 = -1;
 
 	@OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V")
diff --git a/client/src/main/java/rt4/Static84.java b/client/src/main/java/rt4/Static84.java
index fed534b..8688938 100644
--- a/client/src/main/java/rt4/Static84.java
+++ b/client/src/main/java/rt4/Static84.java
@@ -16,7 +16,7 @@ public final class Static84 {
 
 	@OriginalMember(owner = "client!gk", name = "b", descriptor = "(B)V")
 	public static void method1771() {
-		Static62.anIntArray150 = Static206.method3679(0.4F);
+		Light.anIntArray150 = Static206.method3679(0.4F);
 	}
 
 	@OriginalMember(owner = "client!gk", name = "a", descriptor = "(Lclient!rg;Lclient!rg;B)V")
diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java
index c7b7350..2d53121 100644
--- a/client/src/main/java/rt4/Static87.java
+++ b/client/src/main/java/rt4/Static87.java
@@ -80,9 +80,9 @@ public final class Static87 {
 	@OriginalMember(owner = "client!gn", name = "a", descriptor = "(III[Lclient!be;IIIIBI)V")
 	public static void method1809(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Component[] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8) {
 		if (GlRenderer.enabled) {
-			GlRaster.method1187(arg0, arg6, arg4, arg7);
+			GlRaster.setClip(arg0, arg6, arg4, arg7);
 		} else {
-			SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+			SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 			Rasteriser.prepare();
 		}
 		for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) {
@@ -180,9 +180,9 @@ public final class Static87 {
 								Static97.anInt2503 = local123;
 								Static253.method4326(local30.anInt459, local30.anInt453 == 1403, local123, local30.anInt445, local114);
 								if (GlRenderer.enabled) {
-									GlRaster.method1187(arg0, arg6, arg4, arg7);
+									GlRaster.setClip(arg0, arg6, arg4, arg7);
 								} else {
-									SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+									SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								}
 								continue;
 							}
@@ -190,13 +190,13 @@ public final class Static87 {
 								if (!local30.method478()) {
 									continue;
 								}
-								Static54.method1305(local57, local114, local123, local30);
+								MiniMap.render(local57, local114, local123, local30);
 								if (GlRenderer.enabled) {
-									GlRaster.method1187(arg0, arg6, arg4, arg7);
+									GlRaster.setClip(arg0, arg6, arg4, arg7);
 								} else {
-									SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+									SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								}
-								if (Static270.minimapState != 0 && Static270.minimapState != 3 || Static60.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) {
+								if (MiniMap.state != 0 && MiniMap.state != 3 || Static60.aBoolean108 || local166 > Static155.anInt3751 || Static60.anInt1892 < local164 || Static155.anInt3751 >= local302 || local291 <= Static60.anInt1892) {
 									continue;
 								}
 								local270 = Static155.anInt3751 - local123;
@@ -210,18 +210,18 @@ public final class Static87 {
 								local270 -= local30.anInt445 / 2;
 								color = MathUtils.sin[memory];
 								cardMemory = MathUtils.cos[memory];
-								color = (Static273.anInt4130 + 256) * color >> 8;
-								cardMemory = (Static273.anInt4130 + 256) * cardMemory >> 8;
+								color = (MiniMap.anInt4130 + 256) * color >> 8;
+								cardMemory = (MiniMap.anInt4130 + 256) * cardMemory >> 8;
 								local545 = cardMemory * local276 - color * local270 >> 11;
 								local556 = local276 * color + local270 * cardMemory >> 11;
 								local563 = PlayerList.self.xFine + local556 >> 7;
 								local571 = PlayerList.self.zFine - local545 >> 7;
-								if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) {
-									@Pc(583) Component local583 = Static201.method1418(Static98.anInt2512, Static15.anInt506);
+								if (Static241.aBoolean302 && (MiniMenu.anInt4999 & 0x40) != 0) {
+									@Pc(583) Component local583 = Static201.method1418(MiniMenu.anInt2512, MiniMenu.anInt506);
 									if (local583 == null) {
 										Static53.method1294();
 									} else {
-										MiniMenu.add(Static246.anInt5393, 1L, Static225.aClass100_961, local563, (short) 11, MiniMenu.aClass100_545, local571);
+										MiniMenu.add(Static246.anInt5393, 1L, MiniMenu.aClass100_961, local563, (short) 11, MiniMenu.aClass100_545, local571);
 									}
 									continue;
 								}
@@ -235,9 +235,9 @@ public final class Static87 {
 								if (local30.method478()) {
 									Static160.method3047(local123, local114, local30, local57);
 									if (GlRenderer.enabled) {
-										GlRaster.method1187(arg0, arg6, arg4, arg7);
+										GlRaster.setClip(arg0, arg6, arg4, arg7);
 									} else {
-										SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+										SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 									}
 								}
 								continue;
@@ -247,9 +247,9 @@ public final class Static87 {
 								Static186.aBooleanArray100[local57] = true;
 								InterfaceList.rectangleRedraw[local57] = true;
 								if (GlRenderer.enabled) {
-									GlRaster.method1187(arg0, arg6, arg4, arg7);
+									GlRaster.setClip(arg0, arg6, arg4, arg7);
 								} else {
-									SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+									SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								}
 								continue;
 							}
@@ -258,9 +258,9 @@ public final class Static87 {
 								Static186.aBooleanArray100[local57] = true;
 								InterfaceList.rectangleRedraw[local57] = true;
 								if (GlRenderer.enabled) {
-									GlRaster.method1187(arg0, arg6, arg4, arg7);
+									GlRaster.setClip(arg0, arg6, arg4, arg7);
 								} else {
-									SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+									SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								}
 								continue;
 							}
@@ -278,7 +278,7 @@ public final class Static87 {
 								}
 								local270 = local30.anInt445 + local123;
 								local276 = local114 + 15;
-								Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_FPS2, Static123.parseInt((int)GameShell.framesPerSecond) }), local270, local276, 16776960, 0);
+								Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_FPS2, JagString.parseInt((int)GameShell.framesPerSecond) }), local270, local276, 16776960, 0);
 								local276 += 15;
 								@Pc(795) Runtime runtime = Runtime.getRuntime();
 								memory = (int) ((runtime.totalMemory() - runtime.freeMemory()) / 1024L / 1024L);
@@ -286,7 +286,7 @@ public final class Static87 {
 								if (memory > 128) {
 									color = 16711680;
 								}
-								Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_MEM, Static123.parseInt(memory), Cheat.DEBUG_MEM_UNIT}), local270, local276, color, 0);
+								Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_MEM, JagString.parseInt(memory), Cheat.DEBUG_MEM_UNIT}), local270, local276, color, 0);
 								local276 += 15;
 								if (GlRenderer.enabled) {
 									color = 16776960;
@@ -294,7 +294,7 @@ public final class Static87 {
 									if (cardMemory > 64) {
 										color = 16711680;
 									}
-									Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_CARD, Static123.parseInt(cardMemory), Cheat.DEBUG_MEM_UNIT}), local270, local276, color, 0);
+									Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_CARD, JagString.parseInt(cardMemory), Cheat.DEBUG_MEM_UNIT}), local270, local276, color, 0);
 									local276 += 15;
 								}
 								cardMemory = 0;
@@ -307,7 +307,7 @@ public final class Static87 {
 								}
 								local571 = local556 * 10000 / cardMemory;
 								local563 = local545 * 100 / cardMemory;
-								@Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, Static123.parseInt(local563), Static14.aClass100_80 });
+								@Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 });
 								Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0);
 								local276 += 12;
 								Static186.aBooleanArray100[local57] = true;
@@ -361,9 +361,9 @@ public final class Static87 {
 								Static6.method86(local1186.anInt5878, local166, local302, local123, local57, local291, local164, local114);
 							}
 							if (GlRenderer.enabled) {
-								GlRaster.method1187(arg0, arg6, arg4, arg7);
+								GlRaster.setClip(arg0, arg6, arg4, arg7);
 							} else {
-								SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+								SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 								Rasteriser.prepare();
 							}
 						}
@@ -386,7 +386,7 @@ public final class Static87 {
 												local545 = local30.objTypes[local270] - 1;
 												if (arg0 < memory + 32 && memory < arg4 && arg6 < color + 32 && color < arg7 || local30 == Static118.aClass13_15 && Static4.anInt36 == local270) {
 													@Pc(1476) Sprite local1476;
-													if (Static260.anInt5014 == 1 && Static185.anInt4370 == local270 && local30.id == Static224.anInt5062) {
+													if (MiniMenu.anInt5014 == 1 && Static185.anInt4370 == local270 && local30.id == Static224.anInt5062) {
 														local1476 = Static190.method3443(2, local545, local30.aBoolean31, local30.objCounts[local270], 0);
 													} else {
 														local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.objCounts[local270], 3153952);
@@ -447,16 +447,16 @@ public final class Static87 {
 																InterfaceList.redraw(local1571);
 															}
 														}
-													} else if (local30 == Static257.aClass13_7 && local270 == Static250.anInt5444) {
+													} else if (local30 == MiniMenu.aClass13_7 && local270 == Static250.anInt5444) {
 														local1476.method1417(memory, color, 128);
 													} else {
-														local1476.method1423(memory, color);
+														local1476.renderTransparent(memory, color);
 													}
 												}
 											} else if (local30.anIntArray36 != null && local270 < 20) {
 												@Pc(1381) Sprite local1381 = local30.method482(local270);
 												if (local1381 != null) {
-													local1381.method1423(memory, color);
+													local1381.renderTransparent(memory, color);
 												} else if (Static211.aBoolean72) {
 													InterfaceList.redraw(local30);
 												}
@@ -526,7 +526,7 @@ public final class Static87 {
 													local1934 = Static92.NULL;
 												}
 												if ((local1989.stackable == 1 || local30.objCount != 1) && local30.objCount != -1) {
-													local1934 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) });
+													local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) });
 												}
 											}
 											if (Static39.aClass13_10 == local30) {
@@ -585,14 +585,14 @@ public final class Static87 {
 															for (local563 = 0; local563 < memory; local563++) {
 																for (local571 = 0; local571 < color; local571++) {
 																	if (local117 == 0) {
-																		local2094.method1423(local123 + local276 * local563, local468 * local571 + local114);
+																		local2094.renderTransparent(local123 + local276 * local563, local468 * local571 + local114);
 																	} else {
 																		local2094.method1417(local563 * local276 + local123, local468 * local571 + local114, 256 - (local117 & 0xFF));
 																	}
 																}
 															}
 														}
-														GlRaster.method1187(arg0, arg6, arg4, arg7);
+														GlRaster.setClip(arg0, arg6, arg4, arg7);
 													} else {
 														SoftwareRaster.method2498(local123, local114, local123 + local30.anInt445, local114 - -local30.anInt459);
 														for (cardMemory = 0; cardMemory < memory; cardMemory++) {
@@ -600,13 +600,13 @@ public final class Static87 {
 																if (local30.anInt521 != 0) {
 																	local2094.method1420(local114 + local468 * local556 + local468 / 2, local30.anInt521, 4096, cardMemory * local276 + local123 + local276 / 2);
 																} else if (local117 == 0) {
-																	local2094.method1423(cardMemory * local276 + local123, local468 * local556 + local114);
+																	local2094.renderTransparent(cardMemory * local276 + local123, local468 * local556 + local114);
 																} else {
 																	local2094.method1417(cardMemory * local276 + local123, local114 + local556 * local468, 256 - (local117 & 0xFF));
 																}
 															}
 														}
-														SoftwareRaster.method2496(arg0, arg6, arg4, arg7);
+														SoftwareRaster.setClip(arg0, arg6, arg4, arg7);
 													}
 												} else {
 													memory = local30.anInt445 * 4096 / local276;
@@ -615,7 +615,7 @@ public final class Static87 {
 													} else if (local117 != 0) {
 														local2094.method1422(local123, local114, local30.anInt445, local30.anInt459, 256 - (local117 & 0xFF));
 													} else if (local276 == local30.anInt445 && local468 == local30.anInt459) {
-														local2094.method1423(local123, local114);
+														local2094.renderTransparent(local123, local114);
 													} else {
 														local2094.renderResizedTransparent(local123, local114, local30.anInt445, local30.anInt459);
 													}
@@ -626,7 +626,7 @@ public final class Static87 {
 										} else {
 											local2094 = local30.method489(Static154.method2926(local30));
 											if (local2094 != null) {
-												local2094.method1423(local123, local114);
+												local2094.renderTransparent(local123, local114);
 											} else if (Static211.aBoolean72) {
 												InterfaceList.redraw(local30);
 											}
@@ -707,7 +707,7 @@ public final class Static87 {
 													if (Static263.aBoolean299) {
 														GlRaster.method1177();
 														GlRenderer.clearDepthBuffer();
-														GlRaster.method1187(arg0, arg6, arg4, arg7);
+														GlRaster.setClip(arg0, arg6, arg4, arg7);
 														Static263.aBoolean299 = false;
 													}
 													if (local30.aBoolean34) {
@@ -753,9 +753,9 @@ public final class Static87 {
 															local2611 = ObjTypeList.get(local30.objTypes[local276] - 1);
 															@Pc(3159) JagString local3159;
 															if (local2611.stackable != 1 && local30.objCounts[local276] == 1) {
-																local3159 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static230.aClass100_978 });
+																local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static70.aClass100_978 });
 															} else {
-																local3159 = JagString.concatenate(new JagString[] { Static8.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) });
+																local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) });
 															}
 															local556 = local123 + memory * (local30.anInt512 + 115);
 															local545 = (local30.anInt516 + 12) * local468 + local114;
diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java
index 3f46271..2128240 100644
--- a/client/src/main/java/rt4/Static89.java
+++ b/client/src/main/java/rt4/Static89.java
@@ -13,10 +13,7 @@ public final class Static89 {
 	@OriginalMember(owner = "client!ha", name = "o", descriptor = "I")
 	public static int anInt2387;
 
-	@OriginalMember(owner = "client!ha", name = "q", descriptor = "I")
-	public static int anInt2388 = 0;
-
-	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V")
+    @OriginalMember(owner = "client!ha", name = "a", descriptor = "(ZB)V")
 	public static void method1835(@OriginalArg(0) boolean arg0) {
 		@Pc(11) byte local11;
 		@Pc(13) byte[][] local13;
@@ -100,12 +97,6 @@ public final class Static89 {
 		return Static154.method2929(arg1);
 	}
 
-    @OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V")
-	public static void method1840(@OriginalArg(1) int arg0) {
-		@Pc(8) DelayedStateChange local8 = DelayedStateChange.create(2, arg0);
-		local8.pushClient();
-	}
-
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V")
 	public static void method1841() {
 		if (!Static60.aBoolean108) {
diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java
index 5d45172..838d2f2 100644
--- a/client/src/main/java/rt4/Static9.java
+++ b/client/src/main/java/rt4/Static9.java
@@ -12,54 +12,6 @@ public final class Static9 {
 	@OriginalMember(owner = "client!al", name = "r", descriptor = "Lclient!na;")
 	public static final JagString aClass100_35 = JagString.parse("showVideoAd");
 
-	@OriginalMember(owner = "client!al", name = "a", descriptor = "(Lclient!pb;BIIIIIII)V")
-	public static void method181(@OriginalArg(0) LocType arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7) {
-		@Pc(5) int local5 = arg2 & 0x3;
-		@Pc(28) int local28;
-		@Pc(31) int local31;
-		if (local5 == 1 || local5 == 3) {
-			local28 = arg0.length;
-			local31 = arg0.width;
-		} else {
-			local31 = arg0.length;
-			local28 = arg0.width;
-		}
-		@Pc(53) int local53;
-		@Pc(51) int local51;
-		if (arg6 + local31 > 104) {
-			local51 = arg6 + 1;
-			local53 = arg6;
-		} else {
-			local53 = arg6 + (local31 >> 1);
-			local51 = arg6 + (local31 + 1 >> 1);
-		}
-		@Pc(80) int local80 = (arg5 << 7) + (local28 << 6);
-		@Pc(88) int local88 = (arg6 << 7) + (local31 << 6);
-		@Pc(96) int local96;
-		@Pc(100) int local100;
-		if (arg5 + local28 > 104) {
-			local96 = arg5;
-			local100 = arg5 + 1;
-		} else {
-			local96 = arg5 + (local28 >> 1);
-			local100 = (local28 + 1 >> 1) + arg5;
-		}
-		@Pc(120) int[][] local120 = SceneGraph.tileHeights[arg7];
-		@Pc(122) int local122 = 0;
-		@Pc(148) int local148 = local120[local96][local51] + local120[local96][local53] + local120[local100][local53] + local120[local100][local51] >> 2;
-		@Pc(158) int[][] local158;
-		if (arg7 != 0) {
-			local158 = SceneGraph.tileHeights[0];
-			local122 = local148 - (local158[local96][local51] + local158[local100][local53] + local158[local96][local53] + local158[local100][local51] >> 2);
-		}
-		local158 = null;
-		if (arg7 < 3) {
-			local158 = SceneGraph.tileHeights[arg7 + 1];
-		}
-		@Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88);
-		Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1);
-	}
-
 	@OriginalMember(owner = "client!al", name = "a", descriptor = "(Z)V")
 	public static void method182() {
 		Static241.aClass13Array13 = null;
@@ -99,7 +51,7 @@ public final class Static9 {
 		} else {
 			@Pc(22) int local22 = arg1 << 7;
 			@Pc(26) int local26 = arg2 << 7;
-			if (Static256.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2], local26 + 1) && Static256.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && Static256.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1], local26 + 128 - 1)) {
+			if (SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2], local26 + 1) && SceneGraph.method4394(local22 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1], local26 + 128 - 1) && SceneGraph.method4394(local22 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1], local26 + 128 - 1)) {
 				Static140.anIntArrayArrayArray12[arg0][arg1][arg2] = Static13.anInt437;
 				return true;
 			} else {
diff --git a/client/src/main/java/rt4/Static91.java b/client/src/main/java/rt4/Static91.java
index 5216ba7..f5533cc 100644
--- a/client/src/main/java/rt4/Static91.java
+++ b/client/src/main/java/rt4/Static91.java
@@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 
 public final class Static91 {
 
-	@OriginalMember(owner = "client!hc", name = "O", descriptor = "[Lclient!pe;")
-	public static Class120[] aClass120Array1;
-
-	@OriginalMember(owner = "client!hc", name = "P", descriptor = "I")
+    @OriginalMember(owner = "client!hc", name = "P", descriptor = "I")
 	public static int anInt2428;
 
     @OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!na;Z)I")
@@ -46,6 +43,6 @@ public final class Static91 {
 				SceneGraph.tiles[local46][arg1][arg2] = new Tile(local46, arg1, arg2);
 			}
 		}
-		SceneGraph.tiles[arg0][arg1][arg2].aClass24_1 = local6;
+		SceneGraph.tiles[arg0][arg1][arg2].wallDecor = local6;
 	}
 }
diff --git a/client/src/main/java/rt4/Static92.java b/client/src/main/java/rt4/Static92.java
index 15b389b..b0bdf36 100644
--- a/client/src/main/java/rt4/Static92.java
+++ b/client/src/main/java/rt4/Static92.java
@@ -52,13 +52,13 @@ public final class Static92 {
 			}
 			@Pc(255) Scenery local255 = SceneGraph.getScenery(arg0, arg5, arg3);
 			if (local255 != null) {
-				local255.primary = new Loc((int) (local255.aLong56 >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
+				local255.primary = new Loc((int) (local255.key >>> 32) & Integer.MAX_VALUE, arg2, arg1, arg0, arg5, arg3, arg6, false, local255.primary);
 			}
 		}
 		if (arg4 == 3) {
 			@Pc(290) GroundDecor local290 = SceneGraph.getGroundDecor(arg0, arg5, arg3);
 			if (local290 != null) {
-				local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.aLong26 >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
+				local290.primary = new Loc(Integer.MAX_VALUE & (int) (local290.key >>> 32), 22, arg1, arg0, arg5, arg3, arg6, false, local290.primary);
 			}
 		}
 	}
diff --git a/client/src/main/java/rt4/Static93.java b/client/src/main/java/rt4/Static93.java
deleted file mode 100644
index 07a279a..0000000
--- a/client/src/main/java/rt4/Static93.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalArg;
-import org.openrs2.deob.annotation.OriginalMember;
-import org.openrs2.deob.annotation.Pc;
-
-public final class Static93 {
-
-	@OriginalMember(owner = "client!he", name = "db", descriptor = "Lclient!na;")
-	public static final JagString aClass100_517 = JagString.parse("");
-
-	@OriginalMember(owner = "client!he", name = "gb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_518 = JagString.parse("www");
-
-	@OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V")
-	public static void method1906(@OriginalArg(1) int arg0) {
-		@Pc(12) DelayedStateChange local12 = DelayedStateChange.create(7, arg0);
-		local12.pushClient();
-	}
-}
diff --git a/client/src/main/java/rt4/Static96.java b/client/src/main/java/rt4/Static96.java
index fecac5a..6373691 100644
--- a/client/src/main/java/rt4/Static96.java
+++ b/client/src/main/java/rt4/Static96.java
@@ -11,9 +11,6 @@ public final class Static96 {
 	@OriginalMember(owner = "client!hh", name = "r", descriptor = "[I")
 	public static int[] anIntArray235;
 
-	@OriginalMember(owner = "client!hh", name = "a", descriptor = "Lclient!na;")
-	public static final JagString aClass100_520 = JagString.parse("(U4");
-
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(II)V")
 	public static void method1949(@OriginalArg(1) int arg0) {
 		if (InterfaceList.load(arg0)) {
diff --git a/client/src/main/java/rt4/Static97.java b/client/src/main/java/rt4/Static97.java
index cd1002e..416d772 100644
--- a/client/src/main/java/rt4/Static97.java
+++ b/client/src/main/java/rt4/Static97.java
@@ -30,15 +30,15 @@ public final class Static97 {
 		}
 		@Pc(30) int local30 = Math.min(arg5.anInt445 / 2, arg5.anInt459 / 2);
 		if (local30 * local30 >= local13) {
-			Static60.method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2);
+			MiniMap.method1446(arg5, Sprites.mapmarkhints[arg0], arg4, arg3, arg1, arg2);
 			return;
 		}
 		local30 -= 10;
 		@Pc(58) int local58 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF;
 		@Pc(62) int local62 = MathUtils.cos[local58];
 		@Pc(66) int local66 = MathUtils.sin[local58];
-		@Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256);
-		@Pc(82) int local82 = local62 * 256 / (Static273.anInt4130 + 256);
+		@Pc(74) int local74 = local66 * 256 / (MiniMap.anInt4130 + 256);
+		@Pc(82) int local82 = local62 * 256 / (MiniMap.anInt4130 + 256);
 		@Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16;
 		@Pc(104) int local104 = arg4 * local82 - local74 * arg3 >> 16;
 		@Pc(110) double local110 = Math.atan2((double) local93, (double) local104);
diff --git a/client/src/main/java/rt4/Static98.java b/client/src/main/java/rt4/Static98.java
deleted file mode 100644
index de9e696..0000000
--- a/client/src/main/java/rt4/Static98.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package rt4;
-
-import org.openrs2.deob.annotation.OriginalMember;
-
-public final class Static98 {
-
-	@OriginalMember(owner = "client!hj", name = "e", descriptor = "I")
-	public static int anInt2512;
-
-}
diff --git a/client/src/main/java/rt4/Static99.java b/client/src/main/java/rt4/Static99.java
index 4a5a485..ac63e05 100644
--- a/client/src/main/java/rt4/Static99.java
+++ b/client/src/main/java/rt4/Static99.java
@@ -4,16 +4,10 @@ import org.openrs2.deob.annotation.OriginalMember;
 
 public final class Static99 {
 
-	@OriginalMember(owner = "client!hk", name = "Y", descriptor = "I")
-	public static int mapSizeZ;
-
-	@OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
+    @OriginalMember(owner = "client!hk", name = "bb", descriptor = "[I")
 	public static int[] underWaterMapFileIds;
 
 	@OriginalMember(owner = "client!hk", name = "W", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_64 = new LinkedList();
 
-	@OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;")
-	public static final JagString WM3 = JagString.parse("::wm3");
-
 }
diff --git a/client/src/main/java/rt4/SynthInstrument.java b/client/src/main/java/rt4/SynthInstrument.java
index 207b10d..6533a99 100644
--- a/client/src/main/java/rt4/SynthInstrument.java
+++ b/client/src/main/java/rt4/SynthInstrument.java
@@ -9,7 +9,19 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!pj")
 public final class SynthInstrument {
 
-	@OriginalMember(owner = "client!pj", name = "k", descriptor = "[I")
+    @OriginalMember(owner = "client!pj", name = "o", descriptor = "[I")
+    public static final int[] anIntArray398 = new int[220500];
+    @OriginalMember(owner = "client!pj", name = "p", descriptor = "[I")
+    public static final int[] anIntArray399 = new int[5];
+    @OriginalMember(owner = "client!pj", name = "q", descriptor = "[I")
+    public static final int[] anIntArray400 = new int[5];
+    @OriginalMember(owner = "client!pj", name = "r", descriptor = "[I")
+    public static final int[] anIntArray401 = new int[5];
+    @OriginalMember(owner = "client!pj", name = "s", descriptor = "[I")
+    public static final int[] anIntArray402 = new int[5];
+    @OriginalMember(owner = "client!pj", name = "t", descriptor = "[I")
+    public static final int[] anIntArray403 = new int[5];
+    @OriginalMember(owner = "client!pj", name = "k", descriptor = "[I")
 	private static final int[] anIntArray395 = new int[32768];
 
 	@OriginalMember(owner = "client!pj", name = "h", descriptor = "[I")
@@ -95,9 +107,9 @@ public final class SynthInstrument {
 
 	@OriginalMember(owner = "client!pj", name = "a", descriptor = "(II)[I")
 	public final int[] method3505(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		ArrayUtils.clear(Static194.anIntArray398, 0, arg0);
+		ArrayUtils.clear(anIntArray398, 0, arg0);
 		if (arg1 < 10) {
-			return Static194.anIntArray398;
+			return anIntArray398;
 		}
 		@Pc(16) double local16 = (double) arg0 / ((double) arg1 + 0.0D);
 		this.aClass42_5.method1513();
@@ -123,11 +135,11 @@ public final class SynthInstrument {
 		@Pc(102) int local102;
 		for (local102 = 0; local102 < 5; local102++) {
 			if (this.anIntArray396[local102] != 0) {
-				Static194.anIntArray401[local102] = 0;
-				Static194.anIntArray402[local102] = (int) ((double) this.anIntArray397[local102] * local16);
-				Static194.anIntArray403[local102] = (this.anIntArray396[local102] << 14) / 100;
-				Static194.anIntArray399[local102] = (int) ((double) (this.aClass42_5.anInt1960 - this.aClass42_5.anInt1959) * 32.768D * Math.pow(1.0057929410678534D, (double) this.anIntArray404[local102]) / local16);
-				Static194.anIntArray400[local102] = (int) ((double) this.aClass42_5.anInt1959 * 32.768D / local16);
+				anIntArray401[local102] = 0;
+				anIntArray402[local102] = (int) ((double) this.anIntArray397[local102] * local16);
+				anIntArray403[local102] = (this.anIntArray396[local102] << 14) / 100;
+				anIntArray399[local102] = (int) ((double) (this.aClass42_5.anInt1960 - this.aClass42_5.anInt1959) * 32.768D * Math.pow(1.0057929410678534D, (double) this.anIntArray404[local102]) / local16);
+				anIntArray400[local102] = (int) ((double) this.aClass42_5.anInt1959 * 32.768D / local16);
 			}
 		}
 		@Pc(185) int local185;
@@ -151,10 +163,10 @@ public final class SynthInstrument {
 			}
 			for (local198 = 0; local198 < 5; local198++) {
 				if (this.anIntArray396[local198] != 0) {
-					local203 = local102 + Static194.anIntArray402[local198];
+					local203 = local102 + anIntArray402[local198];
 					if (local203 < arg0) {
-						Static194.anIntArray398[local203] += this.method3504(Static194.anIntArray401[local198], local190 * Static194.anIntArray403[local198] >> 15, this.aClass42_5.anInt1958);
-						Static194.anIntArray401[local198] += (local185 * Static194.anIntArray399[local198] >> 16) + Static194.anIntArray400[local198];
+						anIntArray398[local203] += this.method3504(anIntArray401[local198], local190 * anIntArray403[local198] >> 15, this.aClass42_5.anInt1958);
+						anIntArray401[local198] += (local185 * anIntArray399[local198] >> 16) + anIntArray400[local198];
 					}
 				}
 			}
@@ -179,14 +191,14 @@ public final class SynthInstrument {
 					local341 = !local341;
 				}
 				if (local341) {
-					Static194.anIntArray398[local198] = 0;
+					anIntArray398[local198] = 0;
 				}
 			}
 		}
 		if (this.anInt4547 > 0 && this.anInt4549 > 0) {
 			local102 = (int) ((double) this.anInt4547 * local16);
 			for (local185 = local102; local185 < arg0; local185++) {
-				Static194.anIntArray398[local185] += Static194.anIntArray398[local185 - local102] * this.anInt4549 / 100;
+				anIntArray398[local185] += anIntArray398[local185 - local102] * this.anInt4549 / 100;
 			}
 		}
 		if (this.aClass110_1.anIntArray368[0] > 0 || this.aClass110_1.anIntArray368[1] > 0) {
@@ -202,14 +214,14 @@ public final class SynthInstrument {
 				}
 				@Pc(523) int local523;
 				while (local198 < local203) {
-					local356 = (int) ((long) Static194.anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
+					local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
 					for (local523 = 0; local523 < local185; local523++) {
-						local356 += (int) ((long) Static194.anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+						local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
 					}
 					for (local523 = 0; local523 < local198; local523++) {
-						local356 -= (int) ((long) Static194.anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+						local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
 					}
-					Static194.anIntArray398[local198] = local356;
+					anIntArray398[local198] = local356;
 					local102 = this.aClass42_6.method1512(arg0 + 1);
 					local198++;
 				}
@@ -219,14 +231,14 @@ public final class SynthInstrument {
 						local203 = arg0 - local185;
 					}
 					while (local198 < local203) {
-						local356 = (int) ((long) Static194.anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
+						local356 = (int) ((long) anIntArray398[local198 + local185] * (long) Static174.anInt4191 >> 16);
 						for (local523 = 0; local523 < local185; local523++) {
-							local356 += (int) ((long) Static194.anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+							local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
 						}
 						for (local523 = 0; local523 < local190; local523++) {
-							local356 -= (int) ((long) Static194.anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+							local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
 						}
-						Static194.anIntArray398[local198] = local356;
+						anIntArray398[local198] = local356;
 						local102 = this.aClass42_6.method1512(arg0 + 1);
 						local198++;
 					}
@@ -234,12 +246,12 @@ public final class SynthInstrument {
 						while (local198 < arg0) {
 							local356 = 0;
 							for (local523 = local198 + local185 - arg0; local523 < local185; local523++) {
-								local356 += (int) ((long) Static194.anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
+								local356 += (int) ((long) anIntArray398[local198 + local185 - local523 - 1] * (long) Static174.anIntArrayArray32[0][local523] >> 16);
 							}
 							for (local523 = 0; local523 < local190; local523++) {
-								local356 -= (int) ((long) Static194.anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
+								local356 -= (int) ((long) anIntArray398[local198 - local523 - 1] * (long) Static174.anIntArrayArray32[1][local523] >> 16);
 							}
-							Static194.anIntArray398[local198] = local356;
+							anIntArray398[local198] = local356;
 							this.aClass42_6.method1512(arg0 + 1);
 							local198++;
 						}
@@ -252,14 +264,14 @@ public final class SynthInstrument {
 			}
 		}
 		for (local102 = 0; local102 < arg0; local102++) {
-			if (Static194.anIntArray398[local102] < -32768) {
-				Static194.anIntArray398[local102] = -32768;
+			if (anIntArray398[local102] < -32768) {
+				anIntArray398[local102] = -32768;
 			}
-			if (Static194.anIntArray398[local102] > 32767) {
-				Static194.anIntArray398[local102] = 32767;
+			if (anIntArray398[local102] > 32767) {
+				anIntArray398[local102] = 32767;
 			}
 		}
-		return Static194.anIntArray398;
+		return anIntArray398;
 	}
 
 	@OriginalMember(owner = "client!pj", name = "a", descriptor = "(Lclient!wa;)V")
diff --git a/client/src/main/java/rt4/Texture.java b/client/src/main/java/rt4/Texture.java
index ab93b34..b59bfbd 100644
--- a/client/src/main/java/rt4/Texture.java
+++ b/client/src/main/java/rt4/Texture.java
@@ -12,7 +12,9 @@ public final class Texture {
     public static final int[] brightnessMap = new int[256];
 	@OriginalMember(owner = "client!jh", name = "f", descriptor = "D")
 	public static double brightness = -1.0D;
-	@OriginalMember(owner = "client!lc", name = "k", descriptor = "[I")
+    @OriginalMember(owner = "client!cm", name = "a", descriptor = "Lclient!m;")
+    public static TextureProvider anInterface1_1;
+    @OriginalMember(owner = "client!lc", name = "k", descriptor = "[I")
 	private final int[] anIntArray328;
 
 	@OriginalMember(owner = "client!lc", name = "b", descriptor = "[I")
@@ -93,7 +95,7 @@ public final class Texture {
 	@OriginalMember(owner = "client!lc", name = "a", descriptor = "(IZIDILclient!ve;Lclient!m;Z)[I")
 	public final int[] method2725(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) double arg3, @OriginalArg(5) Js5 arg4, @OriginalArg(6) TextureProvider arg5, @OriginalArg(7) boolean arg6) {
 		setBrightness(arg3);
-		Static37.anInterface1_1 = arg5;
+		anInterface1_1 = arg5;
 		Static176.aClass153_76 = arg4;
 		Static10.method348(arg0, arg2);
 		@Pc(20) int local20;
@@ -174,7 +176,7 @@ public final class Texture {
 		@Pc(8) byte[] local8 = new byte[arg1 * 4 * arg0];
 		setBrightness(arg4);
 		Static176.aClass153_76 = arg5;
-		Static37.anInterface1_1 = arg3;
+		anInterface1_1 = arg3;
 		Static10.method348(arg0, arg1);
 		@Pc(31) int local31;
 		for (local31 = 0; local31 < this.aClass3_Sub1Array22.length; local31++) {
diff --git a/client/src/main/java/rt4/TextureOp14.java b/client/src/main/java/rt4/TextureOp14.java
index bc1bd15..f150144 100644
--- a/client/src/main/java/rt4/TextureOp14.java
+++ b/client/src/main/java/rt4/TextureOp14.java
@@ -9,7 +9,9 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!hm")
 public final class TextureOp14 extends TextureOp {
 
-	@OriginalMember(owner = "client!hm", name = "S", descriptor = "I")
+    @OriginalMember(owner = "client!ui", name = "Q", descriptor = "I")
+    public static int anInt5526;
+    @OriginalMember(owner = "client!hm", name = "S", descriptor = "I")
 	private int anInt2635 = 2;
 
 	@OriginalMember(owner = "client!hm", name = "U", descriptor = "I")
@@ -65,7 +67,7 @@ public final class TextureOp14 extends TextureOp {
 			@Pc(36) int local36 = local32 >> 12;
 			@Pc(40) int local40 = local36 + 1;
 			for (@Pc(42) int local42 = 0; local42 < Static189.anInt4457; local42++) {
-				Static253.anInt5526 = Integer.MAX_VALUE;
+				anInt5526 = Integer.MAX_VALUE;
 				Static250.anInt5443 = Integer.MAX_VALUE;
 				Static121.anInt3041 = Integer.MAX_VALUE;
 				Static35.anInt1091 = Integer.MAX_VALUE;
@@ -104,19 +106,19 @@ public final class TextureOp14 extends TextureOp {
 							local201 = (int) (Math.sqrt((double) ((float) (local162 * local162 + local151 * local151) / 1.6777216E7F)) * 4096.0D);
 						}
 						if (local201 < Static35.anInt1091) {
-							Static253.anInt5526 = Static250.anInt5443;
+							anInt5526 = Static250.anInt5443;
 							Static250.anInt5443 = Static121.anInt3041;
 							Static121.anInt3041 = Static35.anInt1091;
 							Static35.anInt1091 = local201;
 						} else if (local201 < Static121.anInt3041) {
-							Static253.anInt5526 = Static250.anInt5443;
+							anInt5526 = Static250.anInt5443;
 							Static250.anInt5443 = Static121.anInt3041;
 							Static121.anInt3041 = local201;
 						} else if (Static250.anInt5443 > local201) {
-							Static253.anInt5526 = Static250.anInt5443;
+							anInt5526 = Static250.anInt5443;
 							Static250.anInt5443 = local201;
-						} else if (local201 < Static253.anInt5526) {
-							Static253.anInt5526 = local201;
+						} else if (local201 < anInt5526) {
+							anInt5526 = local201;
 						}
 					}
 				}
@@ -128,7 +130,7 @@ public final class TextureOp14 extends TextureOp {
 				} else if (local165 == 3) {
 					local19[local42] = Static250.anInt5443;
 				} else if (local165 == 4) {
-					local19[local42] = Static253.anInt5526;
+					local19[local42] = anInt5526;
 				} else if (local165 == 2) {
 					local19[local42] = Static121.anInt3041 - Static35.anInt1091;
 				}
diff --git a/client/src/main/java/rt4/TextureOp32.java b/client/src/main/java/rt4/TextureOp32.java
index 43e7085..b4db7ea 100644
--- a/client/src/main/java/rt4/TextureOp32.java
+++ b/client/src/main/java/rt4/TextureOp32.java
@@ -65,8 +65,8 @@ public final class TextureOp32 extends TextureOp {
 		} else {
 			@Pc(22) int local22 = Static189.anInt4457;
 			@Pc(24) int local24 = Static172.anInt4165;
-			@Pc(34) int local34 = Static37.anInterface1_1.isLowDetail(this.anInt5539) ? 64 : 128;
-			this.anIntArray483 = Static37.anInterface1_1.method3235(this.anInt5539);
+			@Pc(34) int local34 = Texture.anInterface1_1.isLowDetail(this.anInt5539) ? 64 : 128;
+			this.anIntArray483 = Texture.anInterface1_1.method3235(this.anInt5539);
 			this.anInt5536 = local34;
 			this.anInt5535 = local34;
 			Static10.method348(local24, local22);
diff --git a/client/src/main/java/rt4/Tile.java b/client/src/main/java/rt4/Tile.java
index 2439d7b..193dc41 100644
--- a/client/src/main/java/rt4/Tile.java
+++ b/client/src/main/java/rt4/Tile.java
@@ -11,7 +11,7 @@ public final class Tile extends Node {
 	public boolean aBoolean45;
 
 	@OriginalMember(owner = "client!bj", name = "y", descriptor = "I")
-	public int anInt662;
+	public int sceneryLen;
 
 	@OriginalMember(owner = "client!bj", name = "A", descriptor = "Z")
 	public boolean aBoolean46;
@@ -26,16 +26,16 @@ public final class Tile extends Node {
 	public int anInt665;
 
 	@OriginalMember(owner = "client!bj", name = "G", descriptor = "Lclient!bm;")
-	public GroundDecor aClass15_1;
+	public GroundDecor groundDecor;
 
 	@OriginalMember(owner = "client!bj", name = "I", descriptor = "I")
 	public int anInt667;
 
 	@OriginalMember(owner = "client!bj", name = "J", descriptor = "Lclient!df;")
-	public WallDecor aClass24_1;
+	public WallDecor wallDecor;
 
 	@OriginalMember(owner = "client!bj", name = "K", descriptor = "Lclient!jh;")
-	public Wall aClass77_1;
+	public Wall wall;
 
 	@OriginalMember(owner = "client!bj", name = "M", descriptor = "Lclient!bj;")
 	public Tile aClass3_Sub5_1;
@@ -56,7 +56,7 @@ public final class Tile extends Node {
 	public int anInt664 = 0;
 
 	@OriginalMember(owner = "client!bj", name = "w", descriptor = "[Lclient!ec;")
-	public final Scenery[] aClass31Array1 = new Scenery[5];
+	public final Scenery[] scenery = new Scenery[5];
 
 	@OriginalMember(owner = "client!bj", name = "P", descriptor = "[I")
 	public final int[] anIntArray59 = new int[5];
diff --git a/client/src/main/java/rt4/TracingException.java b/client/src/main/java/rt4/TracingException.java
index 20ab4df..bb35b14 100644
--- a/client/src/main/java/rt4/TracingException.java
+++ b/client/src/main/java/rt4/TracingException.java
@@ -30,7 +30,7 @@ public final class TracingException extends RuntimeException {
                 }
                 local13 = local13 + arg0;
             }
-            Static5.method31(local13);
+            method31(local13);
             local13 = Static40.method1014(":", "%3a", local13);
             local13 = Static40.method1014("@", "%40", local13);
             local13 = Static40.method1014("&", "%26", local13);
@@ -50,4 +50,9 @@ public final class TracingException extends RuntimeException {
         } catch (@Pc(135) Exception local135) {
         }
     }
+
+    @OriginalMember(owner = "client!af", name = "a", descriptor = "(ILjava/lang/String;)V")
+    public static void method31(@OriginalArg(1) String arg0) {
+        System.out.println("Error: " + Static40.method1014("%0a", "\n", arg0));
+    }
 }
diff --git a/client/src/main/java/rt4/VarpDomain.java b/client/src/main/java/rt4/VarpDomain.java
index 8317bea..d30633a 100644
--- a/client/src/main/java/rt4/VarpDomain.java
+++ b/client/src/main/java/rt4/VarpDomain.java
@@ -13,16 +13,30 @@ public class VarpDomain {
     public static final int[] activeVarps = new int[3500];
     @OriginalMember(owner = "client!fi", name = "n", descriptor = "I")
     public static int updatedVarpsWriterIndex = 0;
+    @OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;")
+    public static HashTable aClass133_20 = new HashTable(16);
 
     @OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V")
     public static void set(@OriginalArg(1) int value, @OriginalArg(2) int id) {
         varp[id] = value;
-        @Pc(20) LongNode local20 = (LongNode) Static199.aClass133_20.get((long) id);
+        @Pc(20) LongNode local20 = (LongNode) aClass133_20.get((long) id);
         if (local20 == null) {
             local20 = new LongNode(4611686018427387905L);
-            Static199.aClass133_20.put(local20, (long) id);
+            aClass133_20.put(local20, (long) id);
         } else if (local20.value != 4611686018427387905L) {
             local20.value = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L;
         }
     }
+
+    @OriginalMember(owner = "client!aj", name = "i", descriptor = "(I)V")
+    public static void reset() {
+        for (@Pc(3) int local3 = 0; local3 < VarpTypeList.anInt4043; local3++) {
+            @Pc(19) VarpType local19 = VarpTypeList.get(local3);
+            if (local19 != null && local19.clientCode == 0) {
+                varp[local3] = 0;
+                activeVarps[local3] = 0;
+            }
+        }
+        aClass133_20 = new HashTable(16);
+    }
 }
diff --git a/client/src/main/java/rt4/VorbisCodebook.java b/client/src/main/java/rt4/VorbisCodebook.java
index d33135c..2aef721 100644
--- a/client/src/main/java/rt4/VorbisCodebook.java
+++ b/client/src/main/java/rt4/VorbisCodebook.java
@@ -28,41 +28,41 @@ public final class VorbisCodebook {
 
 	@OriginalMember(owner = "client!ji", name = "<init>", descriptor = "()V")
 	public VorbisCodebook() {
-		Static117.method2350(24);
-		this.anInt3055 = Static117.method2350(16);
-		this.anInt3056 = Static117.method2350(24);
+		VorbisSound.method2350(24);
+		this.anInt3055 = VorbisSound.method2350(16);
+		this.anInt3056 = VorbisSound.method2350(24);
 		this.anIntArray286 = new int[this.anInt3056];
-		@Pc(23) boolean local23 = Static117.method2346() != 0;
+		@Pc(23) boolean local23 = VorbisSound.method2346() != 0;
 		@Pc(27) int local27;
 		@Pc(32) int local32;
 		@Pc(46) int local46;
 		if (local23) {
 			local27 = 0;
-			local32 = Static117.method2350(5) + 1;
+			local32 = VorbisSound.method2350(5) + 1;
 			while (local27 < this.anInt3056) {
-				@Pc(44) int local44 = Static117.method2350(Static204.method3674(this.anInt3056 - local27));
+				@Pc(44) int local44 = VorbisSound.method2350(Static204.method3674(this.anInt3056 - local27));
 				for (local46 = 0; local46 < local44; local46++) {
 					this.anIntArray286[local27++] = local32;
 				}
 				local32++;
 			}
 		} else {
-			@Pc(66) boolean local66 = Static117.method2346() != 0;
+			@Pc(66) boolean local66 = VorbisSound.method2346() != 0;
 			for (local32 = 0; local32 < this.anInt3056; local32++) {
-				if (local66 && Static117.method2346() == 0) {
+				if (local66 && VorbisSound.method2346() == 0) {
 					this.anIntArray286[local32] = 0;
 				} else {
-					this.anIntArray286[local32] = Static117.method2350(5) + 1;
+					this.anIntArray286[local32] = VorbisSound.method2350(5) + 1;
 				}
 			}
 		}
 		this.method2414();
-		local27 = Static117.method2350(4);
+		local27 = VorbisSound.method2350(4);
 		if (local27 > 0) {
-			@Pc(103) float local103 = Static117.method2340(Static117.method2350(32));
-			@Pc(107) float local107 = Static117.method2340(Static117.method2350(32));
-			local46 = Static117.method2350(4) + 1;
-			@Pc(118) boolean local118 = Static117.method2346() != 0;
+			@Pc(103) float local103 = VorbisSound.method2340(VorbisSound.method2350(32));
+			@Pc(107) float local107 = VorbisSound.method2340(VorbisSound.method2350(32));
+			local46 = VorbisSound.method2350(4) + 1;
+			@Pc(118) boolean local118 = VorbisSound.method2346() != 0;
 			@Pc(127) int local127;
 			if (local27 == 1) {
 				local127 = lookup1Values(this.anInt3056, this.anInt3055);
@@ -72,7 +72,7 @@ public final class VorbisCodebook {
 			this.anIntArray287 = new int[local127];
 			@Pc(140) int local140;
 			for (local140 = 0; local140 < local127; local140++) {
-				this.anIntArray287[local140] = Static117.method2350(local46);
+				this.anIntArray287[local140] = VorbisSound.method2350(local46);
 			}
 			this.aFloatArrayArray1 = new float[this.anInt3056][this.anInt3055];
 			@Pc(169) float local169;
@@ -202,7 +202,7 @@ public final class VorbisCodebook {
 	@OriginalMember(owner = "client!ji", name = "c", descriptor = "()I")
 	public final int method2415() {
 		@Pc(1) int local1;
-		for (local1 = 0; this.anIntArray288[local1] >= 0; local1 = Static117.method2346() == 0 ? local1 + 1 : this.anIntArray288[local1]) {
+		for (local1 = 0; this.anIntArray288[local1] >= 0; local1 = VorbisSound.method2346() == 0 ? local1 + 1 : this.anIntArray288[local1]) {
 		}
 		return ~this.anIntArray288[local1];
 	}
diff --git a/client/src/main/java/rt4/VorbisMapping.java b/client/src/main/java/rt4/VorbisMapping.java
index 6971642..3fe2787 100644
--- a/client/src/main/java/rt4/VorbisMapping.java
+++ b/client/src/main/java/rt4/VorbisMapping.java
@@ -21,21 +21,21 @@ public final class VorbisMapping {
 
 	@OriginalMember(owner = "client!uk", name = "<init>", descriptor = "()V")
 	public VorbisMapping() {
-		Static117.method2350(16);
-		this.anInt5563 = Static117.method2346() == 0 ? 1 : Static117.method2350(4) + 1;
-		if (Static117.method2346() != 0) {
-			Static117.method2350(8);
+		VorbisSound.method2350(16);
+		this.anInt5563 = VorbisSound.method2346() == 0 ? 1 : VorbisSound.method2350(4) + 1;
+		if (VorbisSound.method2346() != 0) {
+			VorbisSound.method2350(8);
 		}
-		Static117.method2350(2);
+		VorbisSound.method2350(2);
 		if (this.anInt5563 > 1) {
-			this.anInt5562 = Static117.method2350(4);
+			this.anInt5562 = VorbisSound.method2350(4);
 		}
 		this.anIntArray490 = new int[this.anInt5563];
 		this.anIntArray491 = new int[this.anInt5563];
 		for (@Pc(42) int local42 = 0; local42 < this.anInt5563; local42++) {
-			Static117.method2350(8);
-			this.anIntArray490[local42] = Static117.method2350(8);
-			this.anIntArray491[local42] = Static117.method2350(8);
+			VorbisSound.method2350(8);
+			this.anIntArray490[local42] = VorbisSound.method2350(8);
+			this.anIntArray491[local42] = VorbisSound.method2350(8);
 		}
 	}
 }
diff --git a/client/src/main/java/rt4/VorbisRange.java b/client/src/main/java/rt4/VorbisRange.java
index 07ec6ce..f66a5e4 100644
--- a/client/src/main/java/rt4/VorbisRange.java
+++ b/client/src/main/java/rt4/VorbisRange.java
@@ -8,6 +8,14 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!ie")
 public final class VorbisRange {
 
+    @OriginalMember(owner = "client!ie", name = "k", descriptor = "[I")
+    public static final int[] anIntArray267 = new int[] { 256, 128, 86, 64 };
+	@OriginalMember(owner = "client!ie", name = "b", descriptor = "[Z")
+	public static boolean[] aBooleanArray60;
+	@OriginalMember(owner = "client!ie", name = "h", descriptor = "[I")
+	public static int[] anIntArray264;
+	@OriginalMember(owner = "client!ie", name = "j", descriptor = "[I")
+	public static int[] anIntArray266;
 	@OriginalMember(owner = "client!ie", name = "e", descriptor = "[I")
 	private final int[] anIntArray262;
 
@@ -31,17 +39,17 @@ public final class VorbisRange {
 
 	@OriginalMember(owner = "client!ie", name = "<init>", descriptor = "()V")
 	public VorbisRange() {
-		@Pc(4) int local4 = Static117.method2350(16);
+		@Pc(4) int local4 = VorbisSound.method2350(16);
 		if (local4 != 1) {
 			throw new RuntimeException();
 		}
-		@Pc(14) int local14 = Static117.method2350(5);
+		@Pc(14) int local14 = VorbisSound.method2350(5);
 		@Pc(16) int local16 = 0;
 		this.anIntArray262 = new int[local14];
 		@Pc(22) int local22;
 		@Pc(28) int local28;
 		for (local22 = 0; local22 < local14; local22++) {
-			local28 = Static117.method2350(4);
+			local28 = VorbisSound.method2350(4);
 			this.anIntArray262[local22] = local28;
 			if (local28 >= local16) {
 				local16 = local28 + 1;
@@ -53,20 +61,20 @@ public final class VorbisRange {
 		this.anIntArrayArray20 = new int[local16][];
 		@Pc(101) int local101;
 		for (local22 = 0; local22 < local16; local22++) {
-			this.anIntArray265[local22] = Static117.method2350(3) + 1;
-			local28 = this.anIntArray263[local22] = Static117.method2350(2);
+			this.anIntArray265[local22] = VorbisSound.method2350(3) + 1;
+			local28 = this.anIntArray263[local22] = VorbisSound.method2350(2);
 			if (local28 != 0) {
-				this.anIntArray260[local22] = Static117.method2350(8);
+				this.anIntArray260[local22] = VorbisSound.method2350(8);
 			}
 			local28 = 0x1 << local28;
 			@Pc(94) int[] local94 = new int[local28];
 			this.anIntArrayArray20[local22] = local94;
 			for (local101 = 0; local101 < local28; local101++) {
-				local94[local101] = Static117.method2350(8) - 1;
+				local94[local101] = VorbisSound.method2350(8) - 1;
 			}
 		}
-		this.anInt2880 = Static117.method2350(2) + 1;
-		local22 = Static117.method2350(4);
+		this.anInt2880 = VorbisSound.method2350(2) + 1;
+		local22 = VorbisSound.method2350(4);
 		local28 = 2;
 		@Pc(128) int local128;
 		for (local128 = 0; local128 < local14; local128++) {
@@ -79,16 +87,46 @@ public final class VorbisRange {
 		for (local128 = 0; local128 < local14; local128++) {
 			local101 = this.anIntArray262[local128];
 			for (@Pc(173) int local173 = 0; local173 < this.anIntArray265[local101]; local173++) {
-				this.anIntArray261[local28++] = Static117.method2350(local22);
+				this.anIntArray261[local28++] = VorbisSound.method2350(local22);
 			}
 		}
-		if (Static108.anIntArray264 == null || Static108.anIntArray264.length < local28) {
-			Static108.anIntArray264 = new int[local28];
-			Static108.anIntArray266 = new int[local28];
-			Static108.aBooleanArray60 = new boolean[local28];
+		if (anIntArray264 == null || anIntArray264.length < local28) {
+			anIntArray264 = new int[local28];
+			anIntArray266 = new int[local28];
+			aBooleanArray60 = new boolean[local28];
 		}
 	}
 
+	@OriginalMember(owner = "client!ie", name = "a", descriptor = "([II)I")
+	public static int method2268(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
+		@Pc(3) int local3 = arg0[arg1];
+		@Pc(5) int local5 = -1;
+		@Pc(7) int local7 = Integer.MIN_VALUE;
+		for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
+			@Pc(16) int local16 = arg0[local9];
+			if (local16 < local3 && local16 > local7) {
+				local5 = local9;
+				local7 = local16;
+			}
+		}
+		return local5;
+	}
+
+	@OriginalMember(owner = "client!ie", name = "b", descriptor = "([II)I")
+	public static int method2270(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1) {
+		@Pc(3) int local3 = arg0[arg1];
+		@Pc(5) int local5 = -1;
+		@Pc(7) int local7 = Integer.MAX_VALUE;
+		for (@Pc(9) int local9 = 0; local9 < arg1; local9++) {
+			@Pc(16) int local16 = arg0[local9];
+			if (local16 > local3 && local16 < local7) {
+				local5 = local9;
+				local7 = local16;
+			}
+		}
+		return local5;
+	}
+
 	@OriginalMember(owner = "client!ie", name = "a", descriptor = "(IIII[FI)V")
 	private void method2265(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) float[] arg4, @OriginalArg(5) int arg5) {
 		@Pc(3) int local3 = arg3 - arg1;
@@ -121,24 +159,24 @@ public final class VorbisRange {
 			return;
 		}
 		@Pc(5) int local5 = arg0;
-		@Pc(9) int local9 = Static108.anIntArray264[arg0];
-		@Pc(13) int local13 = Static108.anIntArray266[arg0];
-		@Pc(17) boolean local17 = Static108.aBooleanArray60[arg0];
+		@Pc(9) int local9 = anIntArray264[arg0];
+		@Pc(13) int local13 = anIntArray266[arg0];
+		@Pc(17) boolean local17 = aBooleanArray60[arg0];
 		for (@Pc(21) int local21 = arg0 + 1; local21 <= arg1; local21++) {
-			@Pc(28) int local28 = Static108.anIntArray264[local21];
+			@Pc(28) int local28 = anIntArray264[local21];
 			if (local28 < local9) {
-				Static108.anIntArray264[local5] = local28;
-				Static108.anIntArray266[local5] = Static108.anIntArray266[local21];
-				Static108.aBooleanArray60[local5] = Static108.aBooleanArray60[local21];
+				anIntArray264[local5] = local28;
+				anIntArray266[local5] = anIntArray266[local21];
+				aBooleanArray60[local5] = aBooleanArray60[local21];
 				local5++;
-				Static108.anIntArray264[local21] = Static108.anIntArray264[local5];
-				Static108.anIntArray266[local21] = Static108.anIntArray266[local5];
-				Static108.aBooleanArray60[local21] = Static108.aBooleanArray60[local5];
+				anIntArray264[local21] = anIntArray264[local5];
+				anIntArray266[local21] = anIntArray266[local5];
+				aBooleanArray60[local21] = aBooleanArray60[local5];
 			}
 		}
-		Static108.anIntArray264[local5] = local9;
-		Static108.anIntArray266[local5] = local13;
-		Static108.aBooleanArray60[local5] = local17;
+		anIntArray264[local5] = local9;
+		anIntArray266[local5] = local13;
+		aBooleanArray60[local5] = local17;
 		this.method2266(arg0, local5 - 1);
 		this.method2266(local5 + 1, arg1);
 	}
@@ -156,40 +194,40 @@ public final class VorbisRange {
 	@OriginalMember(owner = "client!ie", name = "a", descriptor = "([FI)V")
 	public final void method2269(@OriginalArg(0) float[] arg0, @OriginalArg(1) int arg1) {
 		@Pc(3) int local3 = this.anIntArray261.length;
-		@Pc(10) int local10 = Static108.anIntArray267[this.anInt2880 - 1];
-		Static108.aBooleanArray60[0] = Static108.aBooleanArray60[1] = true;
+		@Pc(10) int local10 = anIntArray267[this.anInt2880 - 1];
+		aBooleanArray60[0] = aBooleanArray60[1] = true;
 		@Pc(20) int local20;
 		@Pc(27) int local27;
 		@Pc(31) int local31;
 		@Pc(49) int local49;
 		@Pc(53) int local53;
 		for (local20 = 2; local20 < local3; local20++) {
-			local27 = Static108.method2268(Static108.anIntArray264, local20);
-			local31 = Static108.method2270(Static108.anIntArray264, local20);
-			local49 = this.method2267(Static108.anIntArray264[local27], Static108.anIntArray266[local27], Static108.anIntArray264[local31], Static108.anIntArray266[local31], Static108.anIntArray264[local20]);
-			local53 = Static108.anIntArray266[local20];
+			local27 = method2268(anIntArray264, local20);
+			local31 = method2270(anIntArray264, local20);
+			local49 = this.method2267(anIntArray264[local27], anIntArray266[local27], anIntArray264[local31], anIntArray266[local31], anIntArray264[local20]);
+			local53 = anIntArray266[local20];
 			@Pc(57) int local57 = local10 - local49;
 			@Pc(68) int local68 = (local57 < local49 ? local57 : local49) << 1;
 			if (local53 == 0) {
-				Static108.aBooleanArray60[local20] = false;
-				Static108.anIntArray266[local20] = local49;
+				aBooleanArray60[local20] = false;
+				anIntArray266[local20] = local49;
 			} else {
-				Static108.aBooleanArray60[local27] = Static108.aBooleanArray60[local31] = true;
-				Static108.aBooleanArray60[local20] = true;
+				aBooleanArray60[local27] = aBooleanArray60[local31] = true;
+				aBooleanArray60[local20] = true;
 				if (local53 >= local68) {
-					Static108.anIntArray266[local20] = local57 > local49 ? local53 + local49 - local49 : local49 - local53 + local57 - 1;
+					anIntArray266[local20] = local57 > local49 ? local53 + local49 - local49 : local49 - local53 + local57 - 1;
 				} else {
-					Static108.anIntArray266[local20] = (local53 & 0x1) == 0 ? local49 + local53 / 2 : local49 - (local53 + 1) / 2;
+					anIntArray266[local20] = (local53 & 0x1) == 0 ? local49 + local53 / 2 : local49 - (local53 + 1) / 2;
 				}
 			}
 		}
 		this.method2266(0, local3 - 1);
 		local20 = 0;
-		local27 = Static108.anIntArray266[0] * this.anInt2880;
+		local27 = anIntArray266[0] * this.anInt2880;
 		for (local31 = 1; local31 < local3; local31++) {
-			if (Static108.aBooleanArray60[local31]) {
-				local49 = Static108.anIntArray264[local31];
-				local53 = Static108.anIntArray266[local31] * this.anInt2880;
+			if (aBooleanArray60[local31]) {
+				local49 = anIntArray264[local31];
+				local53 = anIntArray266[local31] * this.anInt2880;
 				this.method2265(local20, local27, local49, local53, arg0, arg1);
 				if (local49 >= arg1) {
 					return;
@@ -206,19 +244,19 @@ public final class VorbisRange {
 
 	@OriginalMember(owner = "client!ie", name = "b", descriptor = "()Z")
 	public final boolean method2272() {
-		@Pc(5) boolean local5 = Static117.method2346() != 0;
+		@Pc(5) boolean local5 = VorbisSound.method2346() != 0;
 		if (!local5) {
 			return false;
 		}
 		@Pc(13) int local13 = this.anIntArray261.length;
 		@Pc(15) int local15;
 		for (local15 = 0; local15 < local13; local15++) {
-			Static108.anIntArray264[local15] = this.anIntArray261[local15];
+			anIntArray264[local15] = this.anIntArray261[local15];
 		}
-		local15 = Static108.anIntArray267[this.anInt2880 - 1];
+		local15 = anIntArray267[this.anInt2880 - 1];
 		@Pc(40) int local40 = Static204.method3674(local15 - 1);
-		Static108.anIntArray266[0] = Static117.method2350(local40);
-		Static108.anIntArray266[1] = Static117.method2350(local40);
+		anIntArray266[0] = VorbisSound.method2350(local40);
+		anIntArray266[1] = VorbisSound.method2350(local40);
 		@Pc(52) int local52 = 2;
 		for (@Pc(54) int local54 = 0; local54 < this.anIntArray262.length; local54++) {
 			@Pc(64) int local64 = this.anIntArray262[local54];
@@ -227,12 +265,12 @@ public final class VorbisRange {
 			@Pc(80) int local80 = (0x1 << local74) - 1;
 			@Pc(82) int local82 = 0;
 			if (local74 > 0) {
-				local82 = Static117.aClass78Array1[this.anIntArray260[local64]].method2415();
+				local82 = VorbisSound.aClass78Array1[this.anIntArray260[local64]].method2415();
 			}
 			for (@Pc(94) int local94 = 0; local94 < local69; local94++) {
 				@Pc(106) int local106 = this.anIntArrayArray20[local64][local82 & local80];
 				local82 >>>= local74;
-				Static108.anIntArray266[local52++] = local106 >= 0 ? Static117.aClass78Array1[local106].method2415() : 0;
+				anIntArray266[local52++] = local106 >= 0 ? VorbisSound.aClass78Array1[local106].method2415() : 0;
 			}
 		}
 		return true;
diff --git a/client/src/main/java/rt4/VorbisResidue.java b/client/src/main/java/rt4/VorbisResidue.java
index 36cfedc..c85db95 100644
--- a/client/src/main/java/rt4/VorbisResidue.java
+++ b/client/src/main/java/rt4/VorbisResidue.java
@@ -9,22 +9,22 @@ import org.openrs2.deob.annotation.Pc;
 public final class VorbisResidue {
 
 	@OriginalMember(owner = "client!vb", name = "c", descriptor = "I")
-	private final int anInt5679 = Static117.method2350(16);
+	private final int anInt5679 = VorbisSound.method2350(16);
 
 	@OriginalMember(owner = "client!vb", name = "b", descriptor = "I")
-	private final int anInt5678 = Static117.method2350(24);
+	private final int anInt5678 = VorbisSound.method2350(24);
 
 	@OriginalMember(owner = "client!vb", name = "d", descriptor = "I")
-	private final int anInt5680 = Static117.method2350(24);
+	private final int anInt5680 = VorbisSound.method2350(24);
 
 	@OriginalMember(owner = "client!vb", name = "e", descriptor = "I")
-	private final int anInt5681 = Static117.method2350(24) + 1;
+	private final int anInt5681 = VorbisSound.method2350(24) + 1;
 
 	@OriginalMember(owner = "client!vb", name = "g", descriptor = "I")
-	private final int anInt5682 = Static117.method2350(6) + 1;
+	private final int anInt5682 = VorbisSound.method2350(6) + 1;
 
 	@OriginalMember(owner = "client!vb", name = "a", descriptor = "I")
-	private final int anInt5677 = Static117.method2350(8);
+	private final int anInt5677 = VorbisSound.method2350(8);
 
 	@OriginalMember(owner = "client!vb", name = "f", descriptor = "[I")
 	private final int[] anIntArray511;
@@ -35,16 +35,16 @@ public final class VorbisResidue {
 		@Pc(35) int local35;
 		for (local35 = 0; local35 < this.anInt5682; local35++) {
 			@Pc(41) int local41 = 0;
-			@Pc(44) int local44 = Static117.method2350(3);
-			@Pc(50) boolean local50 = Static117.method2346() != 0;
+			@Pc(44) int local44 = VorbisSound.method2350(3);
+			@Pc(50) boolean local50 = VorbisSound.method2346() != 0;
 			if (local50) {
-				local41 = Static117.method2350(5);
+				local41 = VorbisSound.method2350(5);
 			}
 			local33[local35] = local41 << 3 | local44;
 		}
 		this.anIntArray511 = new int[this.anInt5682 * 8];
 		for (local35 = 0; local35 < this.anInt5682 * 8; local35++) {
-			this.anIntArray511[local35] = (local33[local35 >> 3] & 0x1 << (local35 & 0x7)) == 0 ? -1 : Static117.method2350(8);
+			this.anIntArray511[local35] = (local33[local35 >> 3] & 0x1 << (local35 & 0x7)) == 0 ? -1 : VorbisSound.method2350(8);
 		}
 	}
 
@@ -57,7 +57,7 @@ public final class VorbisResidue {
 		if (arg2) {
 			return;
 		}
-		local1 = Static117.aClass78Array1[this.anInt5677].anInt3055;
+		local1 = VorbisSound.aClass78Array1[this.anInt5677].anInt3055;
 		@Pc(25) int local25 = this.anInt5680 - this.anInt5678;
 		@Pc(30) int local30 = local25 / this.anInt5681;
 		@Pc(33) int[] local33 = new int[local30];
@@ -67,7 +67,7 @@ public final class VorbisResidue {
 				@Pc(51) int local51;
 				@Pc(55) int local55;
 				if (local35 == 0) {
-					local51 = Static117.aClass78Array1[this.anInt5677].method2415();
+					local51 = VorbisSound.aClass78Array1[this.anInt5677].method2415();
 					for (local55 = local1 - 1; local55 >= 0; local55--) {
 						if (local40 + local55 < local30) {
 							local33[local40 + local55] = local51 % this.anInt5682;
@@ -80,7 +80,7 @@ public final class VorbisResidue {
 					@Pc(96) int local96 = this.anIntArray511[local55 * 8 + local35];
 					if (local96 >= 0) {
 						@Pc(106) int local106 = this.anInt5678 + local40 * this.anInt5681;
-						@Pc(110) VorbisCodebook local110 = Static117.aClass78Array1[local96];
+						@Pc(110) VorbisCodebook local110 = VorbisSound.aClass78Array1[local96];
 						@Pc(119) int local119;
 						if (this.anInt5679 == 0) {
 							local119 = this.anInt5681 / local110.anInt3055;
diff --git a/client/src/main/java/rt4/VorbisSound.java b/client/src/main/java/rt4/VorbisSound.java
index 4b70ff1..61ed10e 100644
--- a/client/src/main/java/rt4/VorbisSound.java
+++ b/client/src/main/java/rt4/VorbisSound.java
@@ -8,7 +8,49 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!jc")
 public final class VorbisSound extends Node {
 
-	@OriginalMember(owner = "client!jc", name = "r", descriptor = "I")
+    @OriginalMember(owner = "client!jc", name = "p", descriptor = "[F")
+    public static float[] aFloatArray9;
+    @OriginalMember(owner = "client!jc", name = "q", descriptor = "[F")
+    public static float[] aFloatArray10;
+    @OriginalMember(owner = "client!jc", name = "t", descriptor = "[I")
+    public static int[] anIntArray276;
+    @OriginalMember(owner = "client!jc", name = "u", descriptor = "[Lclient!vb;")
+    public static VorbisResidue[] aClass152Array1;
+    @OriginalMember(owner = "client!jc", name = "v", descriptor = "[Z")
+    public static boolean[] aBooleanArray63;
+    @OriginalMember(owner = "client!jc", name = "y", descriptor = "I")
+    public static int anInt2975;
+    @OriginalMember(owner = "client!jc", name = "A", descriptor = "[Lclient!uk;")
+    public static VorbisMapping[] aClass151Array1;
+    @OriginalMember(owner = "client!jc", name = "B", descriptor = "[F")
+    public static float[] aFloatArray12;
+    @OriginalMember(owner = "client!jc", name = "C", descriptor = "[F")
+    public static float[] aFloatArray13;
+    @OriginalMember(owner = "client!jc", name = "E", descriptor = "I")
+    public static int anInt2978;
+    @OriginalMember(owner = "client!jc", name = "F", descriptor = "[F")
+    public static float[] aFloatArray14;
+    @OriginalMember(owner = "client!jc", name = "I", descriptor = "[Lclient!ji;")
+    public static VorbisCodebook[] aClass78Array1;
+    @OriginalMember(owner = "client!jc", name = "J", descriptor = "[Lclient!ie;")
+    public static VorbisRange[] aClass67Array1;
+    @OriginalMember(owner = "client!jc", name = "L", descriptor = "[I")
+    public static int[] anIntArray277;
+    @OriginalMember(owner = "client!jc", name = "P", descriptor = "[F")
+    public static float[] aFloatArray15;
+    @OriginalMember(owner = "client!jc", name = "S", descriptor = "[F")
+    public static float[] aFloatArray16;
+    @OriginalMember(owner = "client!jc", name = "W", descriptor = "[I")
+    public static int[] anIntArray278;
+    @OriginalMember(owner = "client!jc", name = "G", descriptor = "I")
+    private static int anInt2979;
+    @OriginalMember(owner = "client!jc", name = "Q", descriptor = "I")
+    private static int anInt2982;
+    @OriginalMember(owner = "client!jc", name = "T", descriptor = "[B")
+    private static byte[] aByteArray42;
+    @OriginalMember(owner = "client!jc", name = "H", descriptor = "Z")
+    private static boolean aBoolean149 = false;
+    @OriginalMember(owner = "client!jc", name = "r", descriptor = "I")
 	private int anInt2973;
 
 	@OriginalMember(owner = "client!jc", name = "s", descriptor = "I")
@@ -52,14 +94,170 @@ public final class VorbisSound extends Node {
 		this.method2342(arg0);
 	}
 
-	@OriginalMember(owner = "client!jc", name = "a", descriptor = "([I)Lclient!kj;")
+    @OriginalMember(owner = "client!jc", name = "c", descriptor = "(I)F")
+    public static float method2340(@OriginalArg(0) int arg0) {
+        @Pc(3) int local3 = arg0 & 0x1FFFFF;
+        @Pc(7) int local7 = arg0 & Integer.MIN_VALUE;
+        @Pc(13) int local13 = arg0 >> 21 & 0x3FF;
+        if (local7 != 0) {
+            local3 = -local3;
+        }
+        return (float) ((double) local3 * Math.pow(2.0D, (double) (local13 - 788)));
+    }
+
+    @OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;)Z")
+    private static boolean method2344(@OriginalArg(0) Js5 arg0) {
+        if (!aBoolean149) {
+            @Pc(7) byte[] local7 = arg0.getFile(0, 0);
+            if (local7 == null) {
+                return false;
+            }
+            method2349(local7);
+            aBoolean149 = true;
+        }
+        return true;
+    }
+
+    @OriginalMember(owner = "client!jc", name = "a", descriptor = "(Lclient!ve;II)Lclient!jc;")
+    public static VorbisSound method2345(@OriginalArg(0) Js5 arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+        if (method2344(arg0)) {
+            @Pc(16) byte[] local16 = arg0.getFile(arg1, arg2);
+            return local16 == null ? null : new VorbisSound(local16);
+        } else {
+            arg0.isFileReady(arg2, arg1);
+            return null;
+        }
+    }
+
+    @OriginalMember(owner = "client!jc", name = "b", descriptor = "()I")
+    public static int method2346() {
+        @Pc(7) int local7 = aByteArray42[anInt2979] >> anInt2982 & 0x1;
+        anInt2982++;
+        anInt2979 += anInt2982 >> 3;
+        anInt2982 &= 0x7;
+        return local7;
+    }
+
+    @OriginalMember(owner = "client!jc", name = "a", descriptor = "([BI)V")
+    public static void method2347(@OriginalArg(0) byte[] arg0) {
+        aByteArray42 = arg0;
+        anInt2979 = 0;
+        anInt2982 = 0;
+    }
+
+    @OriginalMember(owner = "client!jc", name = "b", descriptor = "([B)V")
+    private static void method2349(@OriginalArg(0) byte[] arg0) {
+        method2347(arg0);
+        anInt2978 = 0x1 << method2350(4);
+        anInt2975 = 0x1 << method2350(4);
+        aFloatArray14 = new float[anInt2975];
+        @Pc(17) int local17;
+        @Pc(26) int local26;
+        @Pc(30) int local30;
+        @Pc(34) int local34;
+        @Pc(38) int local38;
+        for (local17 = 0; local17 < 2; local17++) {
+            local26 = local17 == 0 ? anInt2978 : anInt2975;
+            local30 = local26 >> 1;
+            local34 = local26 >> 2;
+            local38 = local26 >> 3;
+            @Pc(41) float[] local41 = new float[local30];
+            for (@Pc(43) int local43 = 0; local43 < local34; local43++) {
+                local41[local43 * 2] = (float) Math.cos((double) (local43 * 4) * 3.141592653589793D / (double) local26);
+                local41[local43 * 2 + 1] = -((float) Math.sin((double) (local43 * 4) * 3.141592653589793D / (double) local26));
+            }
+            @Pc(86) float[] local86 = new float[local30];
+            for (@Pc(88) int local88 = 0; local88 < local34; local88++) {
+                local86[local88 * 2] = (float) Math.cos((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
+                local86[local88 * 2 + 1] = (float) Math.sin((double) (local88 * 2 + 1) * 3.141592653589793D / (double) (local26 * 2));
+            }
+            @Pc(138) float[] local138 = new float[local34];
+            for (@Pc(140) int local140 = 0; local140 < local38; local140++) {
+                local138[local140 * 2] = (float) Math.cos((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26);
+                local138[local140 * 2 + 1] = -((float) Math.sin((double) (local140 * 4 + 2) * 3.141592653589793D / (double) local26));
+            }
+            @Pc(187) int[] local187 = new int[local38];
+            @Pc(193) int local193 = Static204.method3674(local38 - 1);
+            for (@Pc(195) int local195 = 0; local195 < local38; local195++) {
+                local187[local195] = Static24.method667(local193, local195);
+            }
+            if (local17 == 0) {
+                aFloatArray13 = local41;
+                aFloatArray15 = local86;
+                aFloatArray16 = local138;
+                anIntArray276 = local187;
+            } else {
+                aFloatArray12 = local41;
+                aFloatArray9 = local86;
+                aFloatArray10 = local138;
+                anIntArray277 = local187;
+            }
+        }
+        local17 = method2350(8) + 1;
+        aClass78Array1 = new VorbisCodebook[local17];
+        for (local26 = 0; local26 < local17; local26++) {
+            aClass78Array1[local26] = new VorbisCodebook();
+        }
+        local26 = method2350(6) + 1;
+        for (local30 = 0; local30 < local26; local30++) {
+            method2350(16);
+        }
+        local26 = method2350(6) + 1;
+        aClass67Array1 = new VorbisRange[local26];
+        for (local30 = 0; local30 < local26; local30++) {
+            aClass67Array1[local30] = new VorbisRange();
+        }
+        local30 = method2350(6) + 1;
+        aClass152Array1 = new VorbisResidue[local30];
+        for (local34 = 0; local34 < local30; local34++) {
+            aClass152Array1[local34] = new VorbisResidue();
+        }
+        local34 = method2350(6) + 1;
+        aClass151Array1 = new VorbisMapping[local34];
+        for (local38 = 0; local38 < local34; local38++) {
+            aClass151Array1[local38] = new VorbisMapping();
+        }
+        local38 = method2350(6) + 1;
+        aBooleanArray63 = new boolean[local38];
+        anIntArray278 = new int[local38];
+        for (@Pc(340) int local340 = 0; local340 < local38; local340++) {
+            aBooleanArray63[local340] = method2346() != 0;
+            method2350(16);
+            method2350(16);
+            anIntArray278[local340] = method2350(8);
+        }
+    }
+
+    @OriginalMember(owner = "client!jc", name = "e", descriptor = "(I)I")
+    public static int method2350(@OriginalArg(0) int arg0) {
+        @Pc(1) int local1 = 0;
+        @Pc(3) int local3 = 0;
+        @Pc(12) int local12;
+        while (arg0 >= 8 - anInt2982) {
+            local12 = 8 - anInt2982;
+            @Pc(18) int local18 = (0x1 << local12) - 1;
+            local1 += (aByteArray42[anInt2979] >> anInt2982 & local18) << local3;
+            anInt2982 = 0;
+            anInt2979++;
+            local3 += local12;
+            arg0 -= local12;
+        }
+        if (arg0 > 0) {
+            local12 = (0x1 << arg0) - 1;
+            local1 += (aByteArray42[anInt2979] >> anInt2982 & local12) << local3;
+            anInt2982 += arg0;
+        }
+        return local1;
+    }
+
+    @OriginalMember(owner = "client!jc", name = "a", descriptor = "([I)Lclient!kj;")
 	public final PcmSound method2341(@OriginalArg(0) int[] arg0) {
 		if (arg0 != null && arg0[0] <= 0) {
 			return null;
 		}
 		if (this.aByteArray41 == null) {
 			this.anInt2973 = 0;
-			this.aFloatArray11 = new float[Static117.anInt2975];
+			this.aFloatArray11 = new float[anInt2975];
 			this.aByteArray41 = new byte[this.anInt2974];
 			this.anInt2984 = 0;
 			this.anInt2983 = 0;
@@ -123,25 +321,25 @@ public final class VorbisSound extends Node {
 
 	@OriginalMember(owner = "client!jc", name = "d", descriptor = "(I)[F")
 	private float[] method2348(@OriginalArg(0) int arg0) {
-		Static117.method2347(this.aByteArrayArray10[arg0]);
-		Static117.method2346();
-		@Pc(15) int local15 = Static117.method2350(Static204.method3674(Static117.anIntArray278.length - 1));
-		@Pc(19) boolean local19 = Static117.aBooleanArray63[local15];
-		@Pc(25) int local25 = local19 ? Static117.anInt2975 : Static117.anInt2978;
+		method2347(this.aByteArrayArray10[arg0]);
+		method2346();
+		@Pc(15) int local15 = method2350(Static204.method3674(anIntArray278.length - 1));
+		@Pc(19) boolean local19 = aBooleanArray63[local15];
+		@Pc(25) int local25 = local19 ? anInt2975 : anInt2978;
 		@Pc(27) boolean local27 = false;
 		@Pc(29) boolean local29 = false;
 		if (local19) {
-			local27 = Static117.method2346() != 0;
-			local29 = Static117.method2346() != 0;
+			local27 = method2346() != 0;
+			local29 = method2346() != 0;
 		}
 		@Pc(47) int local47 = local25 >> 1;
 		@Pc(59) int local59;
 		@Pc(67) int local67;
 		@Pc(71) int local71;
 		if (local19 && !local27) {
-			local59 = (local25 >> 2) - (Static117.anInt2978 >> 2);
-			local67 = (local25 >> 2) + (Static117.anInt2978 >> 2);
-			local71 = Static117.anInt2978 >> 1;
+			local59 = (local25 >> 2) - (anInt2978 >> 2);
+			local67 = (local25 >> 2) + (anInt2978 >> 2);
+			local71 = anInt2978 >> 1;
 		} else {
 			local59 = 0;
 			local67 = local47;
@@ -151,39 +349,39 @@ public final class VorbisSound extends Node {
 		@Pc(104) int local104;
 		@Pc(108) int local108;
 		if (local19 && !local29) {
-			local94 = local25 - (local25 >> 2) - (Static117.anInt2978 >> 2);
-			local104 = local25 + (Static117.anInt2978 >> 2) - (local25 >> 2);
-			local108 = Static117.anInt2978 >> 1;
+			local94 = local25 - (local25 >> 2) - (anInt2978 >> 2);
+			local104 = local25 + (anInt2978 >> 2) - (local25 >> 2);
+			local108 = anInt2978 >> 1;
 		} else {
 			local94 = local47;
 			local104 = local25;
 			local108 = local25 >> 1;
 		}
-		@Pc(123) VorbisMapping local123 = Static117.aClass151Array1[Static117.anIntArray278[local15]];
+		@Pc(123) VorbisMapping local123 = aClass151Array1[anIntArray278[local15]];
 		@Pc(126) int local126 = local123.anInt5562;
 		@Pc(131) int local131 = local123.anIntArray490[local126];
-		@Pc(140) boolean local140 = !Static117.aClass67Array1[local131].method2272();
+		@Pc(140) boolean local140 = !aClass67Array1[local131].method2272();
 		for (@Pc(144) int local144 = 0; local144 < local123.anInt5563; local144++) {
-			@Pc(155) VorbisResidue local155 = Static117.aClass152Array1[local123.anIntArray491[local144]];
-			@Pc(157) float[] local157 = Static117.aFloatArray14;
+			@Pc(155) VorbisResidue local155 = aClass152Array1[local123.anIntArray491[local144]];
+			@Pc(157) float[] local157 = aFloatArray14;
 			local155.method4450(local157, local25 >> 1, local140);
 		}
 		@Pc(176) int local176;
 		if (!local140) {
 			local131 = local123.anInt5562;
 			local176 = local123.anIntArray490[local131];
-			Static117.aClass67Array1[local176].method2269(Static117.aFloatArray14, local25 >> 1);
+			aClass67Array1[local176].method2269(aFloatArray14, local25 >> 1);
 		}
 		@Pc(212) int local212;
 		if (local140) {
 			for (local131 = local25 >> 1; local131 < local25; local131++) {
-				Static117.aFloatArray14[local131] = 0.0F;
+				aFloatArray14[local131] = 0.0F;
 			}
 		} else {
 			local131 = local25 >> 1;
 			local176 = local25 >> 2;
 			local212 = local25 >> 3;
-			@Pc(214) float[] local214 = Static117.aFloatArray14;
+			@Pc(214) float[] local214 = aFloatArray14;
 			@Pc(216) int local216;
 			for (local216 = 0; local216 < local131; local216++) {
 				local214[local216] *= 0.5F;
@@ -191,10 +389,10 @@ public final class VorbisSound extends Node {
 			for (local216 = local131; local216 < local25; local216++) {
 				local214[local216] = -local214[local25 - local216 - 1];
 			}
-			@Pc(252) float[] local252 = local19 ? Static117.aFloatArray12 : Static117.aFloatArray13;
-			@Pc(258) float[] local258 = local19 ? Static117.aFloatArray9 : Static117.aFloatArray15;
-			@Pc(264) float[] local264 = local19 ? Static117.aFloatArray10 : Static117.aFloatArray16;
-			@Pc(270) int[] local270 = local19 ? Static117.anIntArray277 : Static117.anIntArray276;
+			@Pc(252) float[] local252 = local19 ? aFloatArray12 : aFloatArray13;
+			@Pc(258) float[] local258 = local19 ? aFloatArray9 : aFloatArray15;
+			@Pc(264) float[] local264 = local19 ? aFloatArray10 : aFloatArray16;
+			@Pc(270) int[] local270 = local19 ? anIntArray277 : anIntArray276;
 			@Pc(272) int local272;
 			@Pc(291) float local291;
 			@Pc(309) float local309;
@@ -308,11 +506,11 @@ public final class VorbisSound extends Node {
 			}
 			for (local488 = local59; local488 < local67; local488++) {
 				local309 = (float) Math.sin(((double) (local488 - local59) + 0.5D) / (double) local71 * 0.5D * 3.141592653589793D);
-				Static117.aFloatArray14[local488] *= (float) Math.sin((double) local309 * 1.5707963267948966D * (double) local309);
+				aFloatArray14[local488] *= (float) Math.sin((double) local309 * 1.5707963267948966D * (double) local309);
 			}
 			for (local488 = local94; local488 < local104; local488++) {
 				local309 = (float) Math.sin(((double) (local488 - local94) + 0.5D) / (double) local108 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
-				Static117.aFloatArray14[local488] *= (float) Math.sin((double) local309 * 1.5707963267948966D * (double) local309);
+				aFloatArray14[local488] *= (float) Math.sin((double) local309 * 1.5707963267948966D * (double) local309);
 			}
 		}
 		@Pc(1228) float[] local1228 = null;
@@ -329,13 +527,13 @@ public final class VorbisSound extends Node {
 			if (!local140) {
 				for (local212 = local59; local212 < local25 >> 1; local212++) {
 					local1257 = local1228.length + local212 - (local25 >> 1);
-					local1228[local1257] += Static117.aFloatArray14[local212];
+					local1228[local1257] += aFloatArray14[local212];
 				}
 			}
 		}
 		@Pc(1301) float[] local1301 = this.aFloatArray11;
-		this.aFloatArray11 = Static117.aFloatArray14;
-		Static117.aFloatArray14 = local1301;
+		this.aFloatArray11 = aFloatArray14;
+		aFloatArray14 = local1301;
 		this.anInt2973 = local25;
 		this.anInt2981 = local104 - (local25 >> 1);
 		this.aBoolean150 = local140;
diff --git a/client/src/main/java/rt4/WorldMap.java b/client/src/main/java/rt4/WorldMap.java
index 124a652..4e103a4 100644
--- a/client/src/main/java/rt4/WorldMap.java
+++ b/client/src/main/java/rt4/WorldMap.java
@@ -948,4 +948,54 @@ public class WorldMap {
 		}
 		anInt4901 = -1;
 	}
+
+    @OriginalMember(owner = "client!af", name = "b", descriptor = "(B)V")
+    public static void reset() {
+        clear(false);
+        System.gc();
+        client.setGameState(25);
+    }
+
+    @OriginalMember(owner = "client!bb", name = "a", descriptor = "(I)V")
+    public static void method447() {
+        if (zoom < targetZoom) {
+            zoom = (float) ((double) zoom + (double) zoom / 30.0D);
+            if (targetZoom < zoom) {
+                zoom = targetZoom;
+            }
+            method965();
+        } else if (targetZoom < zoom) {
+            zoom = (float) ((double) zoom - (double) zoom / 30.0D);
+            if (targetZoom > zoom) {
+                zoom = targetZoom;
+            }
+            method965();
+        }
+        if (anInt3482 == -1 || anInt4901 == -1) {
+            return;
+        }
+        @Pc(60) int local60 = anInt3482 - anInt435;
+        if (local60 < 2 || local60 > 2) {
+            local60 >>= 0x4;
+        }
+        @Pc(78) int local78 = anInt4901 - anInt919;
+        if (local78 < 2 || local78 > 2) {
+            local78 >>= 0x4;
+        }
+        anInt919 -= -local78;
+        anInt435 += local60;
+        if (local60 == 0 && local78 == 0) {
+            anInt3482 = -1;
+            anInt4901 = -1;
+        }
+        method965();
+    }
+
+    @OriginalMember(owner = "client!lb", name = "d", descriptor = "(B)V")
+    public static void method2720() {
+        if (aClass100_724 != null) {
+            method1853(aClass100_724);
+            aClass100_724 = null;
+        }
+    }
 }
diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java
index 4e7fd4a..ab12253 100644
--- a/client/src/main/java/rt4/client.java
+++ b/client/src/main/java/rt4/client.java
@@ -214,7 +214,7 @@ public final class client extends GameShell {
 			advertSuppressed = false;
 			try {
 				@Pc(63) byte[] local63 = arg0[2].getBytes("ISO-8859-1");
-				local15 = Static101.method2053(Static10.decodeString(local63, local63.length, 0));
+				local15 = Static101.method2053(JagString.decodeString(local63, local63.length, 0));
 			} catch (@Pc(74) Exception local74) {
 			}
 			if (local15 != -1) {
@@ -453,7 +453,7 @@ public final class client extends GameShell {
         Static107.anInt2875 = -1;
         method3768();
         Static255.cache.clear();
-        Static171.aClass139_1 = new Loc_Class139();
+        LocType.aClass139_1 = new Loc_Class139();
         ((Js5GlTextureProvider) Rasteriser.textureProvider).clear();
         LightingManager.lightCount = 0;
         LightingManager.lights = new Light[255];
@@ -513,26 +513,26 @@ public final class client extends GameShell {
         }
         MiniMenu.size = 0;
         Static60.aBoolean108 = false;
-        Static48.setIdleLoops(0);
+        Mouse.setIdleLoops(0);
         for (local3506 = 0; local3506 < 100; local3506++) {
             Chat.messages[local3506] = null;
         }
-        Static260.anInt5014 = 0;
+        MiniMenu.anInt5014 = 0;
         Static132.anInt3291 = (int) (Math.random() * 100.0D) - 50;
         Static84.anInt2255 = 0;
         Camera.yawTarget = (int) (Math.random() * 20.0D) - 10 & 0x7FF;
         Static107.anInt2875 = -1;
         PlayerList.size = 0;
-        Static270.minimapState = 0;
+        MiniMap.state = 0;
         Static206.anInt4774 = (int) (Math.random() * 110.0D) - 55;
         Static241.aBoolean302 = false;
-        Static273.anInt4130 = (int) (Math.random() * 30.0D) - 20;
+        MiniMap.anInt4130 = (int) (Math.random() * 30.0D) - 20;
         SoundPlayer.anInt4451 = 0;
         Static115.mapFlagX = 0;
         Static59.anInt1814 = (int) (Math.random() * 120.0D) - 60;
         Chat.size = 0;
         Static230.anInt5161 = (int) (Math.random() * 80.0D) - 40;
-        Static272.anInt5214 = 0;
+        NpcList.size = 0;
         for (local3506 = 0; local3506 < 2048; local3506++) {
             PlayerList.players[local3506] = null;
             PlayerList.appearanceCache[local3506] = null;
@@ -543,11 +543,11 @@ public final class client extends GameShell {
         PlayerList.self = PlayerList.players[2047] = new Player();
         Static217.aClass69_116.clear();
         Static99.aClass69_64.clear();
-        if (Static159.aClass69ArrayArrayArray1 != null) {
+        if (Static159.objStacks != null) {
             for (local3506 = 0; local3506 < 4; local3506++) {
                 for (@Pc(3663) int local3663 = 0; local3663 < 104; local3663++) {
                     for (@Pc(3670) int local3670 = 0; local3670 < 104; local3670++) {
-                        Static159.aClass69ArrayArrayArray1[local3506][local3663][local3670] = null;
+                        Static159.objStacks[local3506][local3663][local3670] = null;
                     }
                 }
             }
@@ -555,7 +555,7 @@ public final class client extends GameShell {
         Static26.sceneryList = new LinkedList();
         FriendsList.state = 0;
         FriendsList.size = 0;
-        Static8.resetTransientVars();
+        VarpDomain.reset();
         DelayedStateChange.clear();
         Static133.anInt5230 = 0;
         Static233.anInt5217 = 0;
@@ -563,7 +563,7 @@ public final class client extends GameShell {
         Static231.anInt5203 = 0;
         Static248.anInt4232 = 0;
         Static245.anInt5375 = 0;
-        Static57.anInt1744 = 0;
+        Static260.anInt1744 = 0;
         Static251.anInt5449 = 0;
         Static113.anInt4612 = 0;
         Static233.anInt5225 = 0;
@@ -681,13 +681,13 @@ public final class client extends GameShell {
 					Static230.anInt5150 = Static175.mapFilesMissingCount;
 				}
 				local80 = (Static230.anInt5150 - Static175.mapFilesMissingCount) * 50 / Static230.anInt5150;
-				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 }));
+				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
 			} else if (Static233.loadingScreenState == 2) {
 				if (Static38.anInt1196 < Static271.anInt5804) {
 					Static38.anInt1196 = Static271.anInt5804;
 				}
 				local80 = (Static38.anInt1196 - Static271.anInt5804) * 50 / Static38.anInt1196 + 50;
-				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, Static123.parseInt(local80), Static14.aClass100_80 }));
+				Static114.drawTextOnScreen(false, JagString.concatenate(new JagString[] { LocalizedText.LOADING, Static229.aClass100_974, JagString.parseInt(local80), Static14.aClass100_80 }));
 			} else {
 				Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 			}
@@ -1209,7 +1209,7 @@ public final class client extends GameShell {
 		}
 		@Pc(98) int percentage;
 		if (mainLoadState == 10) {
-			Static120.method2392();
+			LightingManager.method2392();
 			for (percentage = 0; percentage < 4; percentage++) {
 				PathFinder.collisionMaps[percentage] = new CollisionMap(104, 104);
 			}
@@ -1270,7 +1270,7 @@ public final class client extends GameShell {
 				mainLoadState = 45;
 			} else {
 				if (percentage != 0) {
-					mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, Static123.parseInt(percentage), Static49.PERCENT_SIGN});
+					mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.CHECKING_FOR_UPDATES, JagString.parseInt(percentage), Static49.PERCENT_SIGN});
 				}
 				mainLoadPercentage = 20;
 			}
@@ -1297,7 +1297,7 @@ public final class client extends GameShell {
 				mainLoadPercentage = 35;
 				mainLoadState = 60;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD50, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 35;
 			}
 		} else if (mainLoadState == 60) {
@@ -1308,7 +1308,7 @@ public final class client extends GameShell {
 				mainLoadState = 65;
 				mainLoadPercentage = 40;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD60, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 40;
 			}
 		} else if (mainLoadState == 65) {
@@ -1367,14 +1367,14 @@ public final class client extends GameShell {
 				Equipment.init();
 				mainLoadState = 80;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, Static123.parseInt(percentage / 11), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD70, JagString.parseInt(percentage / 11), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 50;
 			}
 		} else if (mainLoadState == 80) {
 			percentage = Sprites.getReady(js5Archive8);
 			i = Sprites.total();
 			if (i > percentage) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, Static123.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD80, JagString.parseInt(percentage * 100 / i), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 60;
 			} else {
 				Sprites.load(js5Archive8);
@@ -1402,7 +1402,7 @@ public final class client extends GameShell {
 				mainLoadState = 100;
 				mainLoadPercentage = 70;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, Static123.parseInt(js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD90, JagString.parseInt(js5Archive26.getPercentageComplete()), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 70;
 			}
 		} else if (mainLoadState == 100) {
@@ -1428,13 +1428,13 @@ public final class client extends GameShell {
 			}
 		} else if (mainLoadState == 130) {
 			if (!js5Archive3.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive3.getPercentageComplete() * 3 / 4), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (!js5Archive12.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive12.getPercentageComplete() / 10 + 75), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (!js5Archive13.fetchAll()) {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive13.getPercentageComplete() / 20 + 85), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			} else if (js5Archive23.allFilesComplete(Static165.DETAILS)) {
 				MapList.init(Sprites.mapfunctions, js5Archive23);
@@ -1442,7 +1442,7 @@ public final class client extends GameShell {
 				mainLoadSecondaryText = LocalizedText.MAINLOAD130B;
 				mainLoadState = 135;
 			} else {
-				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, Static123.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN});
+				mainLoadSecondaryText = JagString.concatenate(new JagString[] { LocalizedText.MAINLOAD130, JagString.parseInt(js5Archive23.getPercentageComplete(Static165.DETAILS) / 10 + 90), Static49.PERCENT_SIGN});
 				mainLoadPercentage = 85;
 			}
 		} else if (mainLoadState == 135) {