diff --git a/client/src/main/java/AbstractWorld.java b/client/src/main/java/AbstractWorld.java
index f439150..dfbc2c4 100644
--- a/client/src/main/java/AbstractWorld.java
+++ b/client/src/main/java/AbstractWorld.java
@@ -5,31 +5,31 @@ import org.openrs2.deob.annotation.OriginalMember;
 public abstract class AbstractWorld {
 
 	@OriginalMember(owner = "client!gj", name = "j", descriptor = "I")
-	public int anInt377;
+	public int country;
 
 	@OriginalMember(owner = "client!gj", name = "l", descriptor = "I")
-	public int anInt379;
+	public int players;
 
 	@OriginalMember(owner = "client!gj", name = "o", descriptor = "I")
-	public int anInt381;
+	public int flags;
 
 	@OriginalMember(owner = "client!gj", name = "a", descriptor = "(I)Z")
-	public final boolean method437() {
-		return (this.anInt381 & 0x1) != 0;
+	public final boolean isMembers() {
+		return (this.flags & 0x1) != 0;
 	}
 
 	@OriginalMember(owner = "client!gj", name = "a", descriptor = "(Z)Z")
-	public final boolean method439() {
-		return (this.anInt381 & 0x4) != 0;
+	public final boolean isPvp() {
+		return (this.flags & 0x4) != 0;
 	}
 
 	@OriginalMember(owner = "client!gj", name = "c", descriptor = "(I)Z")
-	public final boolean method441() {
-		return (this.anInt381 & 0x8) != 0;
+	public final boolean isLootShare() {
+		return (this.flags & 0x8) != 0;
 	}
 
 	@OriginalMember(owner = "client!gj", name = "d", descriptor = "(I)Z")
-	public final boolean method442() {
-		return (this.anInt381 & 0x2) != 0;
+	public final boolean isQuickChat() {
+		return (this.flags & 0x2) != 0;
 	}
 }
diff --git a/client/src/main/java/AnimBase.java b/client/src/main/java/AnimBase.java
index bf7280c..a2cec0b 100644
--- a/client/src/main/java/AnimBase.java
+++ b/client/src/main/java/AnimBase.java
@@ -7,48 +7,48 @@ import org.openrs2.deob.annotation.Pc;
 public final class AnimBase extends Node {
 
 	@OriginalMember(owner = "client!jm", name = "p", descriptor = "I")
-	public final int anInt3113;
+	public final int id;
 
 	@OriginalMember(owner = "client!jm", name = "x", descriptor = "I")
-	public final int anInt3116;
+	public final int transforms;
 
 	@OriginalMember(owner = "client!jm", name = "v", descriptor = "[[I")
-	public final int[][] anIntArrayArray23;
+	public final int[][] bones;
 
 	@OriginalMember(owner = "client!jm", name = "B", descriptor = "[I")
-	public final int[] anIntArray291;
+	public final int[] types;
 
 	@OriginalMember(owner = "client!jm", name = "y", descriptor = "[Z")
-	public final boolean[] aBooleanArray70;
+	public final boolean[] shadow;
 
 	@OriginalMember(owner = "client!jm", name = "q", descriptor = "[I")
-	public final int[] anIntArray290;
+	public final int[] parts;
 
 	@OriginalMember(owner = "client!jm", name = "<init>", descriptor = "(I[B)V")
 	public AnimBase(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) {
-		this.anInt3113 = arg0;
-		@Pc(9) Buffer local9 = new Buffer(arg1);
-		this.anInt3116 = local9.g1();
-		this.anIntArrayArray23 = new int[this.anInt3116][];
-		this.anIntArray291 = new int[this.anInt3116];
-		this.aBooleanArray70 = new boolean[this.anInt3116];
-		this.anIntArray290 = new int[this.anInt3116];
+		this.id = arg0;
+		@Pc(9) Buffer buffer = new Buffer(arg1);
+		this.transforms = buffer.g1();
+		this.bones = new int[this.transforms][];
+		this.types = new int[this.transforms];
+		this.shadow = new boolean[this.transforms];
+		this.parts = new int[this.transforms];
 		@Pc(36) int local36;
-		for (local36 = 0; local36 < this.anInt3116; local36++) {
-			this.anIntArray291[local36] = local9.g1();
+		for (local36 = 0; local36 < this.transforms; local36++) {
+			this.types[local36] = buffer.g1();
 		}
-		for (local36 = 0; local36 < this.anInt3116; local36++) {
-			this.aBooleanArray70[local36] = local9.g1() == 1;
+		for (local36 = 0; local36 < this.transforms; local36++) {
+			this.shadow[local36] = buffer.g1() == 1;
 		}
-		for (local36 = 0; local36 < this.anInt3116; local36++) {
-			this.anIntArray290[local36] = local9.g2();
+		for (local36 = 0; local36 < this.transforms; local36++) {
+			this.parts[local36] = buffer.g2();
 		}
-		for (local36 = 0; local36 < this.anInt3116; local36++) {
-			this.anIntArrayArray23[local36] = new int[local9.g1()];
+		for (local36 = 0; local36 < this.transforms; local36++) {
+			this.bones[local36] = new int[buffer.g1()];
 		}
-		for (local36 = 0; local36 < this.anInt3116; local36++) {
-			for (@Pc(118) int local118 = 0; local118 < this.anIntArrayArray23[local36].length; local118++) {
-				this.anIntArrayArray23[local36][local118] = local9.g1();
+		for (local36 = 0; local36 < this.transforms; local36++) {
+			for (@Pc(118) int local118 = 0; local118 < this.bones[local36].length; local118++) {
+				this.bones[local36][local118] = buffer.g1();
 			}
 		}
 	}
diff --git a/client/src/main/java/AnimFrame.java b/client/src/main/java/AnimFrame.java
index 185eb8d..75f19fc 100644
--- a/client/src/main/java/AnimFrame.java
+++ b/client/src/main/java/AnimFrame.java
@@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.Pc;
 public final class AnimFrame {
 
 	@OriginalMember(owner = "client!ne", name = "c", descriptor = "Lclient!jm;")
-	public AnimBase aClass3_Sub20_1 = null;
+	public AnimBase base = null;
 
 	@OriginalMember(owner = "client!ne", name = "b", descriptor = "I")
-	public int anInt4070 = -1;
+	public int length = -1;
 
 	@OriginalMember(owner = "client!ne", name = "e", descriptor = "Z")
-	public boolean aBoolean197 = false;
+	public boolean transformsAlpha = false;
 
 	@OriginalMember(owner = "client!ne", name = "a", descriptor = "Z")
-	public boolean aBoolean196 = false;
+	public boolean transformsColor = false;
 
 	@OriginalMember(owner = "client!ne", name = "d", descriptor = "[S")
-	public final short[] aShortArray42;
+	public final short[] indices;
 
 	@OriginalMember(owner = "client!ne", name = "g", descriptor = "[S")
 	public final short[] aShortArray44;
@@ -31,25 +31,25 @@ public final class AnimFrame {
 	public final short[] aShortArray49;
 
 	@OriginalMember(owner = "client!ne", name = "f", descriptor = "[S")
-	public final short[] aShortArray43;
+	public final short[] prevOriginIndices;
 
 	@OriginalMember(owner = "client!ne", name = "l", descriptor = "[B")
-	public final byte[] aByteArray55;
+	public final byte[] flags;
 
 	@OriginalMember(owner = "client!ne", name = "<init>", descriptor = "([BLclient!jm;)V")
 	public AnimFrame(@OriginalArg(0) byte[] arg0, @OriginalArg(1) AnimBase arg1) {
-		this.aClass3_Sub20_1 = arg1;
+		this.base = arg1;
 		@Pc(21) Buffer local21 = new Buffer(arg0);
 		@Pc(26) Buffer local26 = new Buffer(arg0);
 		local21.offset = 2;
 		@Pc(33) int local33 = local21.g1();
-		@Pc(35) int local35 = 0;
+		@Pc(35) int len = 0;
 		@Pc(37) int local37 = -1;
 		@Pc(39) int local39 = -1;
 		local26.offset = local21.offset + local33;
 		@Pc(47) int local47;
 		for (local47 = 0; local47 < local33; local47++) {
-			@Pc(56) int local56 = this.aClass3_Sub20_1.anIntArray291[local47];
+			@Pc(56) int local56 = this.base.types[local47];
 			if (local56 == 0) {
 				local37 = local47;
 			}
@@ -58,63 +58,63 @@ public final class AnimFrame {
 				if (local56 == 0) {
 					local39 = local47;
 				}
-				Static168.aShortArray51[local35] = (short) local47;
+				Static168.tempIndices[len] = (short) local47;
 				@Pc(77) short local77 = 0;
 				if (local56 == 3) {
 					local77 = 128;
 				}
 				if ((local64 & 0x1) == 0) {
-					Static168.aShortArray48[local35] = local77;
+					Static168.tempX[len] = local77;
 				} else {
-					Static168.aShortArray48[local35] = (short) local26.gSmart1or2s();
+					Static168.tempX[len] = (short) local26.gSmart1or2s();
 				}
 				if ((local64 & 0x2) == 0) {
-					Static168.aShortArray46[local35] = local77;
+					Static168.tempY[len] = local77;
 				} else {
-					Static168.aShortArray46[local35] = (short) local26.gSmart1or2s();
+					Static168.tempY[len] = (short) local26.gSmart1or2s();
 				}
 				if ((local64 & 0x4) == 0) {
-					Static168.aShortArray45[local35] = local77;
+					Static168.tempZ[len] = local77;
 				} else {
-					Static168.aShortArray45[local35] = (short) local26.gSmart1or2s();
+					Static168.tempZ[len] = (short) local26.gSmart1or2s();
 				}
-				Static168.aByteArray54[local35] = (byte) (local64 >>> 3 & 0x3);
+				Static168.tempFlags[len] = (byte) (local64 >>> 3 & 0x3);
 				if (local56 == 2) {
-					Static168.aShortArray48[local35] = (short) (((Static168.aShortArray48[local35] & 0xFF) << 3) + (Static168.aShortArray48[local35] >> 8 & 0x7));
-					Static168.aShortArray46[local35] = (short) (((Static168.aShortArray46[local35] & 0xFF) << 3) + (Static168.aShortArray46[local35] >> 8 & 0x7));
-					Static168.aShortArray45[local35] = (short) (((Static168.aShortArray45[local35] & 0xFF) << 3) + (Static168.aShortArray45[local35] >> 8 & 0x7));
+					Static168.tempX[len] = (short) (((Static168.tempX[len] & 0xFF) << 3) + (Static168.tempX[len] >> 8 & 0x7));
+					Static168.tempY[len] = (short) (((Static168.tempY[len] & 0xFF) << 3) + (Static168.tempY[len] >> 8 & 0x7));
+					Static168.tempZ[len] = (short) (((Static168.tempZ[len] & 0xFF) << 3) + (Static168.tempZ[len] >> 8 & 0x7));
 				}
-				Static168.aShortArray47[local35] = -1;
+				Static168.tempPrevOriginIndices[len] = -1;
 				if (local56 == 1 || local56 == 2 || local56 == 3) {
 					if (local37 > local39) {
-						Static168.aShortArray47[local35] = (short) local37;
+						Static168.tempPrevOriginIndices[len] = (short) local37;
 						local39 = local37;
 					}
 				} else if (local56 == 5) {
-					this.aBoolean197 = true;
+					this.transformsAlpha = true;
 				} else if (local56 == 7) {
-					this.aBoolean196 = true;
+					this.transformsColor = true;
 				}
-				local35++;
+				len++;
 			}
 		}
 		if (local26.offset != arg0.length) {
 			throw new RuntimeException();
 		}
-		this.anInt4070 = local35;
-		this.aShortArray42 = new short[local35];
-		this.aShortArray44 = new short[local35];
-		this.aShortArray50 = new short[local35];
-		this.aShortArray49 = new short[local35];
-		this.aShortArray43 = new short[local35];
-		this.aByteArray55 = new byte[local35];
-		for (local47 = 0; local47 < local35; local47++) {
-			this.aShortArray42[local47] = Static168.aShortArray51[local47];
-			this.aShortArray44[local47] = Static168.aShortArray48[local47];
-			this.aShortArray50[local47] = Static168.aShortArray46[local47];
-			this.aShortArray49[local47] = Static168.aShortArray45[local47];
-			this.aShortArray43[local47] = Static168.aShortArray47[local47];
-			this.aByteArray55[local47] = Static168.aByteArray54[local47];
+		this.length = len;
+		this.indices = new short[len];
+		this.aShortArray44 = new short[len];
+		this.aShortArray50 = new short[len];
+		this.aShortArray49 = new short[len];
+		this.prevOriginIndices = new short[len];
+		this.flags = new byte[len];
+		for (local47 = 0; local47 < len; local47++) {
+			this.indices[local47] = Static168.tempIndices[local47];
+			this.aShortArray44[local47] = Static168.tempX[local47];
+			this.aShortArray50[local47] = Static168.tempY[local47];
+			this.aShortArray49[local47] = Static168.tempZ[local47];
+			this.prevOriginIndices[local47] = Static168.tempPrevOriginIndices[local47];
+			this.flags[local47] = Static168.tempFlags[local47];
 		}
 	}
 }
diff --git a/client/src/main/java/AnimFrameset.java b/client/src/main/java/AnimFrameset.java
index 32e82e9..a391a18 100644
--- a/client/src/main/java/AnimFrameset.java
+++ b/client/src/main/java/AnimFrameset.java
@@ -7,13 +7,13 @@ import org.openrs2.deob.annotation.Pc;
 public final class AnimFrameset extends SecondaryNode {
 
 	@OriginalMember(owner = "client!cl", name = "W", descriptor = "[Lclient!ne;")
-	public final AnimFrame[] aClass104Array1;
+	public final AnimFrame[] frames;
 
 	@OriginalMember(owner = "client!cl", name = "<init>", descriptor = "(Lclient!ve;Lclient!ve;IZ)V")
 	public AnimFrameset(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3) {
 		@Pc(5) LinkedList local5 = new LinkedList();
 		@Pc(10) int local10 = arg0.method4504(arg2);
-		this.aClass104Array1 = new AnimFrame[local10];
+		this.frames = new AnimFrame[local10];
 		@Pc(19) int[] local19 = arg0.method4503(arg2);
 		for (@Pc(21) int local21 = 0; local21 < local19.length; local21++) {
 			@Pc(37) byte[] local37 = arg0.getFile(arg2, local19[local21]);
@@ -21,7 +21,7 @@ public final class AnimFrameset extends SecondaryNode {
 			@Pc(56) AnimBase local56 = (AnimBase) local5.method2289();
 			@Pc(58) AnimBase local58 = null;
 			while (local56 != null) {
-				if (local56.anInt3113 == local51) {
+				if (local56.id == local51) {
 					local58 = local56;
 					break;
 				}
@@ -32,17 +32,17 @@ public final class AnimFrameset extends SecondaryNode {
 				local58 = new AnimBase(local51, local85);
 				local5.method2282(local58);
 			}
-			this.aClass104Array1[local19[local21]] = new AnimFrame(local37, local58);
+			this.frames[local19[local21]] = new AnimFrame(local37, local58);
 		}
 	}
 
 	@OriginalMember(owner = "client!cl", name = "c", descriptor = "(II)Z")
-	public final boolean method901(@OriginalArg(1) int arg0) {
-		return this.aClass104Array1[arg0].aBoolean197;
+	public final boolean isAlphaTransformed(@OriginalArg(1) int arg0) {
+		return this.frames[arg0].transformsAlpha;
 	}
 
 	@OriginalMember(owner = "client!cl", name = "a", descriptor = "(IB)Z")
-	public final boolean method903(@OriginalArg(0) int arg0) {
-		return this.aClass104Array1[arg0].aBoolean196;
+	public final boolean isColorTransformed(@OriginalArg(0) int arg0) {
+		return this.frames[arg0].transformsColor;
 	}
 }
diff --git a/client/src/main/java/AreaSound.java b/client/src/main/java/AreaSound.java
index 7cdc7a3..c1e284c 100644
--- a/client/src/main/java/AreaSound.java
+++ b/client/src/main/java/AreaSound.java
@@ -15,25 +15,25 @@ public final class AreaSound extends Node {
 	public int anInt2032;
 
 	@OriginalMember(owner = "client!fl", name = "v", descriptor = "Lclient!b;")
-	public SoundPcmStream aClass3_Sub3_Sub1_1;
+	public SoundPcmStream primaryStream;
 
 	@OriginalMember(owner = "client!fl", name = "x", descriptor = "I")
 	public int anInt2033;
 
 	@OriginalMember(owner = "client!fl", name = "y", descriptor = "Lclient!b;")
-	public SoundPcmStream aClass3_Sub3_Sub1_2;
+	public SoundPcmStream secondaryStream;
 
 	@OriginalMember(owner = "client!fl", name = "z", descriptor = "I")
 	public int anInt2034;
 
 	@OriginalMember(owner = "client!fl", name = "E", descriptor = "Lclient!pb;")
-	public LocType aClass118_1;
+	public LocType locType;
 
 	@OriginalMember(owner = "client!fl", name = "F", descriptor = "I")
 	public int anInt2037;
 
 	@OriginalMember(owner = "client!fl", name = "I", descriptor = "Lclient!km;")
-	public Npc aClass8_Sub4_Sub2_1;
+	public Npc npc;
 
 	@OriginalMember(owner = "client!fl", name = "K", descriptor = "I")
 	public int anInt2040;
@@ -42,62 +42,62 @@ public final class AreaSound extends Node {
 	public int anInt2041;
 
 	@OriginalMember(owner = "client!fl", name = "M", descriptor = "Lclient!e;")
-	public Player aClass8_Sub4_Sub1_1;
+	public Player player;
 
 	@OriginalMember(owner = "client!fl", name = "N", descriptor = "I")
-	public int anInt2042;
+	public int radius;
 
 	@OriginalMember(owner = "client!fl", name = "O", descriptor = "Z")
-	public boolean aBoolean117;
+	public boolean multiLocOrNpc;
 
 	@OriginalMember(owner = "client!fl", name = "R", descriptor = "I")
-	public int anInt2044;
+	public int sound;
 
 	@OriginalMember(owner = "client!fl", name = "T", descriptor = "[I")
-	public int[] anIntArray181;
+	public int[] sounds;
 
 	@OriginalMember(owner = "client!fl", name = "G", descriptor = "I")
 	public int anInt2038 = 0;
 
 	@OriginalMember(owner = "client!fl", name = "c", descriptor = "(I)V")
-	public final void method1567() {
-		@Pc(8) int local8 = this.anInt2044;
-		if (this.aClass118_1 != null) {
-			@Pc(17) LocType local17 = this.aClass118_1.method3417();
+	public final void update() {
+		@Pc(8) int local8 = this.sound;
+		if (this.locType != null) {
+			@Pc(17) LocType local17 = this.locType.getMultiLoc();
 			if (local17 == null) {
-				this.anInt2044 = -1;
-				this.anIntArray181 = null;
+				this.sound = -1;
+				this.sounds = null;
 				this.anInt2040 = 0;
-				this.anInt2042 = 0;
+				this.radius = 0;
 				this.anInt2032 = 0;
 			} else {
 				this.anInt2040 = local17.anInt4414;
-				this.anInt2044 = local17.anInt4412;
+				this.sound = local17.sound;
 				this.anInt2032 = local17.anInt4419;
-				this.anInt2042 = local17.anInt4402 * 128;
-				this.anIntArray181 = local17.anIntArray381;
+				this.radius = local17.soundRadius * 128;
+				this.sounds = local17.anIntArray381;
 			}
-		} else if (this.aClass8_Sub4_Sub2_1 != null) {
-			@Pc(92) int local92 = Static112.method2299(this.aClass8_Sub4_Sub2_1);
+		} else if (this.npc != null) {
+			@Pc(92) int local92 = Static112.getSound(this.npc);
 			if (local8 != local92) {
-				@Pc(100) NpcType local100 = this.aClass8_Sub4_Sub2_1.aClass96_1;
-				this.anInt2044 = local92;
+				@Pc(100) NpcType local100 = this.npc.type;
+				this.sound = local92;
 				if (local100.anIntArray357 != null) {
-					local100 = local100.method2932();
+					local100 = local100.getMultiNpc();
 				}
 				if (local100 == null) {
-					this.anInt2042 = 0;
+					this.radius = 0;
 				} else {
-					this.anInt2042 = local100.anInt3746 * 128;
+					this.radius = local100.soundRadius * 128;
 				}
 			}
-		} else if (this.aClass8_Sub4_Sub1_1 != null) {
-			this.anInt2044 = Static140.method2706(this.aClass8_Sub4_Sub1_1);
-			this.anInt2042 = this.aClass8_Sub4_Sub1_1.anInt1664 * 128;
+		} else if (this.player != null) {
+			this.sound = Static140.getSound(this.player);
+			this.radius = this.player.soundRadius * 128;
 		}
-		if (this.anInt2044 != local8 && this.aClass3_Sub3_Sub1_1 != null) {
-			Static204.soundStream.method1347(this.aClass3_Sub3_Sub1_1);
-			this.aClass3_Sub3_Sub1_1 = null;
+		if (this.sound != local8 && this.primaryStream != null) {
+			Static204.soundStream.removeSubStream(this.primaryStream);
+			this.primaryStream = null;
 		}
 	}
 }
diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java
index c766960..792c2df 100644
--- a/client/src/main/java/AudioChannel.java
+++ b/client/src/main/java/AudioChannel.java
@@ -11,56 +11,56 @@ public class AudioChannel {
     public static boolean stereo;
 
     @OriginalMember(owner = "client!vh", name = "h", descriptor = "Lclient!qb;")
-	private PcmStream aClass3_Sub3_6;
+	private PcmStream stream;
 
 	@OriginalMember(owner = "client!vh", name = "n", descriptor = "[I")
-	public int[] anIntArray411;
+	public int[] samples;
 
 	@OriginalMember(owner = "client!vh", name = "D", descriptor = "I")
 	private int anInt4637;
 
 	@OriginalMember(owner = "client!vh", name = "H", descriptor = "I")
-	public int anInt4641;
+	public int sampleRate;
 
 	@OriginalMember(owner = "client!vh", name = "K", descriptor = "I")
-	public int anInt4644;
+	public int bufferCapacity;
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "I")
 	private final int anInt4621 = 32;
 
 	@OriginalMember(owner = "client!vh", name = "f", descriptor = "J")
-	private long aLong151 = MonotonicClock.currentTimeMillis();
+	private long time = MonotonicClock.currentTimeMillis();
 
 	@OriginalMember(owner = "client!vh", name = "w", descriptor = "[Lclient!qb;")
 	private final PcmStream[] aClass3_Sub3Array5 = new PcmStream[8];
 
 	@OriginalMember(owner = "client!vh", name = "x", descriptor = "I")
-	private int anInt4634 = 0;
+	private int consumedSamples = 0;
 
 	@OriginalMember(owner = "client!vh", name = "v", descriptor = "J")
-	private long aLong152 = 0L;
+	private long calculateConsumptionAt = 0L;
 
 	@OriginalMember(owner = "client!vh", name = "E", descriptor = "I")
 	private int anInt4638 = 0;
 
 	@OriginalMember(owner = "client!vh", name = "A", descriptor = "Z")
-	private boolean aBoolean229 = true;
+	private boolean skipConsumptionCheck = true;
 
 	@OriginalMember(owner = "client!vh", name = "z", descriptor = "[Lclient!qb;")
 	private final PcmStream[] aClass3_Sub3Array6 = new PcmStream[8];
 
 	@OriginalMember(owner = "client!vh", name = "y", descriptor = "J")
-	private long aLong153 = 0L;
+	private long closeUntil = 0L;
 
 	@OriginalMember(owner = "client!vh", name = "G", descriptor = "I")
-	private int anInt4640 = 0;
+	private int prevConsumedSamples = 0;
 
 	@OriginalMember(owner = "client!vh", name = "C", descriptor = "I")
-	private int anInt4636 = 0;
+	private int prevBufferSize = 0;
 
     @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIZ)V")
     public static void init(@OriginalArg(3) boolean arg0) {
-        Static258.anInt5637 = 2;
+        Static258.threadPriority = 2;
         stereo = arg0;
         Static44.sampleRate = 22050;
     }
@@ -72,44 +72,44 @@ public class AudioChannel {
 		}
 		try {
 			@Pc(33) AudioChannel local33 = (AudioChannel) Class.forName("JavaAudioChannel").getDeclaredConstructor().newInstance();
-			local33.anInt4641 = arg0;
-			local33.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
+			local33.sampleRate = arg0;
+			local33.samples = new int[(stereo ? 2 : 1) * 256];
 			local33.init(arg2);
-			local33.anInt4644 = (arg0 & -1024) + 1024;
-			if (local33.anInt4644 > 16384) {
-				local33.anInt4644 = 16384;
+			local33.bufferCapacity = (arg0 & -1024) + 1024;
+			if (local33.bufferCapacity > 16384) {
+				local33.bufferCapacity = 16384;
 			}
-			local33.open(local33.anInt4644);
-			if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
-				Static60.aClass19_1 = new AudioThread();
-				Static60.aClass19_1.signLink = arg1;
-				arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
+			local33.open(local33.bufferCapacity);
+			if (Static258.threadPriority > 0 && Static60.thread == null) {
+				Static60.thread = new AudioThread();
+				Static60.thread.signLink = arg1;
+				arg1.startThread(Static258.threadPriority, Static60.thread);
 			}
-			if (Static60.aClass19_1 != null) {
-				if (Static60.aClass19_1.channels[arg3] != null) {
+			if (Static60.thread != null) {
+				if (Static60.thread.channels[arg3] != null) {
 					throw new IllegalArgumentException();
 				}
-				Static60.aClass19_1.channels[arg3] = local33;
+				Static60.thread.channels[arg3] = local33;
 			}
 			return local33;
 		} catch (@Pc(109) Throwable local109) {
 			try {
 				@Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3);
-				local120.anIntArray411 = new int[(stereo ? 2 : 1) * 256];
-				local120.anInt4641 = arg0;
+				local120.samples = new int[(stereo ? 2 : 1) * 256];
+				local120.sampleRate = arg0;
 				local120.init(arg2);
-				local120.anInt4644 = 16384;
-				local120.open(local120.anInt4644);
-				if (Static258.anInt5637 > 0 && Static60.aClass19_1 == null) {
-					Static60.aClass19_1 = new AudioThread();
-					Static60.aClass19_1.signLink = arg1;
-					arg1.startThread(Static258.anInt5637, Static60.aClass19_1);
+				local120.bufferCapacity = 16384;
+				local120.open(local120.bufferCapacity);
+				if (Static258.threadPriority > 0 && Static60.thread == null) {
+					Static60.thread = new AudioThread();
+					Static60.thread.signLink = arg1;
+					arg1.startThread(Static258.threadPriority, Static60.thread);
 				}
-				if (Static60.aClass19_1 != null) {
-					if (Static60.aClass19_1.channels[arg3] != null) {
+				if (Static60.thread != null) {
+					if (Static60.thread.channels[arg3] != null) {
 						throw new IllegalArgumentException();
 					}
-					Static60.aClass19_1.channels[arg3] = local120;
+					Static60.thread.channels[arg3] = local120;
 				}
 				return local120;
 			} catch (@Pc(186) Throwable local186) {
@@ -131,17 +131,17 @@ public class AudioChannel {
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "([II)V")
-	private void method3564(@OriginalArg(0) int[] arg0) {
+	private void read(@OriginalArg(0) int[] arg0) {
 		@Pc(1) short local1 = 256;
 		if (stereo) {
 			local1 = 512;
 		}
-		Static289.method2618(arg0, 0, local1);
+		Static289.clear(arg0, 0, local1);
 		this.anInt4638 -= 256;
-		if (this.aClass3_Sub3_6 != null && this.anInt4638 <= 0) {
+		if (this.stream != null && this.anInt4638 <= 0) {
 			this.anInt4638 += Static44.sampleRate >> 4;
-			Static167.method3170(this.aClass3_Sub3_6);
-			this.method3567(this.aClass3_Sub3_6, this.aClass3_Sub3_6.method4407());
+			Static167.setInactive(this.stream);
+			this.method3567(this.stream, this.stream.method4407());
 			@Pc(45) int local45 = 0;
 			@Pc(47) int local47 = 255;
 			@Pc(49) int local49 = 7;
@@ -221,89 +221,89 @@ public class AudioChannel {
 		if (this.anInt4638 < 0) {
 			this.anInt4638 = 0;
 		}
-		if (this.aClass3_Sub3_6 != null) {
-			this.aClass3_Sub3_6.method4408(arg0, 0, 256);
+		if (this.stream != null) {
+			this.stream.read(arg0, 0, 256);
 		}
-		this.aLong151 = MonotonicClock.currentTimeMillis();
+		this.time = MonotonicClock.currentTimeMillis();
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(B)V")
 	public final synchronized void loop() {
-		if (this.anIntArray411 == null) {
+		if (this.samples == null) {
 			return;
 		}
-		@Pc(14) long local14 = MonotonicClock.currentTimeMillis();
+		@Pc(14) long now = MonotonicClock.currentTimeMillis();
 		try {
-			if (this.aLong153 != 0L) {
-				if (local14 < this.aLong153) {
+			if (this.closeUntil != 0L) {
+				if (now < this.closeUntil) {
 					return;
 				}
-				this.open(this.anInt4644);
-				this.aBoolean229 = true;
-				this.aLong153 = 0L;
+				this.open(this.bufferCapacity);
+				this.skipConsumptionCheck = true;
+				this.closeUntil = 0L;
 			}
 			@Pc(38) int local38 = this.getBufferSize();
-			if (this.anInt4634 < this.anInt4636 - local38) {
-				this.anInt4634 = this.anInt4636 - local38;
+			if (this.consumedSamples < this.prevBufferSize - local38) {
+				this.consumedSamples = this.prevBufferSize - local38;
 			}
-			@Pc(65) int local65 = this.anInt4641 + this.anInt4637;
+			@Pc(65) int local65 = this.sampleRate + this.anInt4637;
 			if (local65 + 256 > 16384) {
 				local65 = 16128;
 			}
-			if (this.anInt4644 < local65 + 256) {
-				this.anInt4644 += 1024;
-				if (this.anInt4644 > 16384) {
-					this.anInt4644 = 16384;
+			if (this.bufferCapacity < local65 + 256) {
+				this.bufferCapacity += 1024;
+				if (this.bufferCapacity > 16384) {
+					this.bufferCapacity = 16384;
 				}
 				this.flush();
 				local38 = 0;
-				this.open(this.anInt4644);
-				if (this.anInt4644 < local65 + 256) {
-					local65 = this.anInt4644 - 256;
-					this.anInt4637 = local65 - this.anInt4641;
+				this.open(this.bufferCapacity);
+				if (this.bufferCapacity < local65 + 256) {
+					local65 = this.bufferCapacity - 256;
+					this.anInt4637 = local65 - this.sampleRate;
 				}
-				this.aBoolean229 = true;
+				this.skipConsumptionCheck = true;
 			}
 			while (local65 > local38) {
 				local38 += 256;
-				this.method3564(this.anIntArray411);
+				this.read(this.samples);
 				this.write();
 			}
-			if (local14 > this.aLong152) {
-				if (this.aBoolean229) {
-					this.aBoolean229 = false;
-				} else if (this.anInt4634 == 0 && this.anInt4640 == 0) {
+			if (now > this.calculateConsumptionAt) {
+				if (this.skipConsumptionCheck) {
+					this.skipConsumptionCheck = false;
+				} else if (this.consumedSamples == 0 && this.prevConsumedSamples == 0) {
 					this.flush();
-					this.aLong153 = local14 + 2000L;
+					this.closeUntil = now + 2000L;
 					return;
 				} else {
-					this.anInt4637 = Math.min(this.anInt4640, this.anInt4634);
-					this.anInt4640 = this.anInt4634;
+					this.anInt4637 = Math.min(this.prevConsumedSamples, this.consumedSamples);
+					this.prevConsumedSamples = this.consumedSamples;
 				}
-				this.aLong152 = local14 + 2000L;
-				this.anInt4634 = 0;
+				this.calculateConsumptionAt = now + 2000L;
+				this.consumedSamples = 0;
 			}
-			this.anInt4636 = local38;
+			this.prevBufferSize = local38;
 		} catch (@Pc(202) Exception local202) {
 			this.flush();
-			this.aLong153 = local14 + 2000L;
+			this.closeUntil = now + 2000L;
 		}
 		try {
-			if (local14 > this.aLong151 + 500000L) {
-				local14 = this.aLong151;
+			if (now > this.time + 500000L) {
+				now = this.time;
 			}
-			while (local14 > this.aLong151 + 5000L) {
-				this.method3573();
-				this.aLong151 += 256000 / Static44.sampleRate;
+			while (now > this.time + 5000L) {
+				this.skip();
+				this.time += 256000 / Static44.sampleRate;
 			}
 		} catch (@Pc(247) Exception local247) {
-			this.aLong151 = local14;
+			this.time = now;
 		}
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(ILclient!qb;)V")
 	public final synchronized void setStream(@OriginalArg(1) PcmStream arg0) {
-		this.aClass3_Sub3_6 = arg0;
+		this.stream = arg0;
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Lclient!qb;IB)V")
@@ -321,23 +321,23 @@ public class AudioChannel {
 
 	@OriginalMember(owner = "client!vh", name = "c", descriptor = "()I")
 	protected int getBufferSize() throws Exception {
-		return this.anInt4644;
+		return this.bufferCapacity;
 	}
 
 	@OriginalMember(owner = "client!vh", name = "b", descriptor = "(B)V")
 	public final synchronized void method3570() {
-		this.aBoolean229 = true;
+		this.skipConsumptionCheck = true;
 		try {
 			this.close();
 		} catch (@Pc(10) Exception local10) {
 			this.flush();
-			this.aLong153 = MonotonicClock.currentTimeMillis() + 2000L;
+			this.closeUntil = MonotonicClock.currentTimeMillis() + 2000L;
 		}
 	}
 
 	@OriginalMember(owner = "client!vh", name = "b", descriptor = "(I)V")
 	public final void method3571() {
-		this.aBoolean229 = true;
+		this.skipConsumptionCheck = true;
 	}
 
 	@OriginalMember(owner = "client!vh", name = "d", descriptor = "()V")
@@ -345,38 +345,38 @@ public class AudioChannel {
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(II)V")
-	private void method3573() {
+	private void skip() {
 		this.anInt4638 -= 256;
 		if (this.anInt4638 < 0) {
 			this.anInt4638 = 0;
 		}
-		if (this.aClass3_Sub3_6 != null) {
-			this.aClass3_Sub3_6.method4410(256);
+		if (this.stream != null) {
+			this.stream.skip(256);
 		}
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Z)V")
-	public final synchronized void method3575() {
-		if (Static60.aClass19_1 != null) {
+	public final synchronized void quit() {
+		if (Static60.thread != null) {
 			@Pc(6) boolean local6 = true;
 			for (@Pc(8) int local8 = 0; local8 < 2; local8++) {
-				if (Static60.aClass19_1.channels[local8] == this) {
-					Static60.aClass19_1.channels[local8] = null;
+				if (Static60.thread.channels[local8] == this) {
+					Static60.thread.channels[local8] = null;
 				}
-				if (Static60.aClass19_1.channels[local8] != null) {
+				if (Static60.thread.channels[local8] != null) {
 					local6 = false;
 				}
 			}
 			if (local6) {
-				Static60.aClass19_1.stop = true;
-				while (Static60.aClass19_1.running) {
+				Static60.thread.stop = true;
+				while (Static60.thread.running) {
 					Static231.sleep(50L);
 				}
-				Static60.aClass19_1 = null;
+				Static60.thread = null;
 			}
 		}
 		this.flush();
-		this.anIntArray411 = null;
+		this.samples = null;
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(Ljava/awt/Component;)V")
diff --git a/client/src/main/java/BasType.java b/client/src/main/java/BasType.java
index f7ab367..3f840ad 100644
--- a/client/src/main/java/BasType.java
+++ b/client/src/main/java/BasType.java
@@ -7,16 +7,16 @@ import org.openrs2.deob.annotation.Pc;
 public final class BasType {
 
 	@OriginalMember(owner = "client!ck", name = "g", descriptor = "[[I")
-	public int[][] anIntArrayArray7;
+	public int[][] modelRotateTranslate;
 
 	@OriginalMember(owner = "client!ck", name = "p", descriptor = "I")
 	public int anInt1036 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "q", descriptor = "I")
-	public int anInt1037 = -1;
+	public int idleAnimationId = -1;
 
 	@OriginalMember(owner = "client!ck", name = "w", descriptor = "I")
-	public int anInt1043 = -1;
+	public int runAnimationId3 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "u", descriptor = "I")
 	public int anInt1041 = 0;
@@ -34,28 +34,28 @@ public final class BasType {
 	public int anInt1048 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "M", descriptor = "I")
-	public int anInt1054 = -1;
+	public int runAnimationId2 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "N", descriptor = "I")
 	public int anInt1055 = 0;
 
 	@OriginalMember(owner = "client!ck", name = "m", descriptor = "I")
-	public int anInt1035 = -1;
+	public int turnAnimation3 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "P", descriptor = "I")
-	public int anInt1056 = -1;
+	public int turnAnimation1 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "h", descriptor = "I")
 	public int anInt1032 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "H", descriptor = "I")
-	public int anInt1051 = -1;
+	public int walkAnimation = -1;
 
 	@OriginalMember(owner = "client!ck", name = "W", descriptor = "I")
 	public int anInt1059 = 0;
 
 	@OriginalMember(owner = "client!ck", name = "z", descriptor = "I")
-	public int anInt1045 = -1;
+	public int runAnimationId4 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "r", descriptor = "I")
 	public int anInt1038 = 0;
@@ -70,7 +70,7 @@ public final class BasType {
 	public int anInt1040 = 0;
 
 	@OriginalMember(owner = "client!ck", name = "U", descriptor = "I")
-	public int anInt1058 = -1;
+	public int runAnimationId = -1;
 
 	@OriginalMember(owner = "client!ck", name = "ib", descriptor = "I")
 	public int anInt1066 = -1;
@@ -79,7 +79,7 @@ public final class BasType {
 	public int anInt1063 = 0;
 
 	@OriginalMember(owner = "client!ck", name = "R", descriptor = "I")
-	public int anInt1057 = -1;
+	public int turnAnimation2 = -1;
 
 	@OriginalMember(owner = "client!ck", name = "jb", descriptor = "I")
 	public int anInt1067 = -1;
@@ -105,13 +105,13 @@ public final class BasType {
 	@OriginalMember(owner = "client!ck", name = "a", descriptor = "(IBLclient!wa;)V")
 	private void method881(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
 		if (arg0 == 1) {
-			this.anInt1037 = arg1.g2();
-			this.anInt1051 = arg1.g2();
-			if (this.anInt1051 == 65535) {
-				this.anInt1051 = -1;
+			this.idleAnimationId = arg1.g2();
+			this.walkAnimation = arg1.g2();
+			if (this.walkAnimation == 65535) {
+				this.walkAnimation = -1;
 			}
-			if (this.anInt1037 == 65535) {
-				this.anInt1037 = -1;
+			if (this.idleAnimationId == 65535) {
+				this.idleAnimationId = -1;
 			}
 		} else if (arg0 == 2) {
 			this.anInt1062 = arg1.g2();
@@ -122,24 +122,24 @@ public final class BasType {
 		} else if (arg0 == 5) {
 			this.anInt1048 = arg1.g2();
 		} else if (arg0 == 6) {
-			this.anInt1058 = arg1.g2();
+			this.runAnimationId = arg1.g2();
 		} else if (arg0 == 7) {
-			this.anInt1054 = arg1.g2();
+			this.runAnimationId2 = arg1.g2();
 		} else if (arg0 == 8) {
-			this.anInt1043 = arg1.g2();
+			this.runAnimationId3 = arg1.g2();
 		} else if (arg0 == 9) {
-			this.anInt1045 = arg1.g2();
+			this.runAnimationId4 = arg1.g2();
 		} else if (arg0 == 26) {
 			this.anInt1059 = (short) (arg1.g1() * 4);
 			this.anInt1050 = (short) (arg1.g1() * 4);
 		} else if (arg0 == 27) {
-			if (this.anIntArrayArray7 == null) {
-				this.anIntArrayArray7 = new int[12][];
+			if (this.modelRotateTranslate == null) {
+				this.modelRotateTranslate = new int[12][];
 			}
-			@Pc(306) int local306 = arg1.g1();
-			this.anIntArrayArray7[local306] = new int[6];
-			for (@Pc(314) int local314 = 0; local314 < 6; local314++) {
-				this.anIntArrayArray7[local306][local314] = arg1.g2s();
+			@Pc(306) int bodyId = arg1.g1();
+			this.modelRotateTranslate[bodyId] = new int[6];
+			for (@Pc(314) int type = 0; type < 6; type++) {
+				this.modelRotateTranslate[bodyId][type] = arg1.g2s();
 			}
 		} else if (arg0 == 29) {
 			this.anInt1038 = arg1.g1();
@@ -164,11 +164,11 @@ public final class BasType {
 		} else if (arg0 == 39) {
 			this.anInt1067 = arg1.g2();
 		} else if (arg0 == 40) {
-			this.anInt1056 = arg1.g2();
+			this.turnAnimation1 = arg1.g2();
 		} else if (arg0 == 41) {
-			this.anInt1057 = arg1.g2();
+			this.turnAnimation2 = arg1.g2();
 		} else if (arg0 == 42) {
-			this.anInt1035 = arg1.g2();
+			this.turnAnimation3 = arg1.g2();
 		} else if (arg0 == 43) {
 			arg1.g2();
 		} else if (arg0 == 44) {
diff --git a/client/src/main/java/Cache.java b/client/src/main/java/Cache.java
index d2429e7..3704641 100644
--- a/client/src/main/java/Cache.java
+++ b/client/src/main/java/Cache.java
@@ -8,65 +8,68 @@ import org.openrs2.deob.annotation.Pc;
 @OriginalClass("client!ge")
 public final class Cache {
 
+	@OriginalMember(owner = "client!wc", name = "i", descriptor = "[B")
+	public static final byte[] buffer = new byte[520];
+
 	@OriginalMember(owner = "client!ge", name = "a", descriptor = "Lclient!en;")
-	private BufferedFile aClass38_1 = null;
+	private BufferedFile data = null;
 
 	@OriginalMember(owner = "client!ge", name = "f", descriptor = "Lclient!en;")
-	private BufferedFile aClass38_2 = null;
+	private BufferedFile index = null;
 
 	@OriginalMember(owner = "client!ge", name = "l", descriptor = "I")
-	private int anInt2156 = 65000;
+	private int maxLen = 65000;
 
 	@OriginalMember(owner = "client!ge", name = "c", descriptor = "I")
-	private final int anInt2150;
+	private final int archive;
 
 	@OriginalMember(owner = "client!ge", name = "<init>", descriptor = "(ILclient!en;Lclient!en;I)V")
 	public Cache(@OriginalArg(0) int arg0, @OriginalArg(1) BufferedFile arg1, @OriginalArg(2) BufferedFile arg2, @OriginalArg(3) int arg3) {
-		this.anInt2156 = arg3;
-		this.aClass38_2 = arg2;
-		this.anInt2150 = arg0;
-		this.aClass38_1 = arg1;
+		this.maxLen = arg3;
+		this.index = arg2;
+		this.archive = arg0;
+		this.data = arg1;
 	}
 
 	@OriginalMember(owner = "client!ge", name = "toString", descriptor = "()Ljava/lang/String;")
 	@Override
 	public final String toString() {
-		return "Cache:" + this.anInt2150;
+		return "Cache:" + this.archive;
 	}
 
 	@OriginalMember(owner = "client!ge", name = "a", descriptor = "(II[BB)Z")
-	public final boolean method1700(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
-		@Pc(7) BufferedFile local7 = this.aClass38_1;
-		synchronized (this.aClass38_1) {
-			if (arg1 < 0 || arg1 > this.anInt2156) {
+	public final boolean write(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) {
+		@Pc(7) BufferedFile local7 = this.data;
+		synchronized (this.data) {
+			if (arg1 < 0 || arg1 > this.maxLen) {
 				throw new IllegalArgumentException();
 			}
-			@Pc(35) boolean local35 = this.method1704(arg1, arg0, arg2, true);
+			@Pc(35) boolean local35 = this.write(arg1, arg0, arg2, true);
 			if (!local35) {
-				local35 = this.method1704(arg1, arg0, arg2, false);
+				local35 = this.write(arg1, arg0, arg2, false);
 			}
 			return local35;
 		}
 	}
 
 	@OriginalMember(owner = "client!ge", name = "a", descriptor = "(IB)[B")
-	public final byte[] method1701(@OriginalArg(0) int arg0) {
-		@Pc(9) BufferedFile local9 = this.aClass38_1;
-		synchronized (this.aClass38_1) {
+	public final byte[] read(@OriginalArg(0) int group) {
+		@Pc(9) BufferedFile local9 = this.data;
+		synchronized (this.data) {
 			try {
 				@Pc(27) Object local27;
-				if (this.aClass38_2.length() < (long) (arg0 * 6 + 6)) {
+				if (this.index.length() < (long) (group * 6 + 6)) {
 					local27 = null;
 					return (byte[]) local27;
 				}
-				this.aClass38_2.seek((long) (arg0 * 6));
-				this.aClass38_2.read(0, Static271.aByteArray79, 6);
-				@Pc(69) int local69 = ((Static271.aByteArray79[3] & 0xFF) << 16) - (-((Static271.aByteArray79[4] & 0xFF) << 8) - (Static271.aByteArray79[5] & 0xFF));
-				@Pc(99) int local99 = (Static271.aByteArray79[2] & 0xFF) + ((Static271.aByteArray79[1] & 0xFF) << 8) + ((Static271.aByteArray79[0] & 0xFF) << 16);
-				if (local99 < 0 || this.anInt2156 < local99) {
+				this.index.seek((long) (group * 6));
+				this.index.read(0, buffer, 6);
+				@Pc(69) int local69 = ((buffer[3] & 0xFF) << 16) - (-((buffer[4] & 0xFF) << 8) - (buffer[5] & 0xFF));
+				@Pc(99) int local99 = (buffer[2] & 0xFF) + ((buffer[1] & 0xFF) << 8) + ((buffer[0] & 0xFF) << 16);
+				if (local99 < 0 || this.maxLen < local99) {
 					local27 = null;
 					return (byte[]) local27;
-				} else if (local69 <= 0 || (long) local69 > this.aClass38_1.length() / 520L) {
+				} else if (local69 <= 0 || (long) local69 > this.data.length() / 520L) {
 					local27 = null;
 					return (byte[]) local27;
 				} else {
@@ -79,25 +82,25 @@ public final class Cache {
 							return (byte[]) local27;
 						}
 						@Pc(157) int local157 = local99 - local136;
-						this.aClass38_1.seek((long) (local69 * 520));
+						this.data.seek((long) (local69 * 520));
 						if (local157 > 512) {
 							local157 = 512;
 						}
-						this.aClass38_1.read(0, Static271.aByteArray79, local157 + 8);
-						@Pc(197) int local197 = ((Static271.aByteArray79[0] & 0xFF) << 8) + (Static271.aByteArray79[1] & 0xFF);
-						@Pc(211) int local211 = (Static271.aByteArray79[3] & 0xFF) + ((Static271.aByteArray79[2] & 0xFF) << 8);
-						@Pc(217) int local217 = Static271.aByteArray79[7] & 0xFF;
-						@Pc(239) int local239 = (Static271.aByteArray79[6] & 0xFF) + ((Static271.aByteArray79[5] & 0xFF) << 8) + ((Static271.aByteArray79[4] & 0xFF) << 16);
-						if (arg0 != local197 || local138 != local211 || this.anInt2150 != local217) {
+						this.data.read(0, buffer, local157 + 8);
+						@Pc(197) int local197 = ((buffer[0] & 0xFF) << 8) + (buffer[1] & 0xFF);
+						@Pc(211) int local211 = (buffer[3] & 0xFF) + ((buffer[2] & 0xFF) << 8);
+						@Pc(217) int local217 = buffer[7] & 0xFF;
+						@Pc(239) int local239 = (buffer[6] & 0xFF) + ((buffer[5] & 0xFF) << 8) + ((buffer[4] & 0xFF) << 16);
+						if (group != local197 || local138 != local211 || this.archive != local217) {
 							local27 = null;
 							return (byte[]) local27;
 						}
-						if (local239 < 0 || (long) local239 > this.aClass38_1.length() / 520L) {
+						if (local239 < 0 || (long) local239 > this.data.length() / 520L) {
 							local27 = null;
 							return (byte[]) local27;
 						}
 						for (@Pc(272) int local272 = 0; local272 < local157; local272++) {
-							local134[local136++] = Static271.aByteArray79[local272 + 8];
+							local134[local136++] = buffer[local272 + 8];
 						}
 						local138++;
 						local69 = local239;
@@ -112,61 +115,61 @@ public final class Cache {
 	}
 
 	@OriginalMember(owner = "client!ge", name = "a", descriptor = "(BII[BZ)Z")
-	private boolean method1704(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2, @OriginalArg(4) boolean arg3) {
-		@Pc(9) BufferedFile local9 = this.aClass38_1;
-		synchronized (this.aClass38_1) {
+	private boolean write(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2, @OriginalArg(4) boolean arg3) {
+		@Pc(9) BufferedFile local9 = this.data;
+		synchronized (this.data) {
 			try {
 				@Pc(67) int local67;
 				@Pc(27) boolean local27;
 				if (arg3) {
-					if (this.aClass38_2.length() < (long) (arg1 * 6 + 6)) {
+					if (this.index.length() < (long) (arg1 * 6 + 6)) {
 						local27 = false;
 						return local27;
 					}
-					this.aClass38_2.seek((long) (arg1 * 6));
-					this.aClass38_2.read(0, Static271.aByteArray79, 6);
-					local67 = ((Static271.aByteArray79[3] & 0xFF) << 16) + (Static271.aByteArray79[4] << 8 & 0xFF00) + (Static271.aByteArray79[5] & 0xFF);
-					if (local67 <= 0 || this.aClass38_1.length() / 520L < (long) local67) {
+					this.index.seek((long) (arg1 * 6));
+					this.index.read(0, buffer, 6);
+					local67 = ((buffer[3] & 0xFF) << 16) + (buffer[4] << 8 & 0xFF00) + (buffer[5] & 0xFF);
+					if (local67 <= 0 || this.data.length() / 520L < (long) local67) {
 						local27 = false;
 						return local27;
 					}
 				} else {
-					local67 = (int) ((this.aClass38_1.length() + 519L) / 520L);
+					local67 = (int) ((this.data.length() + 519L) / 520L);
 					if (local67 == 0) {
 						local67 = 1;
 					}
 				}
-				Static271.aByteArray79[0] = (byte) (arg0 >> 16);
-				Static271.aByteArray79[4] = (byte) (local67 >> 8);
+				buffer[0] = (byte) (arg0 >> 16);
+				buffer[4] = (byte) (local67 >> 8);
 				@Pc(125) int local125 = 0;
-				Static271.aByteArray79[5] = (byte) local67;
-				Static271.aByteArray79[2] = (byte) arg0;
-				Static271.aByteArray79[3] = (byte) (local67 >> 16);
+				buffer[5] = (byte) local67;
+				buffer[2] = (byte) arg0;
+				buffer[3] = (byte) (local67 >> 16);
 				@Pc(156) int local156 = 0;
-				Static271.aByteArray79[1] = (byte) (arg0 >> 8);
-				this.aClass38_2.seek((long) (arg1 * 6));
-				this.aClass38_2.write(Static271.aByteArray79, 0, 6);
+				buffer[1] = (byte) (arg0 >> 8);
+				this.index.seek((long) (arg1 * 6));
+				this.index.write(buffer, 0, 6);
 				while (true) {
 					if (local125 < arg0) {
 						label134: {
 							@Pc(189) int local189 = 0;
 							@Pc(248) int local248;
 							if (arg3) {
-								this.aClass38_1.seek((long) (local67 * 520));
+								this.data.seek((long) (local67 * 520));
 								try {
-									this.aClass38_1.read(0, Static271.aByteArray79, 8);
+									this.data.read(0, buffer, 8);
 								} catch (@Pc(209) EOFException local209) {
 									break label134;
 								}
-								local189 = ((Static271.aByteArray79[4] & 0xFF) << 16) + ((Static271.aByteArray79[5] & 0xFF) << 8) + (Static271.aByteArray79[6] & 0xFF);
-								local248 = (Static271.aByteArray79[1] & 0xFF) + ((Static271.aByteArray79[0] & 0xFF) << 8);
-								@Pc(254) int local254 = Static271.aByteArray79[7] & 0xFF;
-								@Pc(268) int local268 = (Static271.aByteArray79[3] & 0xFF) + ((Static271.aByteArray79[2] & 0xFF) << 8);
-								if (local248 != arg1 || local156 != local268 || this.anInt2150 != local254) {
+								local189 = ((buffer[4] & 0xFF) << 16) + ((buffer[5] & 0xFF) << 8) + (buffer[6] & 0xFF);
+								local248 = (buffer[1] & 0xFF) + ((buffer[0] & 0xFF) << 8);
+								@Pc(254) int local254 = buffer[7] & 0xFF;
+								@Pc(268) int local268 = (buffer[3] & 0xFF) + ((buffer[2] & 0xFF) << 8);
+								if (local248 != arg1 || local156 != local268 || this.archive != local254) {
 									local27 = false;
 									return local27;
 								}
-								if (local189 < 0 || (long) local189 > this.aClass38_1.length() / 520L) {
+								if (local189 < 0 || (long) local189 > this.data.length() / 520L) {
 									local27 = false;
 									return local27;
 								}
@@ -174,7 +177,7 @@ public final class Cache {
 							local248 = arg0 - local125;
 							if (local189 == 0) {
 								arg3 = false;
-								local189 = (int) ((this.aClass38_1.length() + 519L) / 520L);
+								local189 = (int) ((this.data.length() + 519L) / 520L);
 								if (local189 == 0) {
 									local189++;
 								}
@@ -182,25 +185,25 @@ public final class Cache {
 									local189++;
 								}
 							}
-							Static271.aByteArray79[7] = (byte) this.anInt2150;
-							Static271.aByteArray79[0] = (byte) (arg1 >> 8);
+							buffer[7] = (byte) this.archive;
+							buffer[0] = (byte) (arg1 >> 8);
 							if (arg0 - local125 <= 512) {
 								local189 = 0;
 							}
-							Static271.aByteArray79[4] = (byte) (local189 >> 16);
+							buffer[4] = (byte) (local189 >> 16);
 							if (local248 > 512) {
 								local248 = 512;
 							}
-							Static271.aByteArray79[1] = (byte) arg1;
-							Static271.aByteArray79[6] = (byte) local189;
-							Static271.aByteArray79[2] = (byte) (local156 >> 8);
-							Static271.aByteArray79[3] = (byte) local156;
+							buffer[1] = (byte) arg1;
+							buffer[6] = (byte) local189;
+							buffer[2] = (byte) (local156 >> 8);
+							buffer[3] = (byte) local156;
 							local156++;
-							Static271.aByteArray79[5] = (byte) (local189 >> 8);
-							this.aClass38_1.seek((long) (local67 * 520));
+							buffer[5] = (byte) (local189 >> 8);
+							this.data.seek((long) (local67 * 520));
 							local67 = local189;
-							this.aClass38_1.write(Static271.aByteArray79, 0, 8);
-							this.aClass38_1.write(arg2, local125, local248);
+							this.data.write(buffer, 0, 8);
+							this.data.write(arg2, local125, local248);
 							local125 += local248;
 							continue;
 						}
diff --git a/client/src/main/java/Class45.java b/client/src/main/java/Class45.java
index 69b963d..05353d9 100644
--- a/client/src/main/java/Class45.java
+++ b/client/src/main/java/Class45.java
@@ -63,7 +63,7 @@ public final class Class45 {
 			local1 = arg1 + (arg3 << 16);
 			@Pc(23) IntNode local23 = (IntNode) this.aClass133_4.get(local1);
 			if (local23 != null) {
-				return local23.anInt3141;
+				return local23.value;
 			}
 		}
 		@Pc(31) int local31 = arg0.anInt2247;
@@ -106,7 +106,7 @@ public final class Class45 {
 		this.anIntArray178[this.anInt2017] = arg1;
 		this.anIntArray180[this.anInt2017] = arg2;
 		this.anIntArray179[this.anInt2017] = arg3;
-		this.aClass133_4.method3862(new IntNode(this.anInt2017), local1);
+		this.aClass133_4.put(new IntNode(this.anInt2017), local1);
 		return this.anInt2017++;
 	}
 
diff --git a/client/src/main/java/CollisionMap.java b/client/src/main/java/CollisionMap.java
index 11e7640..5df95d0 100644
--- a/client/src/main/java/CollisionMap.java
+++ b/client/src/main/java/CollisionMap.java
@@ -538,7 +538,7 @@ public final class CollisionMap {
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IZBIII)V")
-	public final void method3043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
+	public final void flagScenery(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
 		@Pc(6) int local6 = arg2 - this.anInt3907;
 		@Pc(11) int local11 = arg0 - this.anInt3912;
 		@Pc(17) int local17 = 256;
@@ -903,7 +903,7 @@ public final class CollisionMap {
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIZIII)V")
-	public final void method3056(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+	public final void unflagScenery(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) boolean arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		@Pc(6) int local6 = arg0 - this.anInt3912;
 		@Pc(11) int local11 = arg5 - this.anInt3907;
 		@Pc(13) int local13 = 256;
diff --git a/client/src/main/java/ColorImageCache.java b/client/src/main/java/ColorImageCache.java
index 177904f..4d8e5c1 100644
--- a/client/src/main/java/ColorImageCache.java
+++ b/client/src/main/java/ColorImageCache.java
@@ -7,88 +7,88 @@ import org.openrs2.deob.annotation.Pc;
 public final class ColorImageCache {
 
 	@OriginalMember(owner = "client!pf", name = "d", descriptor = "I")
-	private int anInt4467 = 0;
+	private int size = 0;
 
 	@OriginalMember(owner = "client!pf", name = "m", descriptor = "I")
-	private int anInt4471 = -1;
+	private int singleRow = -1;
 
 	@OriginalMember(owner = "client!pf", name = "p", descriptor = "Lclient!ih;")
-	private LinkedList aClass69_103 = new LinkedList();
+	private LinkedList recentlyUsed = new LinkedList();
 
 	@OriginalMember(owner = "client!pf", name = "t", descriptor = "Z")
-	public boolean aBoolean221 = false;
+	public boolean invalid = false;
 
 	@OriginalMember(owner = "client!pf", name = "a", descriptor = "I")
-	private final int anInt4465;
+	private final int height;
 
 	@OriginalMember(owner = "client!pf", name = "e", descriptor = "[Lclient!qi;")
-	private ColorImageCacheEntry[] aClass3_Sub28Array1;
+	private ColorImageCacheEntry[] entries;
 
 	@OriginalMember(owner = "client!pf", name = "s", descriptor = "I")
-	private final int anInt4475;
+	private final int capacity;
 
 	@OriginalMember(owner = "client!pf", name = "g", descriptor = "[[I")
-	private int[][] anIntArrayArray34;
+	private int[][] pixels;
 
 	@OriginalMember(owner = "client!pf", name = "<init>", descriptor = "(III)V")
-	public ColorImageCache(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		this.anInt4465 = arg1;
-		this.aClass3_Sub28Array1 = new ColorImageCacheEntry[this.anInt4465];
-		this.anInt4475 = arg0;
-		this.anIntArrayArray34 = new int[this.anInt4475][arg2];
+	public ColorImageCache(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int width) {
+		this.height = arg1;
+		this.entries = new ColorImageCacheEntry[this.height];
+		this.capacity = arg0;
+		this.pixels = new int[this.capacity][width];
 	}
 
 	@OriginalMember(owner = "client!pf", name = "b", descriptor = "(I)V")
-	public final void method3442() {
-		for (@Pc(3) int local3 = 0; local3 < this.anInt4475; local3++) {
-			this.anIntArrayArray34[local3] = null;
+	public final void clear() {
+		for (@Pc(3) int i = 0; i < this.capacity; i++) {
+			this.pixels[i] = null;
 		}
-		this.anIntArrayArray34 = null;
-		this.aClass3_Sub28Array1 = null;
-		this.aClass69_103.method2278();
-		this.aClass69_103 = null;
+		this.pixels = null;
+		this.entries = null;
+		this.recentlyUsed.clear();
+		this.recentlyUsed = null;
 	}
 
 	@OriginalMember(owner = "client!pf", name = "b", descriptor = "(II)[I")
-	public final int[] method3445(@OriginalArg(1) int arg0) {
-		if (this.anInt4465 == this.anInt4475) {
-			this.aBoolean221 = this.aClass3_Sub28Array1[arg0] == null;
-			this.aClass3_Sub28Array1[arg0] = Static105.aClass3_Sub28_1;
-			return this.anIntArrayArray34[arg0];
-		} else if (this.anInt4475 == 1) {
-			this.aBoolean221 = this.anInt4471 != arg0;
-			this.anInt4471 = arg0;
-			return this.anIntArrayArray34[0];
+	public final int[] method3445(@OriginalArg(1) int row) {
+		if (this.height == this.capacity) {
+			this.invalid = this.entries[row] == null;
+			this.entries[row] = Static105.VALID;
+			return this.pixels[row];
+		} else if (this.capacity == 1) {
+			this.invalid = this.singleRow != row;
+			this.singleRow = row;
+			return this.pixels[0];
 		} else {
-			@Pc(29) ColorImageCacheEntry local29 = this.aClass3_Sub28Array1[arg0];
+			@Pc(29) ColorImageCacheEntry local29 = this.entries[row];
 			if (local29 == null) {
-				this.aBoolean221 = true;
-				if (this.anInt4467 < this.anInt4475) {
-					local29 = new ColorImageCacheEntry(arg0, this.anInt4467);
-					this.anInt4467++;
+				this.invalid = true;
+				if (this.size < this.capacity) {
+					local29 = new ColorImageCacheEntry(row, this.size);
+					this.size++;
 				} else {
-					@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.aClass69_103.method2279();
-					local29 = new ColorImageCacheEntry(arg0, local66.anInt4761);
-					this.aClass3_Sub28Array1[local66.anInt4759] = null;
-					local66.method4658();
+					@Pc(66) ColorImageCacheEntry local66 = (ColorImageCacheEntry) this.recentlyUsed.method2279();
+					local29 = new ColorImageCacheEntry(row, local66.index);
+					this.entries[local66.row] = null;
+					local66.unlink();
 				}
-				this.aClass3_Sub28Array1[arg0] = local29;
+				this.entries[row] = local29;
 			} else {
-				this.aBoolean221 = false;
+				this.invalid = false;
 			}
-			this.aClass69_103.method2283(local29);
-			return this.anIntArrayArray34[local29.anInt4761];
+			this.recentlyUsed.addHead(local29);
+			return this.pixels[local29.index];
 		}
 	}
 
 	@OriginalMember(owner = "client!pf", name = "a", descriptor = "(B)[[I")
 	public final int[][] method3446() {
-		if (this.anInt4475 != this.anInt4465) {
+		if (this.capacity != this.height) {
 			throw new RuntimeException("Can only retrieve a full image cache");
 		}
-		for (@Pc(24) int local24 = 0; local24 < this.anInt4475; local24++) {
-			this.aClass3_Sub28Array1[local24] = Static105.aClass3_Sub28_1;
+		for (@Pc(24) int local24 = 0; local24 < this.capacity; local24++) {
+			this.entries[local24] = Static105.VALID;
 		}
-		return this.anIntArrayArray34;
+		return this.pixels;
 	}
 }
diff --git a/client/src/main/java/ColorImageCacheEntry.java b/client/src/main/java/ColorImageCacheEntry.java
index eaaa246..5951329 100644
--- a/client/src/main/java/ColorImageCacheEntry.java
+++ b/client/src/main/java/ColorImageCacheEntry.java
@@ -6,14 +6,14 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class ColorImageCacheEntry extends Node {
 
 	@OriginalMember(owner = "client!qi", name = "s", descriptor = "I")
-	public final int anInt4761;
+	public final int index;
 
 	@OriginalMember(owner = "client!qi", name = "q", descriptor = "I")
-	public final int anInt4759;
+	public final int row;
 
 	@OriginalMember(owner = "client!qi", name = "<init>", descriptor = "(II)V")
 	public ColorImageCacheEntry(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		this.anInt4761 = arg1;
-		this.anInt4759 = arg0;
+		this.index = arg1;
+		this.row = arg0;
 	}
 }
diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java
index 0665b5b..5eac6d1 100644
--- a/client/src/main/java/Component.java
+++ b/client/src/main/java/Component.java
@@ -774,7 +774,7 @@ public final class Component {
 		if (local29 == -1) {
 			return null;
 		}
-		@Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.method3106((long) local29);
+		@Pc(43) Sprite local43 = (Sprite) Static190.aClass99_26.get((long) local29);
 		if (local43 != null) {
 			return local43;
 		}
@@ -782,7 +782,7 @@ public final class Component {
 		if (local43 == null) {
 			Static211.aBoolean72 = true;
 		} else {
-			Static190.aClass99_26.method3095(local43, (long) local29);
+			Static190.aClass99_26.put(local43, (long) local29);
 		}
 		return local43;
 	}
@@ -848,7 +848,7 @@ public final class Component {
 		} else {
 			@Pc(61) Model local61;
 			if (local10 == 1) {
-				local61 = (Model) Static124.aClass99_17.method3106((long) ((local10 << 16) + local13));
+				local61 = (Model) Static124.aClass99_17.get((long) ((local10 << 16) + local13));
 				if (local61 == null) {
 					@Pc(69) RawModel local69 = Static77.method1686(Static203.aClass153_85, local13);
 					if (local69 == null) {
@@ -856,7 +856,7 @@ public final class Component {
 						return null;
 					}
 					local61 = local69.method1679(64, 768, -50, -10, -50);
-					Static124.aClass99_17.method3095(local61, (long) (local13 + (local10 << 16)));
+					Static124.aClass99_17.put(local61, (long) (local13 + (local10 << 16)));
 				}
 				if (arg1 != null) {
 					local61 = arg1.method4215(local61, arg0, arg3, arg2);
@@ -930,13 +930,13 @@ public final class Component {
 			return null;
 		}
 		@Pc(66) long local66 = ((this.aBoolean21 ? 1L : 0L) << 38) + ((this.aBoolean18 ? 1L : 0L) << 35) + (long) local12 + ((long) this.anInt514 << 36) + ((this.aBoolean26 ? 1L : 0L) << 39) + ((long) this.anInt513 << 40);
-		@Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.method3106(local66);
+		@Pc(72) Sprite local72 = (Sprite) Static190.aClass99_26.get(local66);
 		if (local72 != null) {
 			return local72;
 		}
 		@Pc(85) SoftwareSprite local85;
 		if (this.aBoolean18) {
-			local85 = Static80.method3613(Static23.aClass153_12, local12);
+			local85 = Static80.loadSoftwareAlphaSprite(Static23.aClass153_12, local12);
 		} else {
 			local85 = Static78.method1693(0, Static23.aClass153_12, local12);
 		}
@@ -969,7 +969,7 @@ public final class Component {
 		} else {
 			local72 = new GlSprite(local85);
 		}
-		Static190.aClass99_26.method3095(local72, local66);
+		Static190.aClass99_26.put(local72, local66);
 		return local72;
 	}
 
@@ -1162,7 +1162,7 @@ public final class Component {
 		if (this.anInt502 == -1) {
 			return null;
 		}
-		@Pc(21) Font local21 = (Font) Static87.aClass99_12.method3106((long) this.anInt502);
+		@Pc(21) Font local21 = (Font) Static87.aClass99_12.get((long) this.anInt502);
 		if (local21 != null) {
 			return local21;
 		}
@@ -1170,8 +1170,8 @@ public final class Component {
 		if (local21 == null) {
 			Static211.aBoolean72 = true;
 		} else {
-			local21.method2873(arg0, null);
-			Static87.aClass99_12.method3095(local21, (long) this.anInt502);
+			local21.setNameIcons(arg0, null);
+			Static87.aClass99_12.put(local21, (long) this.anInt502);
 		}
 		return local21;
 	}
diff --git a/client/src/main/java/CursorType.java b/client/src/main/java/CursorType.java
index 0f33e4a..3e42f6a 100644
--- a/client/src/main/java/CursorType.java
+++ b/client/src/main/java/CursorType.java
@@ -7,45 +7,45 @@ import org.openrs2.deob.annotation.Pc;
 public final class CursorType {
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "I")
-	public int anInt2850;
+	public int hotSpotY;
 
 	@OriginalMember(owner = "client!ia", name = "c", descriptor = "I")
-	public int anInt2852;
+	public int hotSpotX;
 
 	@OriginalMember(owner = "client!ia", name = "i", descriptor = "I")
-	private int anInt2857;
+	private int spriteId;
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(B)Lclient!mm;")
-	public final SoftwareSprite method2246() {
-		@Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.aClass99_5.method3106((long) this.anInt2857);
+	public final SoftwareSprite getSprite() {
+		@Pc(7) SoftwareSprite local7 = (SoftwareSprite) Static7.sprites.get((long) this.spriteId);
 		if (local7 != null) {
 			return local7;
 		}
-		local7 = Static80.method3613(Static243.aClass153_97, this.anInt2857);
+		local7 = Static80.loadSoftwareAlphaSprite(Static243.spritesArchive, this.spriteId);
 		if (local7 != null) {
-			Static7.aClass99_5.method3095(local7, (long) this.anInt2857);
+			Static7.sprites.put(local7, (long) this.spriteId);
 		}
 		return local7;
 	}
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(Lclient!wa;IB)V")
-	public final void method2249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
+	public final void decode(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		while (true) {
 			@Pc(18) int local18 = arg0.g1();
 			if (local18 == 0) {
 				return;
 			}
-			this.method2250(arg1, local18, arg0);
+			this.decode(arg1, local18, arg0);
 		}
 	}
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IIILclient!wa;)V")
-	private void method2250(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) {
+	private void decode(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) {
 		if (arg1 == 1) {
-			this.anInt2857 = arg2.g2();
+			this.spriteId = arg2.g2();
 		} else if (arg1 == 2) {
-			this.anInt2852 = arg2.g1();
-			this.anInt2850 = arg2.g1();
+			this.hotSpotX = arg2.g1();
+			this.hotSpotY = arg2.g1();
 		}
 	}
 }
diff --git a/client/src/main/java/DelayedStateChange.java b/client/src/main/java/DelayedStateChange.java
index d5793c3..47d697e 100644
--- a/client/src/main/java/DelayedStateChange.java
+++ b/client/src/main/java/DelayedStateChange.java
@@ -19,35 +19,35 @@ public final class DelayedStateChange extends SecondaryNode {
 
 	@OriginalMember(owner = "client!da", name = "<init>", descriptor = "(II)V")
 	public DelayedStateChange(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		this.uid = (long) arg0 << 32 | (long) arg1;
+		this.key = (long) arg0 << 32 | (long) arg1;
 	}
 
 	@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
-	public final void method1007() {
-		this.aLong185 = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.aLong185;
-		Static140.aClass16_7.method798(this);
+	public final void pushClient() {
+		this.secondaryKey = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.secondaryKey;
+		Static140.clientQueue.addTail(this);
 	}
 
 	@OriginalMember(owner = "client!da", name = "b", descriptor = "(Z)J")
-	public final long method1009() {
-		return this.aLong185 & Long.MAX_VALUE;
+	public final long getTime() {
+		return this.secondaryKey & Long.MAX_VALUE;
 	}
 
 	@OriginalMember(owner = "client!da", name = "e", descriptor = "(I)I")
-	public final int method1011() {
-		return (int) (this.uid >>> 32 & 0xFFL);
+	public final int getType() {
+		return (int) (this.key >>> 32 & 0xFFL);
 	}
 
 	@OriginalMember(owner = "client!da", name = "f", descriptor = "(B)I")
-	public final int method1012() {
-		return (int) this.uid;
+	public final int getId() {
+		return (int) this.key;
 	}
 
 	@OriginalMember(owner = "client!da", name = "g", descriptor = "(B)V")
-	public final void method1017() {
-		this.aLong185 |= Long.MIN_VALUE;
-		if (this.method1009() == 0L) {
-			Static215.aClass16_9.method798(this);
+	public final void pushServer() {
+		this.secondaryKey |= Long.MIN_VALUE;
+		if (this.getTime() == 0L) {
+			Static215.serverQueue.addTail(this);
 		}
 	}
 }
diff --git a/client/src/main/java/Class3_Sub13.java b/client/src/main/java/EnumStringEntry.java
similarity index 64%
rename from client/src/main/java/Class3_Sub13.java
rename to client/src/main/java/EnumStringEntry.java
index a3b041b..6fe480d 100644
--- a/client/src/main/java/Class3_Sub13.java
+++ b/client/src/main/java/EnumStringEntry.java
@@ -3,13 +3,13 @@ import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
 
 @OriginalClass("client!hb")
-public final class Class3_Sub13 extends Node {
+public final class EnumStringEntry extends Node {
 
 	@OriginalMember(owner = "client!hb", name = "y", descriptor = "Lclient!na;")
-	public final JagString aClass100_503;
+	public final JagString value;
 
 	@OriginalMember(owner = "client!hb", name = "<init>", descriptor = "(Lclient!na;I)V")
-	public Class3_Sub13(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
-		this.aClass100_503 = arg0;
+	public EnumStringEntry(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
+		this.value = arg0;
 	}
 }
diff --git a/client/src/main/java/EnumType.java b/client/src/main/java/EnumType.java
index 8b2a01c..ccc91af 100644
--- a/client/src/main/java/EnumType.java
+++ b/client/src/main/java/EnumType.java
@@ -7,37 +7,37 @@ import org.openrs2.deob.annotation.Pc;
 public final class EnumType extends SecondaryNode {
 
 	@OriginalMember(owner = "client!ml", name = "N", descriptor = "I")
-	public int anInt3950;
+	public int valueType;
 
 	@OriginalMember(owner = "client!ml", name = "V", descriptor = "I")
-	public int anInt3957;
+	public int keyType;
 
 	@OriginalMember(owner = "client!ml", name = "X", descriptor = "Lclient!sc;")
-	public HashTable aClass133_16;
+	public HashTable table;
 
 	@OriginalMember(owner = "client!ml", name = "bb", descriptor = "Lclient!sc;")
-	private HashTable aClass133_17;
+	private HashTable inverseTable;
 
 	@OriginalMember(owner = "client!ml", name = "cb", descriptor = "I")
-	private int anInt3960;
+	private int defaultInt;
 
 	@OriginalMember(owner = "client!ml", name = "Z", descriptor = "Lclient!na;")
-	private JagString aClass100_766 = Static87.aClass100_494;
+	private JagString defaultString = Static87.NULL;
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(ILclient!wa;B)V")
-	private void method3084(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
+	private void decode(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 1) {
-			this.anInt3957 = arg1.g1();
+			this.keyType = arg1.g1();
 		} else if (arg0 == 2) {
-			this.anInt3950 = arg1.g1();
+			this.valueType = arg1.g1();
 		} else if (arg0 == 3) {
-			this.aClass100_766 = arg1.gjstr();
+			this.defaultString = arg1.gjstr();
 		} else if (arg0 == 4) {
-			this.anInt3960 = arg1.g4();
+			this.defaultInt = arg1.g4();
 		} else if (arg0 == 5 || arg0 == 6) {
-			@Pc(41) int local41 = arg1.g2();
-			this.aClass133_16 = new HashTable(Static165.clp2(local41));
-			for (@Pc(51) int local51 = 0; local51 < local41; local51++) {
+			@Pc(41) int size = arg1.g2();
+			this.table = new HashTable(Static165.clp2(size));
+			for (@Pc(51) int local51 = 0; local51 < size; local51++) {
 				@Pc(58) int local58 = arg1.g4();
 				@Pc(70) Node local70;
 				if (arg0 == 5) {
@@ -45,31 +45,31 @@ public final class EnumType extends SecondaryNode {
 				} else {
 					local70 = new IntNode(arg1.g4());
 				}
-				this.aClass133_16.method3862(local70, (long) local58);
+				this.table.put(local70, (long) local58);
 			}
 		}
 	}
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(IB)Lclient!na;")
-	public final JagString method3085(@OriginalArg(0) int arg0) {
-		if (this.aClass133_16 == null) {
-			return this.aClass100_766;
+	public final JagString getString(@OriginalArg(0) int arg0) {
+		if (this.table == null) {
+			return this.defaultString;
 		} else {
-			@Pc(26) StringNode local26 = (StringNode) this.aClass133_16.get((long) arg0);
-			return local26 == null ? this.aClass100_766 : local26.aClass100_980;
+			@Pc(26) StringNode local26 = (StringNode) this.table.get((long) arg0);
+			return local26 == null ? this.defaultString : local26.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!ml", name = "b", descriptor = "(Lclient!na;I)Z")
-	public final boolean method3086(@OriginalArg(0) JagString arg0) {
-		if (this.aClass133_16 == null) {
+	public final boolean containsValue(@OriginalArg(0) JagString arg0) {
+		if (this.table == null) {
 			return false;
 		}
-		if (this.aClass133_17 == null) {
-			this.method3087();
+		if (this.inverseTable == null) {
+			this.inverseStrings();
 		}
-		for (@Pc(38) Class3_Sub13 local38 = (Class3_Sub13) this.aClass133_17.get(arg0.method3118()); local38 != null; local38 = (Class3_Sub13) this.aClass133_17.method3867()) {
-			if (local38.aClass100_503.strEquals(arg0)) {
+		for (@Pc(38) EnumStringEntry node = (EnumStringEntry) this.inverseTable.get(arg0.longHashCode()); node != null; node = (EnumStringEntry) this.inverseTable.nextWithKey()) {
+			if (node.value.strEquals(arg0)) {
 				return true;
 			}
 		}
@@ -77,53 +77,53 @@ public final class EnumType extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!ml", name = "d", descriptor = "(I)V")
-	private void method3087() {
-		this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
-		for (@Pc(22) StringNode local22 = (StringNode) this.aClass133_16.method3859(); local22 != null; local22 = (StringNode) this.aClass133_16.method3861()) {
-			@Pc(36) Class3_Sub13 local36 = new Class3_Sub13(local22.aClass100_980, (int) local22.uid);
-			this.aClass133_17.method3862(local36, local22.aClass100_980.method3118());
+	private void inverseStrings() {
+		this.inverseTable = new HashTable(this.table.getBucketCount());
+		for (@Pc(22) StringNode node = (StringNode) this.table.head(); node != null; node = (StringNode) this.table.next()) {
+			@Pc(36) EnumStringEntry entry = new EnumStringEntry(node.value, (int) node.key);
+			this.inverseTable.put(entry, node.value.longHashCode());
 		}
 	}
 
 	@OriginalMember(owner = "client!ml", name = "c", descriptor = "(II)I")
-	public final int method3089(@OriginalArg(1) int arg0) {
-		if (this.aClass133_16 == null) {
-			return this.anInt3960;
+	public final int getInt(@OriginalArg(1) int arg0) {
+		if (this.table == null) {
+			return this.defaultInt;
 		} else {
-			@Pc(18) IntNode local18 = (IntNode) this.aClass133_16.get((long) arg0);
-			return local18 == null ? this.anInt3960 : local18.anInt3141;
+			@Pc(18) IntNode local18 = (IntNode) this.table.get((long) arg0);
+			return local18 == null ? this.defaultInt : local18.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!ml", name = "d", descriptor = "(II)Z")
-	public final boolean method3090(@OriginalArg(1) int arg0) {
-		if (this.aClass133_16 == null) {
+	public final boolean containsValue(@OriginalArg(1) int arg0) {
+		if (this.table == null) {
 			return false;
 		}
-		if (this.aClass133_17 == null) {
-			this.method3091();
+		if (this.inverseTable == null) {
+			this.inverseInts();
 		}
-		@Pc(34) IntNode local34 = (IntNode) this.aClass133_17.get((long) arg0);
-		return local34 != null;
+		@Pc(34) IntNode node = (IntNode) this.inverseTable.get((long) arg0);
+		return node != null;
 	}
 
 	@OriginalMember(owner = "client!ml", name = "e", descriptor = "(I)V")
-	private void method3091() {
-		this.aClass133_17 = new HashTable(this.aClass133_16.method3868());
-		for (@Pc(24) IntNode local24 = (IntNode) this.aClass133_16.method3859(); local24 != null; local24 = (IntNode) this.aClass133_16.method3861()) {
-			@Pc(34) IntNode local34 = new IntNode((int) local24.uid);
-			this.aClass133_17.method3862(local34, (long) local24.anInt3141);
+	private void inverseInts() {
+		this.inverseTable = new HashTable(this.table.getBucketCount());
+		for (@Pc(24) IntNode node = (IntNode) this.table.head(); node != null; node = (IntNode) this.table.next()) {
+			@Pc(34) IntNode inverseNode = new IntNode((int) node.key);
+			this.inverseTable.put(inverseNode, (long) node.value);
 		}
 	}
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method3094(@OriginalArg(0) Buffer arg0) {
+	public final void decode(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.g1();
 			if (local9 == 0) {
 				return;
 			}
-			this.method3084(local9, arg0);
+			this.decode(local9, arg0);
 		}
 	}
 }
diff --git a/client/src/main/java/FloType.java b/client/src/main/java/FloType.java
index cc9dd60..df7f6e6 100644
--- a/client/src/main/java/FloType.java
+++ b/client/src/main/java/FloType.java
@@ -13,7 +13,7 @@ public final class FloType {
 	public boolean aBoolean311 = true;
 
 	@OriginalMember(owner = "client!wl", name = "p", descriptor = "I")
-	public int anInt5892 = -1;
+	public int texture = -1;
 
 	@OriginalMember(owner = "client!wl", name = "f", descriptor = "I")
 	public int anInt5885 = 128;
@@ -52,11 +52,11 @@ public final class FloType {
 		if (arg0 == 1) {
 			this.anInt5899 = Static15.method492(arg1.g3());
 		} else if (arg0 == 2) {
-			this.anInt5892 = arg1.g1();
+			this.texture = arg1.g1();
 		} else if (arg0 == 3) {
-			this.anInt5892 = arg1.g2();
-			if (this.anInt5892 == 65535) {
-				this.anInt5892 = -1;
+			this.texture = arg1.g2();
+			if (this.texture == 65535) {
+				this.texture = -1;
 			}
 		} else if (arg0 == 5) {
 			this.aBoolean312 = false;
diff --git a/client/src/main/java/FluType.java b/client/src/main/java/FluType.java
index 12213a0..ff3c3ec 100644
--- a/client/src/main/java/FluType.java
+++ b/client/src/main/java/FluType.java
@@ -7,19 +7,19 @@ import org.openrs2.deob.annotation.Pc;
 public final class FluType {
 
 	@OriginalMember(owner = "client!ni", name = "d", descriptor = "I")
-	public int anInt4149;
+	public int saturation;
 
 	@OriginalMember(owner = "client!ni", name = "i", descriptor = "I")
-	public int anInt4154;
+	public int weightedHue;
 
 	@OriginalMember(owner = "client!ni", name = "r", descriptor = "I")
-	public int anInt4158;
+	public int lightness;
 
 	@OriginalMember(owner = "client!ni", name = "u", descriptor = "I")
-	public int anInt4161;
+	public int chroma;
 
 	@OriginalMember(owner = "client!ni", name = "b", descriptor = "I")
-	private int anInt4147 = 0;
+	private int color = 0;
 
 	@OriginalMember(owner = "client!ni", name = "m", descriptor = "I")
 	public int anInt4155 = -1;
@@ -31,7 +31,7 @@ public final class FluType {
 	public boolean aBoolean198 = true;
 
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(IB)V")
-	private void method3216(@OriginalArg(0) int arg0) {
+	private void rgbToHsl(@OriginalArg(0) int arg0) {
 		@Pc(8) double local8 = (double) (arg0 >> 16 & 0xFF) / 256.0D;
 		@Pc(21) double local21 = (double) (arg0 >> 8 & 0xFF) / 256.0D;
 		@Pc(23) double local23 = local8;
@@ -68,26 +68,26 @@ public final class FluType {
 			}
 		}
 		if (local74 > 0.5D) {
-			this.anInt4161 = (int) (local68 * (1.0D - local74) * 512.0D);
+			this.chroma = (int) (local68 * (1.0D - local74) * 512.0D);
 		} else {
-			this.anInt4161 = (int) (local68 * local74 * 512.0D);
+			this.chroma = (int) (local68 * local74 * 512.0D);
 		}
-		if (this.anInt4161 < 1) {
-			this.anInt4161 = 1;
+		if (this.chroma < 1) {
+			this.chroma = 1;
 		}
-		this.anInt4149 = (int) (local68 * 256.0D);
-		this.anInt4158 = (int) (local74 * 256.0D);
-		if (this.anInt4158 < 0) {
-			this.anInt4158 = 0;
-		} else if (this.anInt4158 > 255) {
-			this.anInt4158 = 255;
+		this.saturation = (int) (local68 * 256.0D);
+		this.lightness = (int) (local74 * 256.0D);
+		if (this.lightness < 0) {
+			this.lightness = 0;
+		} else if (this.lightness > 255) {
+			this.lightness = 255;
 		}
 		local54 /= 6.0D;
-		this.anInt4154 = (int) ((double) this.anInt4161 * local54);
-		if (this.anInt4149 < 0) {
-			this.anInt4149 = 0;
-		} else if (this.anInt4149 > 255) {
-			this.anInt4149 = 255;
+		this.weightedHue = (int) ((double) this.chroma * local54);
+		if (this.saturation < 0) {
+			this.saturation = 0;
+		} else if (this.saturation > 255) {
+			this.saturation = 255;
 		}
 	}
 
@@ -105,8 +105,8 @@ public final class FluType {
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(BILclient!wa;I)V")
 	private void method3220(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
 		if (arg0 == 1) {
-			this.anInt4147 = arg1.g3();
-			this.method3216(this.anInt4147);
+			this.color = arg1.g3();
+			this.rgbToHsl(this.color);
 		} else if (arg0 == 2) {
 			this.anInt4155 = arg1.g2();
 			if (this.anInt4155 == 65535) {
diff --git a/client/src/main/java/Font.java b/client/src/main/java/Font.java
index ad97d4f..e12ee63 100644
--- a/client/src/main/java/Font.java
+++ b/client/src/main/java/Font.java
@@ -8,25 +8,25 @@ import org.openrs2.deob.annotation.Pc;
 public abstract class Font extends SecondaryNode {
 
 	@OriginalMember(owner = "client!rk", name = "W", descriptor = "[I")
-	private int[] anIntArray346;
+	private int[] nameIconHeights;
 
 	@OriginalMember(owner = "client!rk", name = "gb", descriptor = "[B")
-	private byte[] aByteArray50;
+	private byte[] kerning;
 
 	@OriginalMember(owner = "client!rk", name = "jb", descriptor = "[I")
-	private int[] anIntArray348;
+	private int[] glyphWidths;
 
 	@OriginalMember(owner = "client!rk", name = "nb", descriptor = "[Lclient!ok;")
-	private IndexedSprite[] aClass36Array11;
+	private IndexedSprite[] nameIcons;
 
 	@OriginalMember(owner = "client!rk", name = "ab", descriptor = "I")
-	public int anInt3626 = 0;
+	public int lineHeight = 0;
 
 	@OriginalMember(owner = "client!rk", name = "S", descriptor = "[I")
-	private int[] anIntArray344;
+	private int[] spriteXOffsets;
 
 	@OriginalMember(owner = "client!rk", name = "db", descriptor = "[I")
-	private int[] anIntArray347;
+	private int[] spriteYOffsets;
 
 	@OriginalMember(owner = "client!rk", name = "I", descriptor = "[I")
 	protected int[] spriteInnerWidths;
@@ -35,45 +35,45 @@ public abstract class Font extends SecondaryNode {
 	protected int[] spriteInnerHeights;
 
 	@OriginalMember(owner = "client!rk", name = "V", descriptor = "I")
-	private int anInt3625;
+	private int paragraphTopPadding;
 
 	@OriginalMember(owner = "client!rk", name = "J", descriptor = "I")
-	private int anInt3624;
+	private int paragraphBottomPadding;
 
 	@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B[I[I[I[I)V")
 	protected Font(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) int[] arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
-		this.anIntArray344 = arg1;
-		this.anIntArray347 = arg2;
+		this.spriteXOffsets = arg1;
+		this.spriteYOffsets = arg2;
 		this.spriteInnerWidths = arg3;
 		this.spriteInnerHeights = arg4;
-		this.method2876(arg0);
+		this.decode(arg0);
 		@Pc(21) int local21 = Integer.MAX_VALUE;
 		@Pc(23) int local23 = Integer.MIN_VALUE;
 		for (@Pc(25) int local25 = 0; local25 < 256; local25++) {
-			if (this.anIntArray347[local25] < local21 && this.spriteInnerHeights[local25] != 0) {
-				local21 = this.anIntArray347[local25];
+			if (this.spriteYOffsets[local25] < local21 && this.spriteInnerHeights[local25] != 0) {
+				local21 = this.spriteYOffsets[local25];
 			}
-			if (this.anIntArray347[local25] + this.spriteInnerHeights[local25] > local23) {
-				local23 = this.anIntArray347[local25] + this.spriteInnerHeights[local25];
+			if (this.spriteYOffsets[local25] + this.spriteInnerHeights[local25] > local23) {
+				local23 = this.spriteYOffsets[local25] + this.spriteInnerHeights[local25];
 			}
 		}
-		this.anInt3625 = this.anInt3626 - local21;
-		this.anInt3624 = local23 - this.anInt3626;
+		this.paragraphTopPadding = this.lineHeight - local21;
+		this.paragraphBottomPadding = local23 - this.lineHeight;
 	}
 
 	@OriginalMember(owner = "client!rk", name = "<init>", descriptor = "([B)V")
 	public Font(@OriginalArg(0) byte[] arg0) {
-		this.method2876(arg0);
+		this.decode(arg0);
 	}
 
 	@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.method2869(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+		return this.renderParagraphAlpha(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;II)V")
-	private void method2853(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(4) int local4 = arg2 - this.anInt3626;
+	private void render(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+		@Pc(4) int local4 = arg2 - this.lineHeight;
 		@Pc(6) int local6 = -1;
 		@Pc(8) int local8 = 0;
 		@Pc(12) int local12 = arg0.length();
@@ -86,38 +86,38 @@ public abstract class Font extends SecondaryNode {
 				if (local22 == 62 && local6 != -1) {
 					@Pc(42) JagString local42 = arg0.substring(local14, local6 + 1);
 					local6 = -1;
-					if (local42.strEquals(Static218.aClass100_696)) {
+					if (local42.strEquals(Static218.TAG_LT)) {
 						local22 = 60;
-					} else if (local42.strEquals(Static218.aClass100_695)) {
+					} else if (local42.strEquals(Static218.TAG_GT)) {
 						local22 = 62;
-					} else if (local42.strEquals(Static218.aClass100_710)) {
+					} else if (local42.strEquals(Static218.TAG_NBSP)) {
 						local22 = 160;
-					} else if (local42.strEquals(Static218.aClass100_698)) {
+					} else if (local42.strEquals(Static218.TAB_SHY)) {
 						local22 = 173;
-					} else if (local42.strEquals(Static218.aClass100_708)) {
+					} else if (local42.strEquals(Static218.TAB_TIMES)) {
 						local22 = 215;
-					} else if (local42.strEquals(Static218.aClass100_702)) {
+					} else if (local42.strEquals(Static218.TAB_EURO)) {
 						local22 = 128;
-					} else if (local42.strEquals(Static218.aClass100_716)) {
+					} else if (local42.strEquals(Static218.TAB_COPY)) {
 						local22 = 169;
 					} else {
-						if (!local42.strEquals(Static218.aClass100_718)) {
-							if (local42.method3138(Static218.aClass100_715)) {
+						if (!local42.strEquals(Static218.TAG_REG)) {
+							if (local42.startsWith(Static218.TAG_IMG)) {
 								try {
-									local120 = local42.method3136(4).parseInt();
-									@Pc(125) IndexedSprite local125 = this.aClass36Array11[local120];
-									@Pc(136) int local136 = this.anIntArray346 == null ? local125.anInt4276 : this.anIntArray346[local120];
-									if (Static218.anInt3631 == 256) {
-										local125.renderTransparent(arg1, local4 + this.anInt3626 - local136);
+									local120 = local42.substring(4).parseInt();
+									@Pc(125) IndexedSprite local125 = this.nameIcons[local120];
+									@Pc(136) int local136 = this.nameIconHeights == null ? local125.anInt4276 : this.nameIconHeights[local120];
+									if (Static218.alphaOverride == 256) {
+										local125.renderTransparent(arg1, local4 + this.lineHeight - local136);
 									} else {
-										local125.method3335(arg1, local4 + this.anInt3626 - local136, Static218.anInt3631);
+										local125.method3335(arg1, local4 + this.lineHeight - local136, Static218.alphaOverride);
 									}
-									arg1 += local125.anInt4279;
+									arg1 += local125.innerWidth;
 									local8 = 0;
 								} catch (@Pc(168) Exception local168) {
 								}
 							} else {
-								this.method2861(local42);
+								this.parseTag(local42);
 							}
 							continue;
 						}
@@ -125,41 +125,41 @@ public abstract class Font extends SecondaryNode {
 					}
 				}
 				if (local6 == -1) {
-					if (this.aByteArray50 != null && local8 != 0) {
-						arg1 += this.aByteArray50[(local8 << 8) + local22];
+					if (this.kerning != null && local8 != 0) {
+						arg1 += this.kerning[(local8 << 8) + local22];
 					}
 					@Pc(197) int local197 = this.spriteInnerWidths[local22];
 					local120 = this.spriteInnerHeights[local22];
 					if (local22 == 32) {
-						if (Static218.anInt3636 > 0) {
-							Static218.anInt3629 += Static218.anInt3636;
+						if (Static218.spaceWidth > 0) {
+							Static218.anInt3629 += Static218.spaceWidth;
 							arg1 += Static218.anInt3629 >> 8;
 							Static218.anInt3629 &= 0xFF;
 						}
-					} else if (Static218.anInt3631 == 256) {
-						if (Static218.anInt3634 != -1) {
-							this.renderGlyph(local22, arg1 + this.anIntArray344[local22] + 1, local4 + this.anIntArray347[local22] + 1, local197, local120, Static218.anInt3634);
+					} else if (Static218.alphaOverride == 256) {
+						if (Static218.shadowColorOverride != -1) {
+							this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride);
 						}
-						this.renderGlyph(local22, arg1 + this.anIntArray344[local22], local4 + this.anIntArray347[local22], local197, local120, Static218.anInt3635);
+						this.renderGlyph(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride);
 					} else {
-						if (Static218.anInt3634 != -1) {
-							this.renderGlyphTransparent(local22, arg1 + this.anIntArray344[local22] + 1, local4 + this.anIntArray347[local22] + 1, local197, local120, Static218.anInt3634, Static218.anInt3631);
+						if (Static218.shadowColorOverride != -1) {
+							this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22] + 1, local4 + this.spriteYOffsets[local22] + 1, local197, local120, Static218.shadowColorOverride, Static218.alphaOverride);
 						}
-						this.renderGlyphTransparent(local22, arg1 + this.anIntArray344[local22], local4 + this.anIntArray347[local22], local197, local120, Static218.anInt3635, Static218.anInt3631);
+						this.renderGlyphTransparent(local22, arg1 + this.spriteXOffsets[local22], local4 + this.spriteYOffsets[local22], local197, local120, Static218.colorOverride, Static218.alphaOverride);
 					}
-					@Pc(323) int local323 = this.anIntArray348[local22];
-					if (Static218.anInt3627 != -1) {
+					@Pc(323) int local323 = this.glyphWidths[local22];
+					if (Static218.strikethroughColor != -1) {
 						if (GlRenderer.enabled) {
-							Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627);
+							Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
 						} else {
-							Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627);
+							Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local323, Static218.strikethroughColor);
 						}
 					}
-					if (Static218.anInt3628 != -1) {
+					if (Static218.underlineColor != -1) {
 						if (GlRenderer.enabled) {
-							Static46.method1174(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628);
+							Static46.method1174(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
 						} else {
-							Static129.method2489(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628);
+							Static129.method2489(arg1, local4 + this.lineHeight + 1, local323, Static218.underlineColor);
 						}
 					}
 					arg1 += local323;
@@ -177,10 +177,10 @@ public abstract class Font extends SecondaryNode {
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;I)I")
 	public final int method2856(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
-		@Pc(10) int local10 = this.method2867(arg0, new int[] { arg1 }, Static218.aClass100Array110);
+		@Pc(10) int local10 = this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines);
 		@Pc(12) int local12 = 0;
 		for (@Pc(14) int local14 = 0; local14 < local10; local14++) {
-			@Pc(23) int local23 = this.method2858(Static218.aClass100Array110[local14]);
+			@Pc(23) int local23 = this.getStringWidth(Static218.lines[local14]);
 			if (local23 > local12) {
 				local12 = local23;
 			}
@@ -191,13 +191,13 @@ public abstract class Font extends SecondaryNode {
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIII)V")
 	public final void method2857(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (arg0 != null) {
-			this.method2874(arg3, arg4);
-			this.method2853(arg0, arg1, arg2);
+			this.setColors(arg3, arg4);
+			this.render(arg0, arg1, arg2);
 		}
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;)I")
-	public final int method2858(@OriginalArg(0) JagString arg0) {
+	public final int getStringWidth(@OriginalArg(0) JagString arg0) {
 		if (arg0 == null) {
 			return 0;
 		}
@@ -213,26 +213,26 @@ public abstract class Font extends SecondaryNode {
 				if (local23 == 62 && local5 != -1) {
 					@Pc(43) JagString local43 = arg0.substring(local15, local5 + 1);
 					local5 = -1;
-					if (local43.strEquals(Static218.aClass100_696)) {
+					if (local43.strEquals(Static218.TAG_LT)) {
 						local23 = 60;
-					} else if (local43.strEquals(Static218.aClass100_695)) {
+					} else if (local43.strEquals(Static218.TAG_GT)) {
 						local23 = 62;
-					} else if (local43.strEquals(Static218.aClass100_710)) {
+					} else if (local43.strEquals(Static218.TAG_NBSP)) {
 						local23 = 160;
-					} else if (local43.strEquals(Static218.aClass100_698)) {
+					} else if (local43.strEquals(Static218.TAB_SHY)) {
 						local23 = 173;
-					} else if (local43.strEquals(Static218.aClass100_708)) {
+					} else if (local43.strEquals(Static218.TAB_TIMES)) {
 						local23 = 215;
-					} else if (local43.strEquals(Static218.aClass100_702)) {
+					} else if (local43.strEquals(Static218.TAB_EURO)) {
 						local23 = 128;
-					} else if (local43.strEquals(Static218.aClass100_716)) {
+					} else if (local43.strEquals(Static218.TAB_COPY)) {
 						local23 = 169;
 					} else {
-						if (!local43.strEquals(Static218.aClass100_718)) {
-							if (local43.method3138(Static218.aClass100_715)) {
+						if (!local43.strEquals(Static218.TAG_REG)) {
+							if (local43.startsWith(Static218.TAG_IMG)) {
 								try {
-									@Pc(121) int local121 = local43.method3136(4).parseInt();
-									local9 += this.aClass36Array11[local121].anInt4279;
+									@Pc(121) int local121 = local43.substring(4).parseInt();
+									local9 += this.nameIcons[local121].innerWidth;
 									local7 = 0;
 								} catch (@Pc(133) Exception local133) {
 								}
@@ -243,9 +243,9 @@ public abstract class Font extends SecondaryNode {
 					}
 				}
 				if (local5 == -1) {
-					local9 += this.anIntArray348[local23];
-					if (this.aByteArray50 != null && local7 != 0) {
-						local9 += this.aByteArray50[(local7 << 8) + local23];
+					local9 += this.glyphWidths[local23];
+					if (this.kerning != null && local7 != 0) {
+						local9 += this.kerning[(local7 << 8) + local23];
 					}
 					local7 = local23;
 				}
@@ -260,7 +260,7 @@ public abstract class Font extends SecondaryNode {
 			return 0;
 		}
 		arg3.setSeed((long) arg4);
-		this.method2877(16777215, 0, (arg3.nextInt() & 0x1F) + 192);
+		this.setColors(16777215, 0, (arg3.nextInt() & 0x1F) + 192);
 		@Pc(21) int local21 = arg0.length();
 		@Pc(24) int[] local24 = new int[local21];
 		@Pc(26) int local26 = 0;
@@ -270,66 +270,66 @@ public abstract class Font extends SecondaryNode {
 				local26++;
 			}
 		}
-		this.method2879(arg0, arg1, arg2, local24, null);
+		this.renderOffset(arg0, arg1, arg2, local24, null);
 		return local26;
 	}
 
 	@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;I)I")
-	public final int method2860(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
-		return this.method2867(arg0, new int[] { arg1 }, Static218.aClass100Array110);
+	public final int getParagraphLineCount(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
+		return this.splitParagraph(arg0, new int[] { arg1 }, Static218.lines);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;)V")
-	private void method2861(@OriginalArg(0) JagString arg0) {
+	private void parseTag(@OriginalArg(0) JagString arg0) {
 		try {
-			if (arg0.method3138(Static218.aClass100_705)) {
-				Static218.anInt3635 = arg0.method3136(4).method3110(16);
-			} else if (arg0.strEquals(Static218.aClass100_703)) {
-				Static218.anInt3635 = Static218.anInt3630;
-			} else if (arg0.method3138(Static218.aClass100_699)) {
-				Static218.anInt3631 = arg0.method3136(6).parseInt();
-			} else if (arg0.strEquals(Static218.aClass100_709)) {
-				Static218.anInt3631 = Static218.anInt3632;
-			} else if (arg0.method3138(Static218.aClass100_701)) {
-				Static218.anInt3627 = arg0.method3136(4).method3110(16);
-			} else if (arg0.strEquals(Static218.aClass100_719)) {
-				Static218.anInt3627 = 8388608;
-			} else if (arg0.strEquals(Static218.aClass100_717)) {
-				Static218.anInt3627 = -1;
-			} else if (arg0.method3138(Static218.aClass100_700)) {
-				Static218.anInt3628 = arg0.method3136(2).method3110(16);
-			} else if (arg0.strEquals(Static218.aClass100_707)) {
-				Static218.anInt3628 = 0;
-			} else if (arg0.strEquals(Static218.aClass100_712)) {
-				Static218.anInt3628 = -1;
-			} else if (arg0.method3138(Static218.aClass100_697)) {
-				Static218.anInt3634 = arg0.method3136(5).method3110(16);
-			} else if (arg0.strEquals(Static218.aClass100_714)) {
-				Static218.anInt3634 = 0;
-			} else if (arg0.strEquals(Static218.aClass100_704)) {
-				Static218.anInt3634 = Static218.anInt3633;
-			} else if (arg0.strEquals(Static218.aClass100_713)) {
-				this.method2877(Static218.anInt3630, Static218.anInt3633, Static218.anInt3632);
+			if (arg0.startsWith(Static218.TAG_COL1)) {
+				Static218.colorOverride = arg0.substring(4).parseHexString(16);
+			} else if (arg0.strEquals(Static218.TAG_COL2)) {
+				Static218.colorOverride = Static218.color;
+			} else if (arg0.startsWith(Static218.TAG_TRANS1)) {
+				Static218.alphaOverride = arg0.substring(6).parseInt();
+			} else if (arg0.strEquals(Static218.TAG_TRANS2)) {
+				Static218.alphaOverride = Static218.alpha;
+			} else if (arg0.startsWith(Static218.TAG_STR1)) {
+				Static218.strikethroughColor = arg0.substring(4).parseHexString(16);
+			} else if (arg0.strEquals(Static218.TAG_STR2)) {
+				Static218.strikethroughColor = 0x800000;
+			} else if (arg0.strEquals(Static218.TAG_STR3)) {
+				Static218.strikethroughColor = -1;
+			} else if (arg0.startsWith(Static218.TAG_U1)) {
+				Static218.underlineColor = arg0.substring(2).parseHexString(16);
+			} else if (arg0.strEquals(Static218.TAG_U2)) {
+				Static218.underlineColor = 0;
+			} else if (arg0.strEquals(Static218.TAG_U3)) {
+				Static218.underlineColor = -1;
+			} else if (arg0.startsWith(Static218.TAG_SHAD1)) {
+				Static218.shadowColorOverride = arg0.substring(5).parseHexString(16);
+			} else if (arg0.strEquals(Static218.TAG_SHAD2)) {
+				Static218.shadowColorOverride = 0;
+			} else if (arg0.strEquals(Static218.TAG_SHAD3)) {
+				Static218.shadowColorOverride = Static218.shadowColor;
+			} else if (arg0.strEquals(Static218.TAG_BR)) {
+				this.setColors(Static218.color, Static218.shadowColor, Static218.alpha);
 			}
 		} catch (@Pc(144) Exception local144) {
 		}
 	}
 
 	@OriginalMember(owner = "client!rk", name = "d", descriptor = "(I)I")
-	private int method2863(@OriginalArg(0) int arg0) {
-		return this.anIntArray348[arg0 & 0xFF];
+	private int getGlyphWidth(@OriginalArg(0) int arg0) {
+		return this.glyphWidths[arg0 & 0xFF];
 	}
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;IIII)V")
-	public final void method2864(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public final void renderRight(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (arg0 != null) {
-			this.method2874(arg3, arg4);
-			this.method2853(arg0, arg1 - this.method2858(arg0), arg2);
+			this.setColors(arg3, arg4);
+			this.render(arg0, arg1 - this.getStringWidth(arg0), arg2);
 		}
 	}
 
 	@OriginalMember(owner = "client!rk", name = "d", descriptor = "(Lclient!na;I)V")
-	private void method2866(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
+	private void justify(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1) {
 		@Pc(1) int local1 = 0;
 		@Pc(3) boolean local3 = false;
 		@Pc(7) int local7 = arg0.length();
@@ -344,16 +344,16 @@ public abstract class Font extends SecondaryNode {
 			}
 		}
 		if (local1 > 0) {
-			Static218.anInt3636 = (arg1 - this.method2858(arg0) << 8) / local1;
+			Static218.spaceWidth = (arg1 - this.getStringWidth(arg0) << 8) / local1;
 		}
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;[I[Lclient!na;)I")
-	public final int method2867(@OriginalArg(0) JagString arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) JagString[] arg2) {
+	public final int splitParagraph(@OriginalArg(0) JagString arg0, @OriginalArg(1) int[] arg1, @OriginalArg(2) JagString[] arg2) {
 		if (arg0 == null) {
 			return 0;
 		}
-		Static218.aClass100_720.method3133(0);
+		Static218.buffer.method3133(0);
 		@Pc(9) int local9 = 0;
 		@Pc(11) int local11 = 0;
 		@Pc(13) int local13 = -1;
@@ -371,73 +371,73 @@ public abstract class Font extends SecondaryNode {
 				if (local37 == 62 && local19 != -1) {
 					@Pc(57) JagString local57 = arg0.substring(local29, local19 + 1);
 					local19 = -1;
-					Static218.aClass100_720.append(60);
-					Static218.aClass100_720.method3113(local57);
-					Static218.aClass100_720.append(62);
-					if (local57.strEquals(Static218.aClass100_713)) {
+					Static218.buffer.append(60);
+					Static218.buffer.method3113(local57);
+					Static218.buffer.append(62);
+					if (local57.strEquals(Static218.TAG_BR)) {
 						if (arg2[local23] == null) {
-							arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11);
+							arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11);
 						} else {
 							arg2[local23].method3133(0);
-							arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length());
+							arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length());
 						}
 						local23++;
-						local11 = Static218.aClass100_720.length();
+						local11 = Static218.buffer.length();
 						local9 = 0;
 						local13 = -1;
 						local21 = 0;
-					} else if (local57.strEquals(Static218.aClass100_696)) {
-						local9 += this.method2863(60);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 60];
+					} else if (local57.strEquals(Static218.TAG_LT)) {
+						local9 += this.getGlyphWidth(60);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 60];
 						}
 						local21 = 60;
-					} else if (local57.strEquals(Static218.aClass100_695)) {
-						local9 += this.method2863(62);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 62];
+					} else if (local57.strEquals(Static218.TAG_GT)) {
+						local9 += this.getGlyphWidth(62);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 62];
 						}
 						local21 = 62;
-					} else if (local57.strEquals(Static218.aClass100_710)) {
-						local9 += this.method2863(160);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 160];
+					} else if (local57.strEquals(Static218.TAG_NBSP)) {
+						local9 += this.getGlyphWidth(160);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 160];
 						}
 						local21 = 160;
-					} else if (local57.strEquals(Static218.aClass100_698)) {
-						local9 += this.method2863(173);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 173];
+					} else if (local57.strEquals(Static218.TAB_SHY)) {
+						local9 += this.getGlyphWidth(173);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 173];
 						}
 						local21 = 173;
-					} else if (local57.strEquals(Static218.aClass100_708)) {
-						local9 += this.method2863(215);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 215];
+					} else if (local57.strEquals(Static218.TAB_TIMES)) {
+						local9 += this.getGlyphWidth(215);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 215];
 						}
 						local21 = 215;
-					} else if (local57.strEquals(Static218.aClass100_702)) {
-						local9 += this.method2863(128);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 128];
+					} else if (local57.strEquals(Static218.TAB_EURO)) {
+						local9 += this.getGlyphWidth(128);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 128];
 						}
 						local21 = 128;
-					} else if (local57.strEquals(Static218.aClass100_716)) {
-						local9 += this.method2863(169);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 169];
+					} else if (local57.strEquals(Static218.TAB_COPY)) {
+						local9 += this.getGlyphWidth(169);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 169];
 						}
 						local21 = 169;
-					} else if (local57.strEquals(Static218.aClass100_718)) {
-						local9 += this.method2863(174);
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + 174];
+					} else if (local57.strEquals(Static218.TAG_REG)) {
+						local9 += this.getGlyphWidth(174);
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + 174];
 						}
 						local21 = 174;
-					} else if (local57.method3138(Static218.aClass100_715)) {
+					} else if (local57.startsWith(Static218.TAG_IMG)) {
 						try {
-							@Pc(377) int local377 = local57.method3136(4).parseInt();
-							local9 += this.aClass36Array11[local377].anInt4279;
+							@Pc(377) int local377 = local57.substring(4).parseInt();
+							local9 += this.nameIcons[local377].innerWidth;
 							local21 = 0;
 						} catch (@Pc(389) Exception local389) {
 						}
@@ -446,24 +446,24 @@ public abstract class Font extends SecondaryNode {
 				}
 				if (local19 == -1) {
 					if (local37 != 0) {
-						Static218.aClass100_720.append(local37);
-						local9 += this.anIntArray348[local37];
-						if (this.aByteArray50 != null && local21 != 0) {
-							local9 += this.aByteArray50[(local21 << 8) + local37];
+						Static218.buffer.append(local37);
+						local9 += this.glyphWidths[local37];
+						if (this.kerning != null && local21 != 0) {
+							local9 += this.kerning[(local21 << 8) + local37];
 						}
 						local21 = local37;
 					}
 					if (local37 == 32) {
-						local13 = Static218.aClass100_720.length();
+						local13 = Static218.buffer.length();
 						local15 = local9;
 						local17 = 1;
 					}
 					if (arg1 != null && local9 > arg1[local23 < arg1.length ? local23 : arg1.length - 1] && local13 >= 0) {
 						if (arg2[local23] == null) {
-							arg2[local23] = Static218.aClass100_720.method3143().substring(local13 - local17, local11);
+							arg2[local23] = Static218.buffer.asString().substring(local13 - local17, local11);
 						} else {
 							arg2[local23].method3133(0);
-							arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, local13 - local17);
+							arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, local13 - local17);
 						}
 						local23++;
 						local11 = local13;
@@ -472,19 +472,19 @@ public abstract class Font extends SecondaryNode {
 						local21 = 0;
 					}
 					if (local37 == 45) {
-						local13 = Static218.aClass100_720.length();
+						local13 = Static218.buffer.length();
 						local15 = local9;
 						local17 = 0;
 					}
 				}
 			}
 		}
-		if (Static218.aClass100_720.length() > local11) {
+		if (Static218.buffer.length() > local11) {
 			if (arg2[local23] == null) {
-				arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11);
+				arg2[local23] = Static218.buffer.asString().substring(Static218.buffer.length(), local11);
 			} else {
 				arg2[local23].method3133(0);
-				arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length());
+				arg2[local23] = arg2[local23].method3122(Static218.buffer, local11, Static218.buffer.length());
 			}
 			local23++;
 		}
@@ -492,11 +492,11 @@ public abstract class Font extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIII)V")
-	public final void method2868(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
+	public final void renderShake(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) {
 		if (arg0 == null) {
 			return;
 		}
-		this.method2874(arg3, 0);
+		this.setColors(arg3, 0);
 		@Pc(13) double local13 = 7.0D - (double) arg5 / 8.0D;
 		if (local13 < 0.0D) {
 			local13 = 0.0D;
@@ -506,55 +506,55 @@ public abstract class Font extends SecondaryNode {
 		for (@Pc(28) int local28 = 0; local28 < local23; local28++) {
 			local26[local28] = (int) (Math.sin((double) local28 / 1.5D + (double) arg4 / 1.0D) * local13);
 		}
-		this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, null, local26);
+		this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, null, local26);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIIIIIIII)I")
-	public final int method2869(@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(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
+	public final int renderParagraphAlpha(@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(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
 		if (arg0 == null) {
 			return 0;
 		}
-		this.method2877(arg5, arg6, 256);
+		this.setColors(arg5, arg6, 256);
 		if (arg9 == 0) {
-			arg9 = this.anInt3626;
+			arg9 = this.lineHeight;
 		}
 		@Pc(20) int[] local20 = new int[] { arg3 };
-		if (arg4 < this.anInt3625 + this.anInt3624 + arg9 && arg4 < arg9 + arg9) {
+		if (arg4 < this.paragraphTopPadding + this.paragraphBottomPadding + arg9 && arg4 < arg9 + arg9) {
 			local20 = null;
 		}
-		@Pc(42) int local42 = this.method2867(arg0, local20, Static218.aClass100Array110);
+		@Pc(42) int local42 = this.splitParagraph(arg0, local20, Static218.lines);
 		if (arg8 == 3 && local42 == 1) {
 			arg8 = 1;
 		}
 		@Pc(57) int local57;
 		@Pc(118) int local118;
 		if (arg8 == 0) {
-			local57 = arg2 + this.anInt3625;
+			local57 = arg2 + this.paragraphTopPadding;
 		} else if (arg8 == 1) {
-			local57 = arg2 + this.anInt3625 + (arg4 - this.anInt3625 - this.anInt3624 - (local42 - 1) * arg9) / 2;
+			local57 = arg2 + this.paragraphTopPadding + (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding - (local42 - 1) * arg9) / 2;
 		} else if (arg8 == 2) {
-			local57 = arg2 + arg4 - this.anInt3624 - (local42 - 1) * arg9;
+			local57 = arg2 + arg4 - this.paragraphBottomPadding - (local42 - 1) * arg9;
 		} else {
-			local118 = (arg4 - this.anInt3625 - this.anInt3624 - (local42 - 1) * arg9) / (local42 + 1);
+			local118 = (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding - (local42 - 1) * arg9) / (local42 + 1);
 			if (local118 < 0) {
 				local118 = 0;
 			}
-			local57 = arg2 + this.anInt3625 + local118;
+			local57 = arg2 + this.paragraphTopPadding + local118;
 			arg9 += local118;
 		}
 		for (local118 = 0; local118 < local42; local118++) {
 			if (arg7 == 0) {
-				this.method2853(Static218.aClass100Array110[local118], arg1, local57);
+				this.render(Static218.lines[local118], arg1, local57);
 			} else if (arg7 == 1) {
-				this.method2853(Static218.aClass100Array110[local118], arg1 + (arg3 - this.method2858(Static218.aClass100Array110[local118])) / 2, local57);
+				this.render(Static218.lines[local118], arg1 + (arg3 - this.getStringWidth(Static218.lines[local118])) / 2, local57);
 			} else if (arg7 == 2) {
-				this.method2853(Static218.aClass100Array110[local118], arg1 + arg3 - this.method2858(Static218.aClass100Array110[local118]), local57);
+				this.render(Static218.lines[local118], arg1 + arg3 - this.getStringWidth(Static218.lines[local118]), local57);
 			} else if (local118 == local42 - 1) {
-				this.method2853(Static218.aClass100Array110[local118], arg1, local57);
+				this.render(Static218.lines[local118], arg1, local57);
 			} else {
-				this.method2866(Static218.aClass100Array110[local118], arg3);
-				this.method2853(Static218.aClass100Array110[local118], arg1, local57);
-				Static218.anInt3636 = 0;
+				this.justify(Static218.lines[local118], arg3);
+				this.render(Static218.lines[local118], arg1, local57);
+				Static218.spaceWidth = 0;
 			}
 			local57 += arg9;
 		}
@@ -562,11 +562,11 @@ public abstract class Font extends SecondaryNode {
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;IIIII)V")
-	public final void method2871(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
+	public final void renderWave2(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
 		if (arg0 == null) {
 			return;
 		}
-		this.method2874(arg3, 0);
+		this.setColors(arg3, 0);
 		@Pc(10) int local10 = arg0.length();
 		@Pc(13) int[] local13 = new int[local10];
 		@Pc(16) int[] local16 = new int[local10];
@@ -574,68 +574,68 @@ public abstract class Font extends SecondaryNode {
 			local13[local18] = (int) (Math.sin((double) local18 / 5.0D + (double) arg4 / 5.0D) * 5.0D);
 			local16[local18] = (int) (Math.sin((double) local18 / 3.0D + (double) arg4 / 5.0D) * 5.0D);
 		}
-		this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, local13, local16);
+		this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, local13, local16);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "b", descriptor = "(Lclient!na;IIIII)V")
-	public final void method2872(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
+	public final void renderWave(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) {
 		if (arg0 == null) {
 			return;
 		}
-		this.method2874(arg3, 0);
+		this.setColors(arg3, 0);
 		@Pc(10) int local10 = arg0.length();
 		@Pc(13) int[] local13 = new int[local10];
 		for (@Pc(15) int local15 = 0; local15 < local10; local15++) {
 			local13[local15] = (int) (Math.sin((double) local15 / 2.0D + (double) arg4 / 5.0D) * 5.0D);
 		}
-		this.method2879(arg0, arg1 - this.method2858(arg0) / 2, arg2, null, local13);
+		this.renderOffset(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2, null, local13);
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "([Lclient!ok;[I)V")
-	public final void method2873(@OriginalArg(0) IndexedSprite[] arg0, @OriginalArg(1) int[] arg1) {
+	public final void setNameIcons(@OriginalArg(0) IndexedSprite[] arg0, @OriginalArg(1) int[] arg1) {
 		if (arg1 != null && arg1.length != arg0.length) {
 			throw new IllegalArgumentException();
 		}
-		this.aClass36Array11 = arg0;
-		this.anIntArray346 = arg1;
+		this.nameIcons = arg0;
+		this.nameIconHeights = arg1;
 	}
 
 	@OriginalMember(owner = "client!rk", name = "c", descriptor = "(II)V")
-	private void method2874(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
-		Static218.anInt3627 = -1;
-		Static218.anInt3628 = -1;
-		Static218.anInt3633 = arg1;
-		Static218.anInt3634 = arg1;
-		Static218.anInt3630 = arg0;
-		Static218.anInt3635 = arg0;
-		Static218.anInt3632 = 256;
-		Static218.anInt3631 = 256;
-		Static218.anInt3636 = 0;
+	private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
+		Static218.strikethroughColor = -1;
+		Static218.underlineColor = -1;
+		Static218.shadowColor = arg1;
+		Static218.shadowColorOverride = arg1;
+		Static218.color = arg0;
+		Static218.colorOverride = arg0;
+		Static218.alpha = 256;
+		Static218.alphaOverride = 256;
+		Static218.spaceWidth = 0;
 		Static218.anInt3629 = 0;
 	}
 
 	@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;IIII)V")
-	public final void method2875(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public final void renderCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		if (arg0 != null) {
-			this.method2874(arg3, arg4);
-			this.method2853(arg0, arg1 - this.method2858(arg0) / 2, arg2);
+			this.setColors(arg3, arg4);
+			this.render(arg0, arg1 - this.getStringWidth(arg0) / 2, arg2);
 		}
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "([B)V")
-	private void method2876(@OriginalArg(0) byte[] arg0) {
-		this.anIntArray348 = new int[256];
+	private void decode(@OriginalArg(0) byte[] arg0) {
+		this.glyphWidths = new int[256];
 		@Pc(9) int local9;
 		if (arg0.length == 257) {
-			for (local9 = 0; local9 < this.anIntArray348.length; local9++) {
-				this.anIntArray348[local9] = arg0[local9] & 0xFF;
+			for (local9 = 0; local9 < this.glyphWidths.length; local9++) {
+				this.glyphWidths[local9] = arg0[local9] & 0xFF;
 			}
-			this.anInt3626 = arg0[256] & 0xFF;
+			this.lineHeight = arg0[256] & 0xFF;
 			return;
 		}
 		local9 = 0;
 		for (@Pc(37) int local37 = 0; local37 < 256; local37++) {
-			this.anIntArray348[local37] = arg0[local9++] & 0xFF;
+			this.glyphWidths[local37] = arg0[local9++] & 0xFF;
 		}
 		@Pc(55) int[] local55 = new int[256];
 		@Pc(58) int[] local58 = new int[256];
@@ -666,30 +666,30 @@ public abstract class Font extends SecondaryNode {
 				local136[local138][local152] = local150;
 			}
 		}
-		this.aByteArray50 = new byte[65536];
+		this.kerning = new byte[65536];
 		for (local138 = 0; local138 < 256; local138++) {
 			if (local138 != 32 && local138 != 160) {
 				for (local109 = 0; local109 < 256; local109++) {
 					if (local109 != 32 && local109 != 160) {
-						this.aByteArray50[(local138 << 8) + local109] = (byte) Static218.method2870(local93, local136, local58, this.anIntArray348, local55, local138, local109);
+						this.kerning[(local138 << 8) + local109] = (byte) Static218.method2870(local93, local136, local58, this.glyphWidths, local55, local138, local109);
 					}
 				}
 			}
 		}
-		this.anInt3626 = local58[32] + local55[32];
+		this.lineHeight = local58[32] + local55[32];
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(III)V")
-	private void method2877(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		Static218.anInt3627 = -1;
-		Static218.anInt3628 = -1;
-		Static218.anInt3633 = arg1;
-		Static218.anInt3634 = arg1;
-		Static218.anInt3630 = arg0;
-		Static218.anInt3635 = arg0;
-		Static218.anInt3632 = arg2;
-		Static218.anInt3631 = arg2;
-		Static218.anInt3636 = 0;
+	private void setColors(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+		Static218.strikethroughColor = -1;
+		Static218.underlineColor = -1;
+		Static218.shadowColor = arg1;
+		Static218.shadowColorOverride = arg1;
+		Static218.color = arg0;
+		Static218.colorOverride = arg0;
+		Static218.alpha = arg2;
+		Static218.alphaOverride = arg2;
+		Static218.spaceWidth = 0;
 		Static218.anInt3629 = 0;
 	}
 
@@ -699,7 +699,7 @@ public abstract class Font extends SecondaryNode {
 			return 0;
 		}
 		arg9.setSeed((long) arg10);
-		this.method2877(arg5, arg6, (arg9.nextInt() & 0x1F) + 192);
+		this.setColors(arg5, arg6, (arg9.nextInt() & 0x1F) + 192);
 		@Pc(21) int local21 = arg0.length();
 		@Pc(24) int[] local24 = new int[local21];
 		@Pc(26) int local26 = 0;
@@ -711,36 +711,36 @@ public abstract class Font extends SecondaryNode {
 			}
 		}
 		local28 = arg1;
-		@Pc(50) int local50 = arg2 + this.anInt3625;
+		@Pc(50) int local50 = arg2 + this.paragraphTopPadding;
 		@Pc(52) int local52 = -1;
 		if (arg8 == 1) {
-			local50 += (arg4 - this.anInt3625 - this.anInt3624) / 2;
+			local50 += (arg4 - this.paragraphTopPadding - this.paragraphBottomPadding) / 2;
 		} else if (arg8 == 2) {
-			local50 = arg2 + arg4 - this.anInt3624;
+			local50 = arg2 + arg4 - this.paragraphBottomPadding;
 		}
 		if (arg7 == 1) {
-			local52 = this.method2858(arg0) + local26;
+			local52 = this.getStringWidth(arg0) + local26;
 			local28 = arg1 + (arg3 - local52) / 2;
 		} else if (arg7 == 2) {
-			local52 = this.method2858(arg0) + local26;
+			local52 = this.getStringWidth(arg0) + local26;
 			local28 = arg1 + arg3 - local52;
 		}
-		this.method2879(arg0, local28, local50, local24, null);
+		this.renderOffset(arg0, local28, local50, local24, null);
 		if (arg11 != null) {
 			if (local52 == -1) {
-				local52 = this.method2858(arg0) + local26;
+				local52 = this.getStringWidth(arg0) + local26;
 			}
 			arg11[0] = local28;
-			arg11[1] = local50 - this.anInt3625;
+			arg11[1] = local50 - this.paragraphTopPadding;
 			arg11[2] = local52;
-			arg11[3] = this.anInt3625 + this.anInt3624;
+			arg11[3] = this.paragraphTopPadding + this.paragraphBottomPadding;
 		}
 		return local26;
 	}
 
 	@OriginalMember(owner = "client!rk", name = "a", descriptor = "(Lclient!na;II[I[I)V")
-	private void method2879(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
-		@Pc(4) int local4 = arg2 - this.anInt3626;
+	private void renderOffset(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int[] arg3, @OriginalArg(4) int[] arg4) {
+		@Pc(4) int local4 = arg2 - this.lineHeight;
 		@Pc(6) int local6 = -1;
 		@Pc(8) int local8 = 0;
 		@Pc(10) int local10 = 0;
@@ -756,23 +756,23 @@ public abstract class Font extends SecondaryNode {
 				if (local24 == 62 && local6 != -1) {
 					@Pc(44) JagString local44 = arg0.substring(local16, local6 + 1);
 					local6 = -1;
-					if (local44.strEquals(Static218.aClass100_696)) {
+					if (local44.strEquals(Static218.TAG_LT)) {
 						local24 = 60;
-					} else if (local44.strEquals(Static218.aClass100_695)) {
+					} else if (local44.strEquals(Static218.TAG_GT)) {
 						local24 = 62;
-					} else if (local44.strEquals(Static218.aClass100_710)) {
+					} else if (local44.strEquals(Static218.TAG_NBSP)) {
 						local24 = 160;
-					} else if (local44.strEquals(Static218.aClass100_698)) {
+					} else if (local44.strEquals(Static218.TAB_SHY)) {
 						local24 = 173;
-					} else if (local44.strEquals(Static218.aClass100_708)) {
+					} else if (local44.strEquals(Static218.TAB_TIMES)) {
 						local24 = 215;
-					} else if (local44.strEquals(Static218.aClass100_702)) {
+					} else if (local44.strEquals(Static218.TAB_EURO)) {
 						local24 = 128;
-					} else if (local44.strEquals(Static218.aClass100_716)) {
+					} else if (local44.strEquals(Static218.TAB_COPY)) {
 						local24 = 169;
 					} else {
-						if (!local44.strEquals(Static218.aClass100_718)) {
-							if (local44.method3138(Static218.aClass100_715)) {
+						if (!local44.strEquals(Static218.TAG_REG)) {
+							if (local44.startsWith(Static218.TAG_IMG)) {
 								try {
 									if (arg3 == null) {
 										local121 = 0;
@@ -785,20 +785,20 @@ public abstract class Font extends SecondaryNode {
 										local130 = arg4[local10];
 									}
 									local10++;
-									local141 = local44.method3136(4).parseInt();
-									@Pc(146) IndexedSprite local146 = this.aClass36Array11[local141];
-									@Pc(157) int local157 = this.anIntArray346 == null ? local146.anInt4276 : this.anIntArray346[local141];
-									if (Static218.anInt3631 == 256) {
-										local146.renderTransparent(arg1 + local121, local4 + this.anInt3626 - local157 + local130);
+									local141 = local44.substring(4).parseInt();
+									@Pc(146) IndexedSprite local146 = this.nameIcons[local141];
+									@Pc(157) int local157 = this.nameIconHeights == null ? local146.anInt4276 : this.nameIconHeights[local141];
+									if (Static218.alphaOverride == 256) {
+										local146.renderTransparent(arg1 + local121, local4 + this.lineHeight - local157 + local130);
 									} else {
-										local146.method3335(arg1 + local121, local4 + this.anInt3626 - local157 + local130, Static218.anInt3631);
+										local146.method3335(arg1 + local121, local4 + this.lineHeight - local157 + local130, Static218.alphaOverride);
 									}
-									arg1 += local146.anInt4279;
+									arg1 += local146.innerWidth;
 									local8 = 0;
 								} catch (@Pc(197) Exception local197) {
 								}
 							} else {
-								this.method2861(local44);
+								this.parseTag(local44);
 							}
 							continue;
 						}
@@ -806,8 +806,8 @@ public abstract class Font extends SecondaryNode {
 					}
 				}
 				if (local6 == -1) {
-					if (this.aByteArray50 != null && local8 != 0) {
-						arg1 += this.aByteArray50[(local8 << 8) + local24];
+					if (this.kerning != null && local8 != 0) {
+						arg1 += this.kerning[(local8 << 8) + local24];
 					}
 					@Pc(226) int local226 = this.spriteInnerWidths[local24];
 					local121 = this.spriteInnerHeights[local24];
@@ -823,35 +823,35 @@ public abstract class Font extends SecondaryNode {
 					}
 					local10++;
 					if (local24 == 32) {
-						if (Static218.anInt3636 > 0) {
-							Static218.anInt3629 += Static218.anInt3636;
+						if (Static218.spaceWidth > 0) {
+							Static218.anInt3629 += Static218.spaceWidth;
 							arg1 += Static218.anInt3629 >> 8;
 							Static218.anInt3629 &= 0xFF;
 						}
-					} else if (Static218.anInt3631 == 256) {
-						if (Static218.anInt3634 != -1) {
-							this.renderGlyph(local24, arg1 + this.anIntArray344[local24] + local130 + 1, local4 + this.anIntArray347[local24] + 1 + local141, local226, local121, Static218.anInt3634);
+					} else if (Static218.alphaOverride == 256) {
+						if (Static218.shadowColorOverride != -1) {
+							this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride);
 						}
-						this.renderGlyph(local24, arg1 + this.anIntArray344[local24] + local130, local4 + this.anIntArray347[local24] + local141, local226, local121, Static218.anInt3635);
+						this.renderGlyph(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride);
 					} else {
-						if (Static218.anInt3634 != -1) {
-							this.renderGlyphTransparent(local24, arg1 + this.anIntArray344[local24] + local130 + 1, local4 + this.anIntArray347[local24] + 1 + local141, local226, local121, Static218.anInt3634, Static218.anInt3631);
+						if (Static218.shadowColorOverride != -1) {
+							this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130 + 1, local4 + this.spriteYOffsets[local24] + 1 + local141, local226, local121, Static218.shadowColorOverride, Static218.alphaOverride);
 						}
-						this.renderGlyphTransparent(local24, arg1 + this.anIntArray344[local24] + local130, local4 + this.anIntArray347[local24] + local141, local226, local121, Static218.anInt3635, Static218.anInt3631);
+						this.renderGlyphTransparent(local24, arg1 + this.spriteXOffsets[local24] + local130, local4 + this.spriteYOffsets[local24] + local141, local226, local121, Static218.colorOverride, Static218.alphaOverride);
 					}
-					@Pc(387) int local387 = this.anIntArray348[local24];
-					if (Static218.anInt3627 != -1) {
+					@Pc(387) int local387 = this.glyphWidths[local24];
+					if (Static218.strikethroughColor != -1) {
 						if (GlRenderer.enabled) {
-							Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627);
+							Static46.method1174(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
 						} else {
-							Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627);
+							Static129.method2489(arg1, local4 + (int) ((double) this.lineHeight * 0.7D), local387, Static218.strikethroughColor);
 						}
 					}
-					if (Static218.anInt3628 != -1) {
+					if (Static218.underlineColor != -1) {
 						if (GlRenderer.enabled) {
-							Static46.method1174(arg1, local4 + this.anInt3626, local387, Static218.anInt3628);
+							Static46.method1174(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
 						} else {
-							Static129.method2489(arg1, local4 + this.anInt3626, local387, Static218.anInt3628);
+							Static129.method2489(arg1, local4 + this.lineHeight, local387, Static218.underlineColor);
 						}
 					}
 					arg1 += local387;
diff --git a/client/src/main/java/GlIndexedSprite.java b/client/src/main/java/GlIndexedSprite.java
index b99e80a..2d436d8 100644
--- a/client/src/main/java/GlIndexedSprite.java
+++ b/client/src/main/java/GlIndexedSprite.java
@@ -31,7 +31,7 @@ public final class GlIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!oh", name = "<init>", descriptor = "(IIIIII[B[I)V")
 	public GlIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
-		this.anInt4279 = arg0;
+		this.innerWidth = arg0;
 		this.anInt4276 = arg1;
 		this.anInt4280 = arg2;
 		this.anInt4273 = arg3;
diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java
index 685859f..298a638 100644
--- a/client/src/main/java/GlModel.java
+++ b/client/src/main/java/GlModel.java
@@ -3193,7 +3193,7 @@ public final class GlModel extends Model {
 			local151 = new SoftwareIndexedSprite(local134, local140, 0);
 		} else {
 			local151 = arg0;
-			arg0.anInt4279 = arg0.width = local134;
+			arg0.innerWidth = arg0.width = local134;
 			arg0.anInt4276 = arg0.anInt4278 = local140;
 			arg0.method1392();
 		}
diff --git a/client/src/main/java/GlRenderer.java b/client/src/main/java/GlRenderer.java
index 6ab1b5e..9acc3e5 100644
--- a/client/src/main/java/GlRenderer.java
+++ b/client/src/main/java/GlRenderer.java
@@ -192,7 +192,7 @@ public final class GlRenderer {
 	}
 
 	@OriginalMember(owner = "client!tf", name = "d", descriptor = "()V")
-	public static void method4153() {
+	public static void swapBuffers() {
 		try {
 			drawable.swapBuffers();
 		} catch (@Pc(3) Exception local3) {
diff --git a/client/src/main/java/GlTile.java b/client/src/main/java/GlTile.java
index b46a7d2..fdbd1f6 100644
--- a/client/src/main/java/GlTile.java
+++ b/client/src/main/java/GlTile.java
@@ -132,10 +132,10 @@ public final class GlTile extends Node {
 			local1 = (long) (arg0 + (arg2 << 16)) + ((long) arg6 << 32);
 			@Pc(28) IntNode local28 = (IntNode) this.aClass133_8.get(local1);
 			if (local28 != null) {
-				if (arg1 < this.anIntArray230[local28.anInt3141]) {
-					this.anIntArray230[local28.anInt3141] = arg1;
+				if (arg1 < this.anIntArray230[local28.value]) {
+					this.anIntArray230[local28.value] = arg1;
 				}
-				return local28.anInt3141;
+				return local28.value;
 			}
 		}
 		this.anIntArray232[this.anInt2483] = arg0;
@@ -149,7 +149,7 @@ public final class GlTile extends Node {
 		this.aFloatArray5[this.anInt2483] = arg5;
 		this.anIntArray226[this.anInt2483] = arg6;
 		if (local1 != 0L) {
-			this.aClass133_8.method3862(new IntNode(this.anInt2483), local1);
+			this.aClass133_8.put(new IntNode(this.anInt2483), local1);
 		}
 		return this.anInt2483++;
 	}
diff --git a/client/src/main/java/HashTable.java b/client/src/main/java/HashTable.java
index 1c1f206..f1c27c4 100644
--- a/client/src/main/java/HashTable.java
+++ b/client/src/main/java/HashTable.java
@@ -44,7 +44,7 @@ public final class HashTable {
 				if (local14 == local17) {
 					break;
 				}
-				local17.method4658();
+				local17.unlink();
 			}
 		}
 		this.aClass3_193 = null;
@@ -52,13 +52,13 @@ public final class HashTable {
 	}
 
 	@OriginalMember(owner = "client!sc", name = "c", descriptor = "(I)Lclient!ab;")
-	public final Node method3859() {
+	public final Node head() {
 		this.anInt5037 = 0;
-		return this.method3861();
+		return this.next();
 	}
 
 	@OriginalMember(owner = "client!sc", name = "d", descriptor = "(I)Lclient!ab;")
-	public final Node method3861() {
+	public final Node next() {
 		@Pc(24) Node local24;
 		if (this.anInt5037 > 0 && this.aClass3_193 != this.aClass3Array1[this.anInt5037 - 1]) {
 			local24 = this.aClass3_193;
@@ -76,13 +76,13 @@ public final class HashTable {
 	}
 
 	@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILclient!ab;J)V")
-	public final void method3862(@OriginalArg(1) Node arg0, @OriginalArg(2) long arg1) {
+	public final void put(@OriginalArg(1) Node arg0, @OriginalArg(2) long arg1) {
 		if (arg0.aClass3_223 != null) {
-			arg0.method4658();
+			arg0.unlink();
 		}
 		@Pc(21) Node local21 = this.aClass3Array1[(int) (arg1 & (long) (this.anInt5023 - 1))];
 		arg0.aClass3_222 = local21;
-		arg0.uid = arg1;
+		arg0.key = arg1;
 		arg0.aClass3_223 = local21.aClass3_223;
 		arg0.aClass3_223.aClass3_222 = arg0;
 		arg0.aClass3_222.aClass3_223 = arg0;
@@ -93,7 +93,7 @@ public final class HashTable {
 		this.aLong168 = arg0;
 		@Pc(24) Node local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))];
 		for (this.aClass3_192 = local24.aClass3_222; this.aClass3_192 != local24; this.aClass3_192 = this.aClass3_192.aClass3_222) {
-			if (arg0 == this.aClass3_192.uid) {
+			if (arg0 == this.aClass3_192.key) {
 				@Pc(46) Node local46 = this.aClass3_192;
 				this.aClass3_192 = this.aClass3_192.aClass3_222;
 				return local46;
@@ -130,13 +130,13 @@ public final class HashTable {
 	}
 
 	@OriginalMember(owner = "client!sc", name = "f", descriptor = "(I)Lclient!ab;")
-	public final Node method3867() {
+	public final Node nextWithKey() {
 		if (this.aClass3_192 == null) {
 			return null;
 		}
 		@Pc(23) Node local23 = this.aClass3Array1[(int) (this.aLong168 & (long) (this.anInt5023 - 1))];
 		while (local23 != this.aClass3_192) {
-			if (this.aClass3_192.uid == this.aLong168) {
+			if (this.aClass3_192.key == this.aLong168) {
 				@Pc(45) Node local45 = this.aClass3_192;
 				this.aClass3_192 = this.aClass3_192.aClass3_222;
 				return local45;
@@ -148,7 +148,7 @@ public final class HashTable {
 	}
 
 	@OriginalMember(owner = "client!sc", name = "g", descriptor = "(I)I")
-	public final int method3868() {
+	public final int getBucketCount() {
 		return this.anInt5023;
 	}
 }
diff --git a/client/src/main/java/IndexedSprite.java b/client/src/main/java/IndexedSprite.java
index 2b3a452..5b8bb24 100644
--- a/client/src/main/java/IndexedSprite.java
+++ b/client/src/main/java/IndexedSprite.java
@@ -18,7 +18,7 @@ public abstract class IndexedSprite {
 	public int anInt4278;
 
 	@OriginalMember(owner = "client!ok", name = "l", descriptor = "I")
-	public int anInt4279;
+	public int innerWidth;
 
 	@OriginalMember(owner = "client!ok", name = "m", descriptor = "I")
 	public int anInt4280;
diff --git a/client/src/main/java/IntNode.java b/client/src/main/java/IntNode.java
index 4b7e42f..ec1231d 100644
--- a/client/src/main/java/IntNode.java
+++ b/client/src/main/java/IntNode.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class IntNode extends Node {
 
 	@OriginalMember(owner = "client!ka", name = "p", descriptor = "I")
-	public int anInt3141;
+	public int value;
 
 	@OriginalMember(owner = "client!ka", name = "<init>", descriptor = "()V")
 	public IntNode() {
@@ -14,6 +14,6 @@ public final class IntNode extends Node {
 
 	@OriginalMember(owner = "client!ka", name = "<init>", descriptor = "(I)V")
 	public IntNode(@OriginalArg(0) int arg0) {
-		this.anInt3141 = arg0;
+		this.value = arg0;
 	}
 }
diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java
index e5ad672..b8e3106 100644
--- a/client/src/main/java/JagString.java
+++ b/client/src/main/java/JagString.java
@@ -47,7 +47,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(BI)I")
-	public final int method3110(@OriginalArg(1) int arg0) {
+	public final int parseHexString(@OriginalArg(1) int arg0) {
 		@Pc(14) boolean local14 = false;
 		@Pc(20) boolean local20 = false;
 		@Pc(22) int local22 = 0;
@@ -189,7 +189,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "c", descriptor = "(I)J")
-	public final long method3118() {
+	public final long longHashCode() {
 		@Pc(1) long local1 = 0L;
 		for (@Pc(9) int local9 = 0; local9 < this.length; local9++) {
 			local1 = (long) (this.chars[local9] & 0xFF) + (local1 << 5) - local1;
@@ -366,7 +366,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "b", descriptor = "(B)I")
 	public final int parseInt() {
-		return this.method3110(10);
+		return this.parseHexString(10);
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IZ)V")
@@ -415,7 +415,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(IB)Lclient!na;")
-	public final JagString method3136(@OriginalArg(0) int arg0) {
+	public final JagString substring(@OriginalArg(0) int arg0) {
 		return this.substring(this.length, arg0);
 	}
 
@@ -429,7 +429,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "b", descriptor = "(Lclient!na;I)Z")
-	public final boolean method3138(@OriginalArg(0) JagString arg0) {
+	public final boolean startsWith(@OriginalArg(0) JagString arg0) {
 		if (this.length < arg0.length) {
 			return false;
 		}
@@ -574,7 +574,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "g", descriptor = "(I)Lclient!na;")
-	public final JagString method3143() {
+	public final JagString asString() {
 		return this;
 	}
 
@@ -694,23 +694,23 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "c", descriptor = "(B)Lclient!na;")
 	public final JagString method3151() {
-		@Pc(9) long local9 = this.method3118();
+		@Pc(9) long local9 = this.longHashCode();
 		@Pc(19) Class local19 = JagString.class;
 		synchronized (local19) {
 			@Pc(30) StringNode local30;
 			if (Static148.aClass133_13 == null) {
 				Static148.aClass133_13 = new HashTable(4096);
 			} else {
-				for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) {
-					if (this.strEquals(local30.aClass100_980)) {
-						return local30.aClass100_980;
+				for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.nextWithKey()) {
+					if (this.strEquals(local30.value)) {
+						return local30.value;
 					}
 				}
 			}
 			local30 = new StringNode();
-			local30.aClass100_980 = this;
+			local30.value = this;
 			this.aBoolean193 = false;
-			Static148.aClass133_13.method3862(local30, local9);
+			Static148.aClass133_13.put(local30, local9);
 			return this;
 		}
 	}
@@ -736,7 +736,7 @@ public final class JagString implements StringInterface {
 	}
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(BLjava/applet/Applet;)Lclient!na;")
-	public final JagString method3153(@OriginalArg(1) Applet arg0) {
+	public final JagString fromParameters(@OriginalArg(1) Applet arg0) {
 		@Pc(19) String local19 = new String(this.chars, 0, this.length);
 		@Pc(23) String local23 = arg0.getParameter(local19);
 		return local23 == null ? null : Static230.method3952(local23);
diff --git a/client/src/main/java/JavaAudioChannel.java b/client/src/main/java/JavaAudioChannel.java
index 57a663e..fb3704a 100644
--- a/client/src/main/java/JavaAudioChannel.java
+++ b/client/src/main/java/JavaAudioChannel.java
@@ -103,7 +103,7 @@ public final class JavaAudioChannel extends AudioChannel {
 			local1 = 512;
 		}
 		for (@Pc(9) int local9 = 0; local9 < local1; local9++) {
-			@Pc(17) int local17 = this.anIntArray411[local9];
+			@Pc(17) int local17 = this.samples[local9];
 			if ((local17 + 8388608 & 0xFF000000) != 0) {
 				local17 = local17 >> 31 ^ 0x7FFFFF;
 			}
diff --git a/client/src/main/java/JavaMouseWheel.java b/client/src/main/java/JavaMouseWheel.java
index df0b75b..be490a0 100644
--- a/client/src/main/java/JavaMouseWheel.java
+++ b/client/src/main/java/JavaMouseWheel.java
@@ -14,7 +14,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen
 
 	@OriginalMember(owner = "client!o", name = "a", descriptor = "(ZLjava/awt/Component;)V")
 	@Override
-	public final void method3291(@OriginalArg(1) Component arg0) {
+	public final void stop(@OriginalArg(1) Component arg0) {
 		arg0.removeMouseWheelListener(this);
 	}
 
diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java
index 4601bf0..2efdaa8 100644
--- a/client/src/main/java/Js5CacheQueue.java
+++ b/client/src/main/java/Js5CacheQueue.java
@@ -34,14 +34,14 @@ public final class Js5CacheQueue implements Runnable {
 	private void method2461(@OriginalArg(0) Js5CacheRequest arg0) {
 		@Pc(7) SecondaryLinkedList local7 = this.aClass16_6;
 		synchronized (this.aClass16_6) {
-			this.aClass16_6.method798(arg0);
+			this.aClass16_6.addTail(arg0);
 			this.anInt3131++;
 			this.aClass16_6.notifyAll();
 		}
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(I)V")
-	public final void method2466() {
+	public final void quit() {
 		this.aBoolean161 = true;
 		@Pc(6) SecondaryLinkedList local6 = this.aClass16_6;
 		synchronized (this.aClass16_6) {
@@ -59,7 +59,7 @@ public final class Js5CacheQueue implements Runnable {
 		@Pc(7) Js5CacheRequest local7 = new Js5CacheRequest();
 		local7.aByteArray11 = arg1;
 		local7.aBoolean225 = false;
-		local7.aLong185 = arg2;
+		local7.secondaryKey = arg2;
 		local7.aClass49_3 = arg0;
 		local7.anInt824 = 2;
 		this.method2461(local7);
@@ -72,7 +72,7 @@ public final class Js5CacheQueue implements Runnable {
 		local7.aClass49_3 = arg1;
 		local7.anInt824 = 3;
 		local7.aBoolean225 = false;
-		local7.aLong185 = arg0;
+		local7.secondaryKey = arg0;
 		this.method2461(local7);
 		return local7;
 	}
@@ -88,7 +88,7 @@ public final class Js5CacheQueue implements Runnable {
 				if (local31 == null) {
 					break;
 				}
-				if (local31.aLong185 == (long) arg1 && local31.aClass49_3 == arg0 && local31.anInt824 == 2) {
+				if (local31.secondaryKey == (long) arg1 && local31.aClass49_3 == arg0 && local31.anInt824 == 2) {
 					local9.aByteArray11 = local31.aByteArray11;
 					local9.aBoolean226 = false;
 					return local9;
@@ -96,7 +96,7 @@ public final class Js5CacheQueue implements Runnable {
 				local31 = (Js5CacheRequest) this.aClass16_6.method797();
 			}
 		}
-		local9.aByteArray11 = arg0.method1701(arg1);
+		local9.aByteArray11 = arg0.read(arg1);
 		local9.aBoolean226 = false;
 		local9.aBoolean225 = true;
 		return local9;
@@ -121,9 +121,9 @@ public final class Js5CacheQueue implements Runnable {
 			}
 			try {
 				if (local19.anInt824 == 2) {
-					local19.aClass49_3.method1700((int) local19.aLong185, local19.aByteArray11.length, local19.aByteArray11);
+					local19.aClass49_3.write((int) local19.secondaryKey, local19.aByteArray11.length, local19.aByteArray11);
 				} else if (local19.anInt824 == 3) {
-					local19.aByteArray11 = local19.aClass49_3.method1701((int) local19.aLong185);
+					local19.aByteArray11 = local19.aClass49_3.read((int) local19.secondaryKey);
 				}
 			} catch (@Pc(83) Exception local83) {
 				Static89.report(null, local83);
diff --git a/client/src/main/java/Js5CachedResourceProvider.java b/client/src/main/java/Js5CachedResourceProvider.java
index a19cf8f..f91a472 100644
--- a/client/src/main/java/Js5CachedResourceProvider.java
+++ b/client/src/main/java/Js5CachedResourceProvider.java
@@ -92,12 +92,12 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 		}
 		@Pc(15) Node local15;
 		for (local15 = this.aClass69_16.method2289(); local15 != null; local15 = this.aClass69_16.method2288()) {
-			if (local15.uid == (long) arg0) {
+			if (local15.key == (long) arg0) {
 				return;
 			}
 		}
 		local15 = new Node();
-		local15.uid = arg0;
+		local15.key = arg0;
 		this.aClass69_16.method2282(local15);
 	}
 
@@ -184,7 +184,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			return 0;
 		} else if (this.aBoolean35) {
 			@Pc(25) Node local25 = this.aClass69_17.method2289();
-			return local25 == null ? 0 : (int) local25.uid;
+			return local25 == null ? 0 : (int) local25.key;
 		} else {
 			return this.aClass70_1.anInt2902;
 		}
@@ -202,14 +202,14 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			if (this.aBoolean35) {
 				local32 = true;
 				for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
-					local43 = (int) local37.uid;
+					local43 = (int) local37.key;
 					if (this.aByteArray9[local43] == 0) {
 						this.method536(1, local43);
 					}
 					if (this.aByteArray9[local43] == 0) {
 						local32 = false;
 					} else {
-						local37.method4658();
+						local37.unlink();
 					}
 				}
 				while (this.aClass70_1.anIntArray272.length > this.anInt578) {
@@ -226,7 +226,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 						if (this.aByteArray9[this.anInt578] == 0) {
 							local32 = false;
 							local37 = new Node();
-							local37.uid = this.anInt578;
+							local37.key = this.anInt578;
 							this.aClass69_17.method2282(local37);
 						}
 						this.anInt578++;
@@ -239,12 +239,12 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			} else if (this.aBoolean36) {
 				local32 = true;
 				for (local37 = this.aClass69_17.method2289(); local37 != null; local37 = this.aClass69_17.method2288()) {
-					local43 = (int) local37.uid;
+					local43 = (int) local37.key;
 					if (this.aByteArray9[local43] != 1) {
 						this.method536(2, local43);
 					}
 					if (this.aByteArray9[local43] == 1) {
-						local37.method4658();
+						local37.unlink();
 					} else {
 						local32 = false;
 					}
@@ -262,7 +262,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 						}
 						if (this.aByteArray9[this.anInt578] != 1) {
 							local37 = new Node();
-							local37.uid = this.anInt578;
+							local37.key = this.anInt578;
 							this.aClass69_17.method2282(local37);
 							local32 = false;
 						}
@@ -280,13 +280,13 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 		if (!this.aBoolean37 || this.aLong20 > MonotonicClock.currentTimeMillis()) {
 			return;
 		}
-		for (@Pc(331) Js5Request local331 = (Js5Request) this.aClass133_1.method3859(); local331 != null; local331 = (Js5Request) this.aClass133_1.method3861()) {
+		for (@Pc(331) Js5Request local331 = (Js5Request) this.aClass133_1.head(); local331 != null; local331 = (Js5Request) this.aClass133_1.next()) {
 			if (!local331.aBoolean226) {
 				if (local331.aBoolean227) {
 					if (!local331.aBoolean225) {
 						throw new RuntimeException();
 					}
-					local331.method4658();
+					local331.unlink();
 				} else {
 					local331.aBoolean227 = true;
 				}
@@ -311,7 +311,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 	private Js5Request method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(13) Js5Request local13 = (Js5Request) this.aClass133_1.get((long) arg1);
 		if (local13 != null && arg0 == 0 && !local13.aBoolean225 && local13.aBoolean226) {
-			local13.method4658();
+			local13.unlink();
 			local13 = null;
 		}
 		if (local13 == null) {
@@ -343,7 +343,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			} else {
 				throw new RuntimeException();
 			}
-			this.aClass133_1.method3862(local13, (long) arg1);
+			this.aClass133_1.put(local13, (long) arg1);
 		}
 		if (local13.aBoolean226) {
 			return null;
@@ -366,10 +366,10 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				this.aClass73_2.response = 0;
 			} catch (@Pc(225) RuntimeException local225) {
 				this.aClass73_2.method2327();
-				local13.method4658();
+				local13.unlink();
 				if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
 					local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
-					this.aClass133_1.method3862(local252, (long) arg1);
+					this.aClass133_1.put(local252, (long) arg1);
 				}
 				return null;
 			}
@@ -383,7 +383,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				}
 			}
 			if (!local13.aBoolean225) {
-				local13.method4658();
+				local13.unlink();
 			}
 			return local13;
 		}
@@ -408,15 +408,15 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				this.aByteArray9[arg1] = 1;
 			}
 			if (!local13.aBoolean225) {
-				local13.method4658();
+				local13.unlink();
 			}
 			return local13;
 		} catch (@Pc(437) Exception local437) {
 			this.aByteArray9[arg1] = -1;
-			local13.method4658();
+			local13.unlink();
 			if (local13.aBoolean225 && !this.aClass73_2.method2326()) {
 				local252 = this.aClass73_2.method2330(this.anInt576, (byte) 2, arg1, true);
-				this.aClass133_1.method3862(local252, (long) arg1);
+				this.aClass133_1.put(local252, (long) arg1);
 			}
 			return null;
 		}
@@ -428,9 +428,9 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			return;
 		}
 		for (@Pc(21) Node local21 = this.aClass69_16.method2289(); local21 != null; local21 = this.aClass69_16.method2288()) {
-			@Pc(28) int local28 = (int) local21.uid;
+			@Pc(28) int local28 = (int) local21.key;
 			if (local28 < 0 || this.aClass70_1.anInt2907 <= local28 || this.aClass70_1.anIntArray272[local28] == 0) {
-				local21.method4658();
+				local21.unlink();
 			} else {
 				if (this.aByteArray9[local28] == 0) {
 					this.method536(1, local28);
@@ -439,7 +439,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 					this.method536(2, local28);
 				}
 				if (this.aByteArray9[local28] == 1) {
-					local21.method4658();
+					local21.unlink();
 				}
 			}
 		}
@@ -462,7 +462,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 			return null;
 		} else {
 			@Pc(17) byte[] local17 = local9.method3554();
-			local9.method4658();
+			local9.unlink();
 			return local17;
 		}
 	}
diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java
index c15a34c..4452438 100644
--- a/client/src/main/java/Js5NetQueue.java
+++ b/client/src/main/java/Js5NetQueue.java
@@ -79,16 +79,16 @@ public final class Js5NetQueue {
 			for (local75 = (Js5NetRequest) this.aClass16_2.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_2.method797()) {
 				this.aClass3_Sub15_4.offset = 0;
 				this.aClass3_Sub15_4.p1(1);
-				this.aClass3_Sub15_4.p3((int) local75.aLong185);
+				this.aClass3_Sub15_4.p3((int) local75.secondaryKey);
 				this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
-				this.aClass16_3.method798(local75);
+				this.aClass16_3.addTail(local75);
 			}
 			for (local75 = (Js5NetRequest) this.aClass16_4.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_4.method797()) {
 				this.aClass3_Sub15_4.offset = 0;
 				this.aClass3_Sub15_4.p1(0);
-				this.aClass3_Sub15_4.p3((int) local75.aLong185);
+				this.aClass3_Sub15_4.p3((int) local75.secondaryKey);
 				this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
-				this.aClass16_5.method798(local75);
+				this.aClass16_5.addTail(local75);
 			}
 			for (@Pc(172) int local172 = 0; local172 < 100; local172++) {
 				local19 = this.aClass95_1.available();
@@ -156,10 +156,10 @@ public final class Js5NetQueue {
 							@Pc(501) long local501 = (long) ((local235 << 16) + local283);
 							@Pc(509) Js5NetRequest local509;
 							if (local491) {
-								for (local509 = (Js5NetRequest) this.aClass16_5.method795(); local509 != null && local509.aLong185 != local501; local509 = (Js5NetRequest) this.aClass16_5.method797()) {
+								for (local509 = (Js5NetRequest) this.aClass16_5.method795(); local509 != null && local509.secondaryKey != local501; local509 = (Js5NetRequest) this.aClass16_5.method797()) {
 								}
 							} else {
-								for (local509 = (Js5NetRequest) this.aClass16_3.method795(); local509 != null && local501 != local509.aLong185; local509 = (Js5NetRequest) this.aClass16_3.method797()) {
+								for (local509 = (Js5NetRequest) this.aClass16_3.method795(); local509 != null && local501 != local509.secondaryKey; local509 = (Js5NetRequest) this.aClass16_3.method797()) {
 								}
 							}
 							if (local509 == null) {
@@ -291,10 +291,10 @@ public final class Js5NetQueue {
 						this.aLong104 = MonotonicClock.currentTimeMillis();
 						return;
 					}
-					this.aClass16_4.method798(local44);
+					this.aClass16_4.addTail(local44);
 				}
 			}
-			this.aClass16_2.method798(local44);
+			this.aClass16_2.addTail(local44);
 		}
 	}
 
@@ -321,7 +321,7 @@ public final class Js5NetQueue {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "b", descriptor = "(Z)V")
-	public final void method2329() {
+	public final void quit() {
 		if (this.aClass95_1 != null) {
 			this.aClass95_1.close();
 		}
@@ -332,15 +332,15 @@ public final class Js5NetQueue {
 		@Pc(7) Js5NetRequest local7 = new Js5NetRequest();
 		@Pc(14) long local14 = (long) (arg2 + (arg0 << 16));
 		local7.aBoolean225 = arg3;
-		local7.aLong185 = local14;
+		local7.secondaryKey = local14;
 		local7.aByte16 = arg1;
 		if (arg3) {
 			if (this.method2328() >= 20) {
 				throw new RuntimeException();
 			}
-			this.aClass16_2.method798(local7);
+			this.aClass16_2.addTail(local7);
 		} else if (this.method2321() < 20) {
-			this.aClass16_4.method798(local7);
+			this.aClass16_4.addTail(local7);
 		} else {
 			throw new RuntimeException();
 		}
diff --git a/client/src/main/java/Js5QuickChatCommandDecoder.java b/client/src/main/java/Js5QuickChatCommandDecoder.java
index 7742811..a60c31f 100644
--- a/client/src/main/java/Js5QuickChatCommandDecoder.java
+++ b/client/src/main/java/Js5QuickChatCommandDecoder.java
@@ -11,12 +11,12 @@ public final class Js5QuickChatCommandDecoder implements QuickChatCommandDecoder
 	public final JagString method30(@OriginalArg(0) int arg0, @OriginalArg(1) int[] arg1, @OriginalArg(3) long arg2) {
 		if (arg0 == 0) {
 			@Pc(12) EnumType local12 = Static253.method4330(arg1[0]);
-			return local12.method3085((int) arg2);
+			return local12.getString((int) arg2);
 		} else if (arg0 == 1 || arg0 == 10) {
 			@Pc(31) ObjType local31 = Static71.method1439((int) arg2);
 			return local31.aClass100_495;
 		} else if (arg0 == 6 || arg0 == 7 || arg0 == 11) {
-			return Static253.method4330(arg1[0]).method3085((int) arg2);
+			return Static253.method4330(arg1[0]).getString((int) arg2);
 		} else {
 			return null;
 		}
diff --git a/client/src/main/java/LinkedList.java b/client/src/main/java/LinkedList.java
index 11002c7..8886cc5 100644
--- a/client/src/main/java/LinkedList.java
+++ b/client/src/main/java/LinkedList.java
@@ -19,14 +19,14 @@ public final class LinkedList {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(I)V")
-	public final void method2278() {
+	public final void clear() {
 		while (true) {
 			@Pc(5) Node local5 = this.aClass3_109.aClass3_222;
 			if (local5 == this.aClass3_109) {
 				this.aClass3_110 = null;
 				return;
 			}
-			local5.method4658();
+			local5.unlink();
 		}
 	}
 
@@ -45,7 +45,7 @@ public final class LinkedList {
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ZLclient!ab;)V")
 	public final void method2282(@OriginalArg(1) Node arg0) {
 		if (arg0.aClass3_223 != null) {
-			arg0.method4658();
+			arg0.unlink();
 		}
 		arg0.aClass3_222 = this.aClass3_109;
 		arg0.aClass3_223 = this.aClass3_109.aClass3_223;
@@ -54,9 +54,9 @@ public final class LinkedList {
 	}
 
 	@OriginalMember(owner = "client!ih", name = "a", descriptor = "(ILclient!ab;)V")
-	public final void method2283(@OriginalArg(1) Node arg0) {
+	public final void addHead(@OriginalArg(1) Node arg0) {
 		if (arg0.aClass3_223 != null) {
-			arg0.method4658();
+			arg0.unlink();
 		}
 		arg0.aClass3_222 = this.aClass3_109.aClass3_222;
 		arg0.aClass3_223 = this.aClass3_109;
@@ -82,7 +82,7 @@ public final class LinkedList {
 		if (this.aClass3_109 == local3) {
 			return null;
 		} else {
-			local3.method4658();
+			local3.unlink();
 			return local3;
 		}
 	}
diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java
index 918687c..bc2828f 100644
--- a/client/src/main/java/Loc.java
+++ b/client/src/main/java/Loc.java
@@ -84,7 +84,7 @@ public final class Loc extends Entity {
 			} else {
 				local67 = Static271.method4601(this.anInt1299);
 				if (local67.anIntArray380 != null) {
-					local67 = local67.method3417();
+					local67 = local67.getMultiLoc();
 				}
 				if (local67 != null) {
 					Static9.method181(local67, 0, this.anInt1295, 0, this.anInt1307, this.anInt1308, this.anInt1300, this.anInt1303);
@@ -225,7 +225,7 @@ public final class Loc extends Entity {
 		@Pc(19) LocType local19 = Static271.method4601(this.anInt1299);
 		@Pc(22) int local22 = local19.anInt4430;
 		if (local19.anIntArray380 != null) {
-			local19 = local19.method3417();
+			local19 = local19.getMultiLoc();
 		}
 		if (local19 == null) {
 			if (GlRenderer.enabled && !local12) {
diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java
index 7c48f32..10c01f2 100644
--- a/client/src/main/java/LocType.java
+++ b/client/src/main/java/LocType.java
@@ -151,7 +151,7 @@ public final class LocType {
 	private int anInt4411 = 0;
 
 	@OriginalMember(owner = "client!pb", name = "k", descriptor = "I")
-	public int anInt4402 = 0;
+	public int soundRadius = 0;
 
 	@OriginalMember(owner = "client!pb", name = "p", descriptor = "I")
 	private int anInt4405 = 0;
@@ -163,7 +163,7 @@ public final class LocType {
 	public boolean aBoolean213 = false;
 
 	@OriginalMember(owner = "client!pb", name = "O", descriptor = "I")
-	public int anInt4412 = -1;
+	public int sound = -1;
 
 	@OriginalMember(owner = "client!pb", name = "ub", descriptor = "I")
 	public int anInt4435 = 2;
@@ -206,7 +206,7 @@ public final class LocType {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(I)Lclient!pb;")
-	public final LocType method3417() {
+	public final LocType getMultiLoc() {
 		@Pc(26) int local26 = -1;
 		if (this.anInt4425 != -1) {
 			local26 = Static155.getVarbit(this.anInt4425);
@@ -243,7 +243,7 @@ public final class LocType {
 				if (local10) {
 					local60 += 65536;
 				}
-				local7 = (RawModel) Static169.aClass99_24.method3106((long) local60);
+				local7 = (RawModel) Static169.aClass99_24.get((long) local60);
 				if (local7 == null) {
 					local7 = Static77.method1686(Static121.aClass153_45, local60 & 0xFFFF);
 					if (local7 == null) {
@@ -252,7 +252,7 @@ public final class LocType {
 					if (local10) {
 						local7.method1673();
 					}
-					Static169.aClass99_24.method3095(local7, (long) local60);
+					Static169.aClass99_24.put(local7, (long) local60);
 				}
 				if (local46 > 1) {
 					Static274.aClass8_Sub5Array5[local48] = local7;
@@ -276,7 +276,7 @@ public final class LocType {
 			if (local10) {
 				local48 += 65536;
 			}
-			local7 = (RawModel) Static169.aClass99_24.method3106((long) local48);
+			local7 = (RawModel) Static169.aClass99_24.get((long) local48);
 			if (local7 == null) {
 				local7 = Static77.method1686(Static121.aClass153_45, local48 & 0xFFFF);
 				if (local7 == null) {
@@ -285,7 +285,7 @@ public final class LocType {
 				if (local10) {
 					local7.method1673();
 				}
-				Static169.aClass99_24.method3095(local7, (long) local48);
+				Static169.aClass99_24.put(local7, (long) local48);
 			}
 		}
 		@Pc(211) boolean local211;
@@ -359,12 +359,12 @@ public final class LocType {
 	@OriginalMember(owner = "client!pb", name = "d", descriptor = "(I)Z")
 	public final boolean method3422() {
 		if (this.anIntArray380 == null) {
-			return this.anInt4412 != -1 || this.anIntArray381 != null;
+			return this.sound != -1 || this.anIntArray381 != null;
 		}
 		for (@Pc(44) int local44 = 0; local44 < this.anIntArray380.length; local44++) {
 			if (this.anIntArray380[local44] != -1) {
 				@Pc(70) LocType local70 = Static271.method4601(this.anIntArray380[local44]);
-				if (local70.anInt4412 != -1 || local70.anIntArray381 != null) {
+				if (local70.sound != -1 || local70.anIntArray381 != null) {
 					return true;
 				}
 			}
@@ -378,7 +378,7 @@ public final class LocType {
 			return arg0;
 		} else {
 			@Pc(21) IntNode local21 = (IntNode) this.aClass133_19.get((long) arg1);
-			return local21 == null ? arg0 : local21.anInt3141;
+			return local21 == null ? arg0 : local21.value;
 		}
 	}
 
@@ -535,12 +535,12 @@ public final class LocType {
 			}
 			this.anIntArray380[local38 + 1] = local18;
 		} else if (arg1 == 78) {
-			this.anInt4412 = arg0.g2();
-			this.anInt4402 = arg0.g1();
+			this.sound = arg0.g2();
+			this.soundRadius = arg0.g1();
 		} else if (arg1 == 79) {
 			this.anInt4419 = arg0.g2();
 			this.anInt4414 = arg0.g2();
-			this.anInt4402 = arg0.g1();
+			this.soundRadius = arg0.g1();
 			local18 = arg0.g1();
 			this.anIntArray381 = new int[local18];
 			for (local38 = 0; local38 < local18; local38++) {
@@ -597,7 +597,7 @@ public final class LocType {
 				} else {
 					local589 = new IntNode(arg0.g4());
 				}
-				this.aClass133_19.method3862(local589, (long) local580);
+				this.aClass133_19.put(local589, (long) local580);
 			}
 		}
 	}
@@ -639,7 +639,7 @@ public final class LocType {
 			if (arg1) {
 				local135 = ~local135;
 			}
-			local79 = (GlModel) Static169.aClass99_24.method3106(local135);
+			local79 = (GlModel) Static169.aClass99_24.get(local135);
 			if (local79 == null) {
 				@Pc(175) RawModel local175 = null;
 				for (local177 = 0; local177 < local24; local177++) {
@@ -655,7 +655,7 @@ public final class LocType {
 					local175 = new RawModel(Static274.aClass8_Sub5Array5, local24);
 				}
 				local79 = new GlModel(local175, local10, local17, arg1);
-				Static169.aClass99_24.method3095(local79, local135);
+				Static169.aClass99_24.put(local79, local135);
 			}
 		} else {
 			local24 = -1;
@@ -673,14 +673,14 @@ public final class LocType {
 			if (arg1) {
 				local26 += 65536;
 			}
-			local79 = (GlModel) Static169.aClass99_24.method3106((long) local26);
+			local79 = (GlModel) Static169.aClass99_24.get((long) local26);
 			if (local79 == null) {
 				@Pc(90) RawModel local90 = Static77.method1686(Static121.aClass153_45, local26 & 0xFFFF);
 				if (local90 == null) {
 					return null;
 				}
 				local79 = new GlModel(local90, local10, local17, arg1);
-				Static169.aClass99_24.method3095(local79, (long) local26);
+				Static169.aClass99_24.put(local79, (long) local26);
 			}
 		}
 		@Pc(236) boolean local236 = this.aBoolean217;
@@ -739,7 +739,7 @@ public final class LocType {
 			} else {
 				local29 = arg0 + (this.anInt4426 << 10) + (arg3 << 3);
 			}
-			@Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.method3106(local29);
+			@Pc(225) Class139 local225 = (Class139) Static93.aClass99_14.get(local29);
 			@Pc(235) GlModel local235;
 			@Pc(265) SoftwareIndexedSprite local265;
 			if (local225 == null) {
@@ -760,7 +760,7 @@ public final class LocType {
 				local225 = new Class139();
 				local225.aClass8_10 = local235;
 				local225.aClass36_Sub1_3 = local265;
-				Static93.aClass99_14.method3095(local225, local29);
+				Static93.aClass99_14.put(local225, local29);
 			} else {
 				local235 = (GlModel) local225.aClass8_10;
 				local265 = local225.aClass36_Sub1_3;
@@ -788,7 +788,7 @@ public final class LocType {
 		} else {
 			local50 = false;
 		}
-		@Pc(60) Entity local60 = (Entity) Static93.aClass99_14.method3106(local29);
+		@Pc(60) Entity local60 = (Entity) Static93.aClass99_14.get(local29);
 		if (local60 == null) {
 			@Pc(69) RawModel local69 = this.method3418(arg0, arg3);
 			if (local69 == null) {
@@ -807,7 +807,7 @@ public final class LocType {
 			} else {
 				local60 = new SoftwareModel(local69, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
 			}
-			Static93.aClass99_14.method3095(local60, local29);
+			Static93.aClass99_14.put(local60, local29);
 		}
 		if (local50) {
 			local60 = ((RawModel) local60).method1675();
@@ -832,14 +832,14 @@ public final class LocType {
 			} else {
 				local30 = arg5 + (this.anInt4426 << 10) + (arg11 << 3);
 			}
-			@Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.method3106(local30);
+			@Pc(195) SoftwareModel local195 = (SoftwareModel) Static262.aClass99_36.get(local30);
 			if (local195 == null) {
 				@Pc(204) RawModel local204 = this.method3418(arg5, arg11);
 				if (local204 == null) {
 					return null;
 				}
 				local195 = new SoftwareModel(local204, this.anInt4407 + 64, this.anInt4405 * 5 + 768, -50, -10, -50);
-				Static262.aClass99_36.method3095(local195, local30);
+				Static262.aClass99_36.put(local195, local30);
 			}
 			@Pc(234) boolean local234 = false;
 			if (arg4 != null) {
@@ -867,7 +867,7 @@ public final class LocType {
 		} else {
 			local30 = (arg11 << 3) + ((this.anInt4426 << 10) + arg5);
 		}
-		@Pc(46) GlModel local46 = (GlModel) Static262.aClass99_36.method3106(local30);
+		@Pc(46) GlModel local46 = (GlModel) Static262.aClass99_36.get(local30);
 		if (local46 == null) {
 			local46 = this.method3427(arg5, true, arg11);
 			if (local46 == null) {
@@ -875,7 +875,7 @@ public final class LocType {
 			}
 			local46.method4099();
 			local46.method4111(false, false, false, false, false, true);
-			Static262.aClass99_36.method3095(local46, local30);
+			Static262.aClass99_36.put(local46, local30);
 		}
 		@Pc(80) boolean local80 = false;
 		@Pc(82) GlModel local82 = local46;
@@ -911,7 +911,7 @@ public final class LocType {
 			return arg0;
 		} else {
 			@Pc(26) StringNode local26 = (StringNode) this.aClass133_19.get((long) arg1);
-			return local26 == null ? arg0 : local26.aClass100_980;
+			return local26 == null ? arg0 : local26.value;
 		}
 	}
 }
diff --git a/client/src/main/java/LruHashTable.java b/client/src/main/java/LruHashTable.java
index c6cf805..b395c99 100644
--- a/client/src/main/java/LruHashTable.java
+++ b/client/src/main/java/LruHashTable.java
@@ -36,37 +36,37 @@ public final class LruHashTable {
 	public final SecondaryNode get(@OriginalArg(0) long arg0) {
 		@Pc(16) SecondaryNode local16 = (SecondaryNode) this.aClass133_5.get(arg0);
 		if (local16 != null) {
-			this.aClass16_1.method798(local16);
+			this.aClass16_1.addTail(local16);
 		}
 		return local16;
 	}
 
 	@OriginalMember(owner = "client!gn", name = "a", descriptor = "(I)Lclient!ab;")
 	public final Node method1808() {
-		return this.aClass133_5.method3859();
+		return this.aClass133_5.head();
 	}
 
 	@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!rg;JB)V")
 	public final void put(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) long arg1) {
 		if (this.anInt2314 == 0) {
 			@Pc(14) SecondaryNode local14 = this.aClass16_1.method796();
-			local14.method4658();
+			local14.unlink();
 			local14.method4365();
 			if (this.aClass3_Sub2_37 == local14) {
 				local14 = this.aClass16_1.method796();
-				local14.method4658();
+				local14.unlink();
 				local14.method4365();
 			}
 		} else {
 			this.anInt2314--;
 		}
-		this.aClass133_5.method3862(arg0, arg1);
-		this.aClass16_1.method798(arg0);
+		this.aClass133_5.put(arg0, arg1);
+		this.aClass16_1.addTail(arg0);
 	}
 
 	@OriginalMember(owner = "client!gn", name = "b", descriptor = "(I)Lclient!ab;")
 	public final Node method1813() {
-		return this.aClass133_5.method3861();
+		return this.aClass133_5.next();
 	}
 
 	@OriginalMember(owner = "client!gn", name = "c", descriptor = "(I)V")
diff --git a/client/src/main/java/MidiNoteStream.java b/client/src/main/java/MidiNoteStream.java
index 9cc11ad..e7af048 100644
--- a/client/src/main/java/MidiNoteStream.java
+++ b/client/src/main/java/MidiNoteStream.java
@@ -65,7 +65,7 @@ public final class MidiNoteStream extends PcmStream {
 				arg1 = arg0.anInt3775 / local27;
 			}
 		}
-		arg0.aClass3_Sub3_Sub1_3.method4410(arg1);
+		arg0.aClass3_Sub3_Sub1_3.skip(arg1);
 	}
 
 	@OriginalMember(owner = "client!te", name = "a", descriptor = "()I")
@@ -76,8 +76,8 @@ public final class MidiNoteStream extends PcmStream {
 
 	@OriginalMember(owner = "client!te", name = "c", descriptor = "(I)V")
 	@Override
-	public final void method4410(@OriginalArg(0) int arg0) {
-		this.aClass3_Sub3_Sub2_2.method4410(arg0);
+	public final void skip(@OriginalArg(0) int arg0) {
+		this.aClass3_Sub3_Sub2_2.skip(arg0);
 		for (@Pc(15) MidiNote local15 = (MidiNote) this.aClass69_126.method2289(); local15 != null; local15 = (MidiNote) this.aClass69_126.method2288()) {
 			if (!this.aClass3_Sub3_Sub4_3.method4445(local15)) {
 				@Pc(27) int local27 = arg0;
@@ -96,8 +96,8 @@ public final class MidiNoteStream extends PcmStream {
 
 	@OriginalMember(owner = "client!te", name = "b", descriptor = "([III)V")
 	@Override
-	public final void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		this.aClass3_Sub3_Sub2_2.method4408(arg0, arg1, arg2);
+	public final void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+		this.aClass3_Sub3_Sub2_2.read(arg0, arg1, arg2);
 		for (@Pc(17) MidiNote local17 = (MidiNote) this.aClass69_126.method2289(); local17 != null; local17 = (MidiNote) this.aClass69_126.method2288()) {
 			if (!this.aClass3_Sub3_Sub4_3.method4445(local17)) {
 				@Pc(29) int local29 = arg2;
@@ -127,7 +127,7 @@ public final class MidiNoteStream extends PcmStream {
 					break;
 				}
 				arg3 -= local36;
-				arg1.aClass3_Sub3_Sub1_3.method4408(arg0, arg2, local36);
+				arg1.aClass3_Sub3_Sub1_3.read(arg0, arg2, local36);
 				@Pc(55) int local55 = Static44.sampleRate / 100;
 				@Pc(58) SoundPcmStream local58 = arg1.aClass3_Sub3_Sub1_3;
 				@Pc(62) int local62 = 262144 / local26;
@@ -147,12 +147,12 @@ public final class MidiNoteStream extends PcmStream {
 				}
 				arg2 += local36;
 				local58.method384(local55);
-				local58.method4408(arg0, arg2, arg4 - arg2);
+				local58.read(arg0, arg2, arg4 - arg2);
 				if (local58.method412()) {
 					this.aClass3_Sub3_Sub2_2.method1343(local58);
 				}
 			}
 		}
-		arg1.aClass3_Sub3_Sub1_3.method4408(arg0, arg2, arg3);
+		arg1.aClass3_Sub3_Sub1_3.read(arg0, arg2, arg3);
 	}
 }
diff --git a/client/src/main/java/MidiPcmStream.java b/client/src/main/java/MidiPcmStream.java
index 78cb43a..6045d12 100644
--- a/client/src/main/java/MidiPcmStream.java
+++ b/client/src/main/java/MidiPcmStream.java
@@ -110,8 +110,8 @@ public final class MidiPcmStream extends PcmStream {
 		arg0.method3741();
 		@Pc(5) boolean local5 = true;
 		@Pc(20) int[] local20 = new int[] { 22050 };
-		for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.method3859(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.method3861()) {
-			@Pc(40) int local40 = (int) local34.uid;
+		for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.head(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.next()) {
+			@Pc(40) int local40 = (int) local34.key;
 			@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40);
 			if (local48 == null) {
 				local48 = Static116.method2320(arg1, local40);
@@ -119,7 +119,7 @@ public final class MidiPcmStream extends PcmStream {
 					local5 = false;
 					continue;
 				}
-				this.aClass133_23.method3862(local48, (long) local40);
+				this.aClass133_23.put(local48, (long) local40);
 			}
 			if (!local48.method2436(local20, arg2, local34.aByteArray17)) {
 				local5 = false;
@@ -133,7 +133,7 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "d", descriptor = "(B)V")
 	public final synchronized void method4412() {
-		for (@Pc(15) MidiInstrument local15 = (MidiInstrument) this.aClass133_23.method3859(); local15 != null; local15 = (MidiInstrument) this.aClass133_23.method3861()) {
+		for (@Pc(15) MidiInstrument local15 = (MidiInstrument) this.aClass133_23.head(); local15 != null; local15 = (MidiInstrument) this.aClass133_23.next()) {
 			local15.method2432();
 		}
 	}
@@ -224,7 +224,7 @@ public final class MidiPcmStream extends PcmStream {
 				if (local20.anInt3767 < 0) {
 					this.aClass3_Sub25ArrayArray1[local20.anInt3773][local20.anInt3779] = null;
 				}
-				local20.method4658();
+				local20.unlink();
 			}
 		}
 	}
@@ -254,8 +254,8 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "e", descriptor = "(I)V")
 	public final synchronized void method4426() {
-		for (@Pc(7) MidiInstrument local7 = (MidiInstrument) this.aClass133_23.method3859(); local7 != null; local7 = (MidiInstrument) this.aClass133_23.method3861()) {
-			local7.method4658();
+		for (@Pc(7) MidiInstrument local7 = (MidiInstrument) this.aClass133_23.head(); local7 != null; local7 = (MidiInstrument) this.aClass133_23.next()) {
+			local7.unlink();
 		}
 	}
 
@@ -491,7 +491,7 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "b", descriptor = "([III)V")
 	@Override
-	public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (this.aClass84_1.method2628()) {
 			@Pc(18) int local18 = this.aClass84_1.anInt3303 * this.anInt5646 / Static44.sampleRate;
 			do {
@@ -502,13 +502,13 @@ public final class MidiPcmStream extends PcmStream {
 				}
 				@Pc(59) int local59 = (int) ((this.aLong188 + (long) local18 - this.aLong189 - 1L) / (long) local18);
 				this.aLong189 += (long) local18 * (long) local59;
-				this.aClass3_Sub3_Sub3_1.method4408(arg0, arg1, local59);
+				this.aClass3_Sub3_Sub3_1.read(arg0, arg1, local59);
 				arg2 -= local59;
 				arg1 += local59;
 				this.method4435();
 			} while (this.aClass84_1.method2628());
 		}
-		this.aClass3_Sub3_Sub3_1.method4408(arg0, arg1, arg2);
+		this.aClass3_Sub3_Sub3_1.read(arg0, arg1, arg2);
 	}
 
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(IILclient!mf;B[I)Z")
@@ -516,7 +516,7 @@ public final class MidiPcmStream extends PcmStream {
 		arg2.anInt3771 = Static44.sampleRate / 100;
 		if (arg2.anInt3767 >= 0 && (arg2.aClass3_Sub3_Sub1_3 == null || arg2.aClass3_Sub3_Sub1_3.method411())) {
 			arg2.method2957();
-			arg2.method4658();
+			arg2.unlink();
 			if (arg2.anInt3776 > 0 && arg2 == this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776]) {
 				this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] = null;
 			}
@@ -578,16 +578,16 @@ public final class MidiPcmStream extends PcmStream {
 		}
 		arg2.aClass3_Sub3_Sub1_3.method384(arg2.anInt3771);
 		if (arg3 == null) {
-			arg2.aClass3_Sub3_Sub1_3.method4410(arg0);
+			arg2.aClass3_Sub3_Sub1_3.skip(arg0);
 		} else {
-			arg2.aClass3_Sub3_Sub1_3.method4408(arg3, arg1, arg0);
+			arg2.aClass3_Sub3_Sub1_3.read(arg3, arg1, arg0);
 		}
 		if (arg2.aClass3_Sub3_Sub1_3.method412()) {
 			this.aClass3_Sub3_Sub3_1.aClass3_Sub3_Sub2_2.method1343(arg2.aClass3_Sub3_Sub1_3);
 		}
 		arg2.method2957();
 		if (arg2.anInt3767 >= 0) {
-			arg2.method4658();
+			arg2.unlink();
 			if (arg2.anInt3776 > 0 && this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] == arg2) {
 				this.aClass3_Sub25ArrayArray2[arg2.anInt3773][arg2.anInt3776] = null;
 			}
@@ -684,7 +684,7 @@ public final class MidiPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!va", name = "c", descriptor = "(I)V")
 	@Override
-	public final synchronized void method4410(@OriginalArg(0) int arg0) {
+	public final synchronized void skip(@OriginalArg(0) int arg0) {
 		if (this.aClass84_1.method2628()) {
 			@Pc(15) int local15 = this.aClass84_1.anInt3303 * this.anInt5646 / Static44.sampleRate;
 			do {
@@ -696,11 +696,11 @@ public final class MidiPcmStream extends PcmStream {
 				@Pc(57) int local57 = (int) (((long) local15 + this.aLong188 - this.aLong189 - 1L) / (long) local15);
 				arg0 -= local57;
 				this.aLong189 += (long) local57 * (long) local15;
-				this.aClass3_Sub3_Sub3_1.method4410(local57);
+				this.aClass3_Sub3_Sub3_1.skip(local57);
 				this.method4435();
 			} while (this.aClass84_1.method2628());
 		}
-		this.aClass3_Sub3_Sub3_1.method4410(arg0);
+		this.aClass3_Sub3_Sub3_1.skip(arg0);
 	}
 
 	@OriginalMember(owner = "client!va", name = "e", descriptor = "(II)V")
@@ -793,7 +793,7 @@ public final class MidiPcmStream extends PcmStream {
 			return false;
 		}
 		if (arg0.anInt3767 >= 0) {
-			arg0.method4658();
+			arg0.unlink();
 			if (arg0.anInt3776 > 0 && this.aClass3_Sub25ArrayArray2[arg0.anInt3773][arg0.anInt3776] == arg0) {
 				this.aClass3_Sub25ArrayArray2[arg0.anInt3773][arg0.anInt3776] = null;
 			}
diff --git a/client/src/main/java/MixerPcmStream.java b/client/src/main/java/MixerPcmStream.java
index 0735ab9..05974f1 100644
--- a/client/src/main/java/MixerPcmStream.java
+++ b/client/src/main/java/MixerPcmStream.java
@@ -20,7 +20,7 @@ public final class MixerPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!cc;)V")
 	private void method1342(@OriginalArg(0) MixerListener arg0) {
-		arg0.method4658();
+		arg0.unlink();
 		arg0.method780();
 		@Pc(9) Node local9 = this.aClass69_44.aClass3_109.aClass3_222;
 		if (local9 == this.aClass69_44.aClass3_109) {
@@ -32,12 +32,12 @@ public final class MixerPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "(Lclient!qb;)V")
 	public final synchronized void method1343(@OriginalArg(0) PcmStream arg0) {
-		this.aClass69_43.method2283(arg0);
+		this.aClass69_43.addHead(arg0);
 	}
 
 	@OriginalMember(owner = "client!ei", name = "b", descriptor = "([III)V")
 	@Override
-	public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		do {
 			if (this.anInt1781 < 0) {
 				this.method1346(arg0, arg1, arg2);
@@ -89,7 +89,7 @@ public final class MixerPcmStream extends PcmStream {
 	@OriginalMember(owner = "client!ei", name = "d", descriptor = "(I)V")
 	private void method1345(@OriginalArg(0) int arg0) {
 		for (@Pc(5) PcmStream local5 = (PcmStream) this.aClass69_43.method2289(); local5 != null; local5 = (PcmStream) this.aClass69_43.method2288()) {
-			local5.method4410(arg0);
+			local5.skip(arg0);
 		}
 	}
 
@@ -101,8 +101,8 @@ public final class MixerPcmStream extends PcmStream {
 	}
 
 	@OriginalMember(owner = "client!ei", name = "b", descriptor = "(Lclient!qb;)V")
-	public final synchronized void method1347(@OriginalArg(0) PcmStream arg0) {
-		arg0.method4658();
+	public final synchronized void removeSubStream(@OriginalArg(0) PcmStream arg0) {
+		arg0.unlink();
 	}
 
 	@OriginalMember(owner = "client!ei", name = "a", descriptor = "()I")
@@ -113,7 +113,7 @@ public final class MixerPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!ei", name = "c", descriptor = "(I)V")
 	@Override
-	public final synchronized void method4410(@OriginalArg(0) int arg0) {
+	public final synchronized void skip(@OriginalArg(0) int arg0) {
 		do {
 			if (this.anInt1781 < 0) {
 				this.method1345(arg0);
diff --git a/client/src/main/java/Model.java b/client/src/main/java/Model.java
index bbbbb8e..42cf30e 100644
--- a/client/src/main/java/Model.java
+++ b/client/src/main/java/Model.java
@@ -25,24 +25,24 @@ public abstract class Model extends Entity {
 	private void method4553(@OriginalArg(0) AnimBase arg0, @OriginalArg(1) AnimFrame arg1, @OriginalArg(2) AnimFrame arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean[] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int[] arg9) {
 		@Pc(5) int local5;
 		if (arg2 == null || arg3 == 0) {
-			for (local5 = 0; local5 < arg1.anInt4070; local5++) {
-				@Pc(14) short local14 = arg1.aShortArray42[local5];
-				if (arg5 == null || arg5[local14] == arg6 || arg0.anIntArray291[local14] == 0) {
-					@Pc(32) short local32 = arg1.aShortArray43[local5];
+			for (local5 = 0; local5 < arg1.length; local5++) {
+				@Pc(14) short local14 = arg1.indices[local5];
+				if (arg5 == null || arg5[local14] == arg6 || arg0.types[local14] == 0) {
+					@Pc(32) short local32 = arg1.prevOriginIndices[local5];
 					@Pc(42) int local42;
 					if (local32 != -1) {
-						local42 = arg8 & arg0.anIntArray290[local32];
+						local42 = arg8 & arg0.parts[local32];
 						if (local42 == 65535) {
-							this.method4569(0, arg0.anIntArrayArray23[local32], 0, 0, 0, arg7);
+							this.method4569(0, arg0.bones[local32], 0, 0, 0, arg7);
 						} else {
-							this.method4577(0, arg0.anIntArrayArray23[local32], 0, 0, 0, arg7, local42, arg9);
+							this.method4577(0, arg0.bones[local32], 0, 0, 0, arg7, local42, arg9);
 						}
 					}
-					local42 = arg8 & arg0.anIntArray290[local14];
+					local42 = arg8 & arg0.parts[local14];
 					if (local42 == 65535) {
-						this.method4569(arg0.anIntArray291[local14], arg0.anIntArrayArray23[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7);
+						this.method4569(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7);
 					} else {
-						this.method4577(arg0.anIntArray291[local14], arg0.anIntArrayArray23[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7, local42, arg9);
+						this.method4577(arg0.types[local14], arg0.bones[local14], arg1.aShortArray44[local5], arg1.aShortArray50[local5], arg1.aShortArray49[local5], arg7, local42, arg9);
 					}
 				}
 			}
@@ -50,19 +50,19 @@ public abstract class Model extends Entity {
 		}
 		local5 = 0;
 		@Pc(136) int local136 = 0;
-		for (@Pc(138) int local138 = 0; local138 < arg0.anInt3116; local138++) {
+		for (@Pc(138) int local138 = 0; local138 < arg0.transforms; local138++) {
 			@Pc(144) boolean local144 = false;
-			if (local5 < arg1.anInt4070 && arg1.aShortArray42[local5] == local138) {
+			if (local5 < arg1.length && arg1.indices[local5] == local138) {
 				local144 = true;
 			}
 			@Pc(158) boolean local158 = false;
-			if (local136 < arg2.anInt4070 && arg2.aShortArray42[local136] == local138) {
+			if (local136 < arg2.length && arg2.indices[local136] == local138) {
 				local158 = true;
 			}
 			if (local144 || local158) {
-				if (arg5 == null || arg5[local138] == arg6 || arg0.anIntArray291[local138] == 0) {
+				if (arg5 == null || arg5[local138] == arg6 || arg0.types[local138] == 0) {
 					@Pc(196) short local196 = 0;
-					@Pc(201) int local201 = arg0.anIntArray291[local138];
+					@Pc(201) int local201 = arg0.types[local138];
 					if (local201 == 3) {
 						local196 = 128;
 					}
@@ -75,8 +75,8 @@ public abstract class Model extends Entity {
 						local213 = arg1.aShortArray44[local5];
 						local218 = arg1.aShortArray50[local5];
 						local223 = arg1.aShortArray49[local5];
-						local228 = arg1.aShortArray43[local5];
-						local233 = arg1.aByteArray55[local5];
+						local228 = arg1.prevOriginIndices[local5];
+						local233 = arg1.flags[local5];
 						local5++;
 					} else {
 						local213 = local196;
@@ -94,8 +94,8 @@ public abstract class Model extends Entity {
 						local252 = arg2.aShortArray44[local136];
 						local257 = arg2.aShortArray50[local136];
 						local262 = arg2.aShortArray49[local136];
-						local267 = arg2.aShortArray43[local136];
-						local272 = arg2.aByteArray55[local136];
+						local267 = arg2.prevOriginIndices[local136];
+						local272 = arg2.flags[local136];
 						local136++;
 					} else {
 						local252 = local196;
@@ -142,25 +142,25 @@ public abstract class Model extends Entity {
 						local298 = local223 + (local262 - local223) * arg3 / arg4;
 					}
 					if (local228 != -1) {
-						local308 = arg8 & arg0.anIntArray290[local228];
+						local308 = arg8 & arg0.parts[local228];
 						if (local308 == 65535) {
-							this.method4569(0, arg0.anIntArrayArray23[local228], 0, 0, 0, arg7);
+							this.method4569(0, arg0.bones[local228], 0, 0, 0, arg7);
 						} else {
-							this.method4577(0, arg0.anIntArrayArray23[local228], 0, 0, 0, arg7, local308, arg9);
+							this.method4577(0, arg0.bones[local228], 0, 0, 0, arg7, local308, arg9);
 						}
 					} else if (local267 != -1) {
-						local308 = arg8 & arg0.anIntArray290[local267];
+						local308 = arg8 & arg0.parts[local267];
 						if (local308 == 65535) {
-							this.method4569(0, arg0.anIntArrayArray23[local267], 0, 0, 0, arg7);
+							this.method4569(0, arg0.bones[local267], 0, 0, 0, arg7);
 						} else {
-							this.method4577(0, arg0.anIntArrayArray23[local267], 0, 0, 0, arg7, local308, arg9);
+							this.method4577(0, arg0.bones[local267], 0, 0, 0, arg7, local308, arg9);
 						}
 					}
-					local308 = arg8 & arg0.anIntArray290[local138];
+					local308 = arg8 & arg0.parts[local138];
 					if (local308 == 65535) {
-						this.method4569(local201, arg0.anIntArrayArray23[local138], local294, local296, local298, arg7);
+						this.method4569(local201, arg0.bones[local138], local294, local296, local298, arg7);
 					} else {
-						this.method4577(local201, arg0.anIntArrayArray23[local138], local294, local296, local298, arg7, local308, arg9);
+						this.method4577(local201, arg0.bones[local138], local294, local296, local298, arg7, local308, arg9);
 					}
 				} else {
 					if (local144) {
@@ -182,15 +182,15 @@ public abstract class Model extends Entity {
 		if (arg1 == -1 || !this.method4551()) {
 			return;
 		}
-		@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
-		@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
-		for (@Pc(17) int local17 = 0; local17 < local12.anInt4070; local17++) {
-			@Pc(26) short local26 = local12.aShortArray42[local17];
-			if (local15.aBooleanArray70[local26]) {
-				if (local12.aShortArray43[local17] != -1) {
+		@Pc(12) AnimFrame local12 = arg0.frames[arg1];
+		@Pc(15) AnimBase local15 = local12.base;
+		for (@Pc(17) int local17 = 0; local17 < local12.length; local17++) {
+			@Pc(26) short local26 = local12.indices[local17];
+			if (local15.shadow[local26]) {
+				if (local12.prevOriginIndices[local17] != -1) {
 					this.method4567(0, 0, 0, 0);
 				}
-				this.method4567(local15.anIntArray291[local26], local12.aShortArray44[local17], local12.aShortArray50[local17], local12.aShortArray49[local17]);
+				this.method4567(local15.types[local26], local12.aShortArray44[local17], local12.aShortArray50[local17], local12.aShortArray49[local17]);
 			}
 		}
 		this.method4557();
@@ -204,12 +204,12 @@ public abstract class Model extends Entity {
 		if (arg1 == -1 || !this.method4551()) {
 			return;
 		}
-		@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
-		@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
+		@Pc(12) AnimFrame local12 = arg0.frames[arg1];
+		@Pc(15) AnimBase local15 = local12.base;
 		@Pc(17) AnimFrame local17 = null;
 		if (arg2 != null) {
-			local17 = arg2.aClass104Array1[arg3];
-			if (local17.aClass3_Sub20_1 != local15) {
+			local17 = arg2.frames[arg3];
+			if (local17.base != local15) {
 				local17 = null;
 			}
 		}
@@ -240,12 +240,12 @@ public abstract class Model extends Entity {
 		if (arg1 == -1 || !this.method4551()) {
 			return;
 		}
-		@Pc(12) AnimFrame local12 = arg0.aClass104Array1[arg1];
-		@Pc(15) AnimBase local15 = local12.aClass3_Sub20_1;
+		@Pc(12) AnimFrame local12 = arg0.frames[arg1];
+		@Pc(15) AnimBase local15 = local12.base;
 		@Pc(17) AnimFrame local17 = null;
 		if (arg2 != null) {
-			local17 = arg2.aClass104Array1[arg3];
-			if (local17.aClass3_Sub20_1 != local15) {
+			local17 = arg2.frames[arg3];
+			if (local17.base != local15) {
 				local17 = null;
 			}
 		}
@@ -273,20 +273,20 @@ public abstract class Model extends Entity {
 		if (arg12 == null || arg7 == -1) {
 			this.method4558(arg0, arg1, arg2, arg3, arg4, arg5, arg13);
 		} else if (this.method4551()) {
-			@Pc(27) AnimFrame local27 = arg0.aClass104Array1[arg1];
-			@Pc(30) AnimBase local30 = local27.aClass3_Sub20_1;
+			@Pc(27) AnimFrame local27 = arg0.frames[arg1];
+			@Pc(30) AnimBase local30 = local27.base;
 			@Pc(32) AnimFrame local32 = null;
 			if (arg2 != null) {
-				local32 = arg2.aClass104Array1[arg3];
-				if (local32.aClass3_Sub20_1 != local30) {
+				local32 = arg2.frames[arg3];
+				if (local32.base != local30) {
 					local32 = null;
 				}
 			}
-			@Pc(50) AnimFrame local50 = arg6.aClass104Array1[arg7];
+			@Pc(50) AnimFrame local50 = arg6.frames[arg7];
 			@Pc(52) AnimFrame local52 = null;
 			if (arg8 != null) {
-				local52 = arg8.aClass104Array1[arg9];
-				if (local52.aClass3_Sub20_1 != local30) {
+				local52 = arg8.frames[arg9];
+				if (local52.base != local30) {
 					local52 = null;
 				}
 			}
diff --git a/client/src/main/java/MonochromeImageCache.java b/client/src/main/java/MonochromeImageCache.java
index e26d395..bae01ad 100644
--- a/client/src/main/java/MonochromeImageCache.java
+++ b/client/src/main/java/MonochromeImageCache.java
@@ -71,7 +71,7 @@ public final class MonochromeImageCache {
 		}
 		this.aClass3_Sub23Array1 = null;
 		this.anIntArrayArrayArray13 = null;
-		this.aClass69_96.method2278();
+		this.aClass69_96.clear();
 		this.aClass69_96 = null;
 	}
 
@@ -96,13 +96,13 @@ public final class MonochromeImageCache {
 					@Pc(80) Class3_Sub23 local80 = (Class3_Sub23) this.aClass69_96.method2279();
 					local44 = new Class3_Sub23(arg0, local80.anInt3468);
 					this.aClass3_Sub23Array1[local80.anInt3476] = null;
-					local80.method4658();
+					local80.unlink();
 				}
 				this.aClass3_Sub23Array1[arg0] = local44;
 			} else {
 				this.aBoolean195 = false;
 			}
-			this.aClass69_96.method2283(local44);
+			this.aClass69_96.addHead(local44);
 			return this.anIntArrayArrayArray13[local44.anInt3468];
 		}
 	}
diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java
index 54db676..5ecb001 100644
--- a/client/src/main/java/MouseRecorder.java
+++ b/client/src/main/java/MouseRecorder.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class MouseRecorder implements Runnable {
 
 	@OriginalMember(owner = "client!jd", name = "e", descriptor = "Z")
-	public boolean aBoolean151 = true;
+	public boolean running = true;
 
 	@OriginalMember(owner = "client!jd", name = "f", descriptor = "Ljava/lang/Object;")
 	public final Object lock = new Object();
@@ -23,7 +23,7 @@ public final class MouseRecorder implements Runnable {
 	@OriginalMember(owner = "client!jd", name = "run", descriptor = "()V")
 	@Override
 	public final void run() {
-		while (this.aBoolean151) {
+		while (this.running) {
 			@Pc(12) Object local12 = this.lock;
 			synchronized (this.lock) {
 				if (this.samples < 500) {
diff --git a/client/src/main/java/MouseWheel.java b/client/src/main/java/MouseWheel.java
index 69fb220..dba8d7f 100644
--- a/client/src/main/java/MouseWheel.java
+++ b/client/src/main/java/MouseWheel.java
@@ -10,7 +10,7 @@ public abstract class MouseWheel {
 	public abstract int getRotation();
 
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(ZLjava/awt/Component;)V")
-	public abstract void method3291(@OriginalArg(1) Component arg0);
+	public abstract void stop(@OriginalArg(1) Component arg0);
 
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(Ljava/awt/Component;I)V")
 	public abstract void start(@OriginalArg(0) Component arg0);
diff --git a/client/src/main/java/MsiType.java b/client/src/main/java/MsiType.java
index e06ce86..39f2aab 100644
--- a/client/src/main/java/MsiType.java
+++ b/client/src/main/java/MsiType.java
@@ -28,7 +28,7 @@ public final class MsiType {
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(IB)Lclient!ek;")
 	public final SoftwareIndexedSprite method9(@OriginalArg(0) int arg0) {
-		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.method3106((long) (arg0 << 16 | this.anInt12));
+		@Pc(17) SoftwareIndexedSprite local17 = (SoftwareIndexedSprite) Static219.aClass99_27.get((long) (arg0 << 16 | this.anInt12));
 		if (local17 != null) {
 			return local17;
 		}
@@ -36,12 +36,12 @@ public final class MsiType {
 		local17 = Static164.method3119(this.anInt12, Static250.aClass153_101);
 		if (local17 != null) {
 			local17.method1389(Static173.anInt4183, Static85.anInt2262, Static266.anInt5344);
-			local17.anInt4279 = local17.width;
+			local17.innerWidth = local17.width;
 			local17.anInt4276 = local17.anInt4278;
 			for (@Pc(59) int local59 = 0; local59 < arg0; local59++) {
 				local17.method1395();
 			}
-			Static219.aClass99_27.method3095(local17, (long) (arg0 << 16 | this.anInt12));
+			Static219.aClass99_27.put(local17, (long) (arg0 << 16 | this.anInt12));
 		}
 		return local17;
 	}
diff --git a/client/src/main/java/Node.java b/client/src/main/java/Node.java
index ee044a7..98fe780 100644
--- a/client/src/main/java/Node.java
+++ b/client/src/main/java/Node.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public class Node {
 
 	@OriginalMember(owner = "client!ab", name = "a", descriptor = "J")
-	public long uid;
+	public long key;
 
 	@OriginalMember(owner = "client!ab", name = "d", descriptor = "Lclient!ab;")
 	public Node aClass3_222;
@@ -19,7 +19,7 @@ public class Node {
 	}
 
 	@OriginalMember(owner = "client!ab", name = "b", descriptor = "(I)V")
-	public final void method4658() {
+	public final void unlink() {
 		if (this.aClass3_223 != null) {
 			this.aClass3_223.aClass3_222 = this.aClass3_222;
 			this.aClass3_222.aClass3_223 = this.aClass3_223;
diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java
index e341383..2ff23e2 100644
--- a/client/src/main/java/Npc.java
+++ b/client/src/main/java/Npc.java
@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Npc extends PathingEntity {
 
 	@OriginalMember(owner = "client!km", name = "rc", descriptor = "Lclient!me;")
-	public NpcType aClass96_1;
+	public NpcType type;
 
 	@OriginalMember(owner = "client!km", name = "finalize", descriptor = "()V")
 	@Override
@@ -23,23 +23,23 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", name = "a", descriptor = "(IIIIIIIIJILclient!ga;)V")
 	@Override
 	public final void method4546(@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) {
-		if (this.aClass96_1 == null) {
+		if (this.type == null) {
 			return;
 		}
 		@Pc(29) SeqType local29 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
-		@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().anInt1037 && local29 != null ? null : Static36.method941(this.anInt3366);
-		@Pc(74) Model local74 = this.aClass96_1.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
+		@Pc(53) SeqType local53 = this.anInt3366 == -1 || this.anInt3366 == this.method2681().idleAnimationId && local29 != null ? null : Static36.method941(this.anInt3366);
+		@Pc(74) Model local74 = this.type.method2937(this.aClass147Array3, this.anInt3388, this.anInt3407, this.anInt3373, this.anInt3360, this.anInt3425, local53, this.anInt3396, local29);
 		if (local74 == null) {
 			return;
 		}
 		this.anInt3413 = local74.method4549();
-		@Pc(84) NpcType local84 = this.aClass96_1;
+		@Pc(84) NpcType local84 = this.type;
 		if (local84.anIntArray357 != null) {
-			local84 = local84.method2932();
+			local84 = local84.getMultiNpc();
 		}
 		@Pc(140) Model local140;
 		if (Static209.characterShadowsOn && local84.aBoolean180) {
-			local140 = Static41.method1043(this.aClass96_1.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.anInt3412, this.aClass96_1.aShort23, this.anInt3421, this.aClass96_1.aShort24, this.aClass96_1.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.aClass96_1.aByte12);
+			local140 = Static41.method1043(this.type.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.xFine, this.type.aShort23, this.zFine, this.type.aShort24, this.type.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.type.aByte12);
 			if (GlRenderer.enabled) {
 				@Pc(144) float local144 = GlRenderer.method4179();
 				@Pc(146) float local146 = GlRenderer.method4166();
@@ -77,18 +77,18 @@ public final class Npc extends PathingEntity {
 			if (local140 != null) {
 				local74 = ((SoftwareModel) local74).method4588(local140);
 			}
-			if (this.aClass96_1.anInt3713 == 1) {
+			if (this.type.anInt3713 == 1) {
 				local74.aBoolean303 = true;
 			}
 			local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
 			return;
 		}
-		if (this.aClass96_1.anInt3713 == 1) {
+		if (this.type.anInt3713 == 1) {
 			local74.aBoolean303 = true;
 		}
 		local74.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
 		if (local140 != null) {
-			if (this.aClass96_1.anInt3713 == 1) {
+			if (this.type.anInt3713 == 1) {
 				local140.aBoolean303 = true;
 			}
 			local140.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5);
@@ -98,8 +98,8 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
 	@Override
 	protected final int method2688() {
-		if (Static266.game != 0 && this.aClass96_1.anIntArray357 != null) {
-			@Pc(17) NpcType local17 = this.aClass96_1.method2932();
+		if (Static266.game != 0 && this.type.anIntArray357 != null) {
+			@Pc(17) NpcType local17 = this.type.getMultiNpc();
 			if (local17 != null && local17.anInt3737 != -1) {
 				return local17.anInt3737;
 			}
@@ -110,7 +110,7 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", 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 (this.aClass96_1 == null) {
+		if (this.type == null) {
 			;
 		}
 	}
@@ -118,12 +118,12 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", name = "a", descriptor = "(B)Z")
 	@Override
 	public final boolean method2682() {
-		return this.aClass96_1 != null;
+		return this.type != null;
 	}
 
 	@OriginalMember(owner = "client!km", name = "a", descriptor = "(ILclient!me;)V")
 	public final void method2698(@OriginalArg(1) NpcType arg0) {
-		this.aClass96_1 = arg0;
+		this.type = arg0;
 		if (this.aClass47_Sub1_5 != null) {
 			this.aClass47_Sub1_5.method1646();
 		}
diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java
index 0a45477..c09311b 100644
--- a/client/src/main/java/NpcType.java
+++ b/client/src/main/java/NpcType.java
@@ -130,7 +130,7 @@ public final class NpcType {
 	public int anInt3750 = -1;
 
 	@OriginalMember(owner = "client!me", name = "gb", descriptor = "I")
-	public int anInt3746 = 0;
+	public int soundRadius = 0;
 
 	@OriginalMember(owner = "client!me", name = "E", descriptor = "I")
 	private int anInt3731 = 128;
@@ -154,7 +154,7 @@ public final class NpcType {
 	public int anInt3752 = -1;
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(B)Lclient!me;")
-	public final NpcType method2932() {
+	public final NpcType getMultiNpc() {
 		@Pc(5) int local5 = -1;
 		if (this.anInt3723 != -1) {
 			local5 = Static155.getVarbit(this.anInt3723);
@@ -210,17 +210,17 @@ public final class NpcType {
 			return arg1;
 		} else {
 			@Pc(18) IntNode local18 = (IntNode) this.aClass133_15.get((long) arg0);
-			return local18 == null ? arg1 : local18.anInt3141;
+			return local18 == null ? arg1 : local18.value;
 		}
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;")
 	public final Model method2937(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType arg6, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType arg8) {
 		if (this.anIntArray357 != null) {
-			@Pc(13) NpcType local13 = this.method2932();
+			@Pc(13) NpcType local13 = this.getMultiNpc();
 			return local13 == null ? null : local13.method2937(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 		}
-		@Pc(40) Model local40 = (Model) Static125.aClass99_18.method3106((long) this.anInt3741);
+		@Pc(40) Model local40 = (Model) Static125.aClass99_18.get((long) this.anInt3741);
 		@Pc(46) boolean local46;
 		@Pc(173) int local173;
 		@Pc(235) int local235;
@@ -256,17 +256,17 @@ public final class NpcType {
 			if (this.anInt3737 != -1) {
 				local156 = Static90.method1856(this.anInt3737);
 			}
-			if (local156 != null && local156.anIntArrayArray7 != null) {
-				for (local173 = 0; local173 < local156.anIntArrayArray7.length; local173++) {
-					if (local156.anIntArrayArray7[local173] != null && local84.length > local173 && local84[local173] != null) {
-						local200 = local156.anIntArrayArray7[local173][2];
-						local207 = local156.anIntArrayArray7[local173][3];
-						local214 = local156.anIntArrayArray7[local173][4];
-						local221 = local156.anIntArrayArray7[local173][1];
-						local228 = local156.anIntArrayArray7[local173][5];
-						local235 = local156.anIntArrayArray7[local173][0];
+			if (local156 != null && local156.modelRotateTranslate != null) {
+				for (local173 = 0; local173 < local156.modelRotateTranslate.length; local173++) {
+					if (local156.modelRotateTranslate[local173] != null && local84.length > local173 && local84[local173] != null) {
+						local200 = local156.modelRotateTranslate[local173][2];
+						local207 = local156.modelRotateTranslate[local173][3];
+						local214 = local156.modelRotateTranslate[local173][4];
+						local221 = local156.modelRotateTranslate[local173][1];
+						local228 = local156.modelRotateTranslate[local173][5];
+						local235 = local156.modelRotateTranslate[local173][0];
 						if (this.anIntArrayArray28 == null) {
-							this.anIntArrayArray28 = new int[local156.anIntArrayArray7.length][];
+							this.anIntArrayArray28 = new int[local156.modelRotateTranslate.length][];
 						}
 						if (this.anIntArrayArray28[local173] == null) {
 							@Pc(259) int[] local259 = this.anIntArrayArray28[local173] = new int[15];
@@ -334,7 +334,7 @@ public final class NpcType {
 			if (GlRenderer.enabled) {
 				((GlModel) local40).method4111(false, false, false, false, false, true);
 			}
-			Static125.aClass99_18.method3095(local40, (long) this.anInt3741);
+			Static125.aClass99_18.put(local40, (long) this.anInt3741);
 		}
 		local46 = false;
 		@Pc(721) boolean local721 = false;
@@ -354,8 +354,8 @@ public final class NpcType {
 					local214 &= 0xFFFF;
 					Static107.anIntArray259[local235] = local214;
 					if (Static6.aClass3_Sub2_Sub7Array1[local235] != null) {
-						local723 |= Static6.aClass3_Sub2_Sub7Array1[local235].method903(local214);
-						local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].method901(local214);
+						local723 |= Static6.aClass3_Sub2_Sub7Array1[local235].isColorTransformed(local214);
+						local721 |= Static6.aClass3_Sub2_Sub7Array1[local235].isAlphaTransformed(local214);
 						local725 |= local753.aBoolean278;
 					}
 					if ((local753.aBoolean277 || Static204.applyTweening) && local207 != -1 && local753.anIntArray473.length > local207) {
@@ -366,8 +366,8 @@ public final class NpcType {
 						local228 &= 0xFFFF;
 						Static61.anIntArray148[local235] = local228;
 						if (Static131.aClass3_Sub2_Sub7Array5[local235] != null) {
-							local723 |= Static131.aClass3_Sub2_Sub7Array5[local235].method903(local228);
-							local721 |= Static131.aClass3_Sub2_Sub7Array5[local235].method901(local228);
+							local723 |= Static131.aClass3_Sub2_Sub7Array5[local235].isColorTransformed(local228);
+							local721 |= Static131.aClass3_Sub2_Sub7Array5[local235].isAlphaTransformed(local228);
 						}
 					} else {
 						Static71.anIntArray147[local235] = 0;
@@ -397,8 +397,8 @@ public final class NpcType {
 			local235 &= 0xFFFF;
 			local962 = Static72.method1566(local228);
 			if (local962 != null) {
-				local723 |= local962.method903(local235);
-				local721 |= local962.method901(local235);
+				local723 |= local962.isColorTransformed(local235);
+				local721 |= local962.isAlphaTransformed(local235);
 				local725 |= arg8.aBoolean278;
 			}
 			if ((arg8.aBoolean277 || Static204.applyTweening) && arg3 != -1 && arg8.anIntArray473.length > arg3) {
@@ -412,8 +412,8 @@ public final class NpcType {
 					local964 = Static72.method1566(local221 >>> 16);
 				}
 				if (local964 != null) {
-					local723 |= local964.method903(local221);
-					local721 |= local964.method901(local221);
+					local723 |= local964.isColorTransformed(local221);
+					local721 |= local964.isAlphaTransformed(local221);
 				}
 			}
 		}
@@ -428,8 +428,8 @@ public final class NpcType {
 			local228 &= 0xFFFF;
 			local1088 = Static72.method1566(local324);
 			if (local1088 != null) {
-				local723 |= local1088.method903(local228);
-				local721 |= local1088.method901(local228);
+				local723 |= local1088.isColorTransformed(local228);
+				local721 |= local1088.isAlphaTransformed(local228);
 				local725 |= arg6.aBoolean278;
 			}
 			if ((arg6.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg1 < arg6.anIntArray473.length) {
@@ -443,8 +443,8 @@ public final class NpcType {
 					local1092 = Static72.method1566(local1040 >>> 16);
 				}
 				if (local1092 != null) {
-					local723 |= local1092.method903(local1040);
-					local721 |= local1092.method901(local1040);
+					local723 |= local1092.isColorTransformed(local1040);
+					local721 |= local1092.isAlphaTransformed(local1040);
 				}
 			}
 		}
@@ -480,7 +480,7 @@ public final class NpcType {
 			return arg1;
 		} else {
 			@Pc(18) StringNode local18 = (StringNode) this.aClass133_15.get((long) arg0);
-			return local18 == null ? arg1 : local18.aClass100_980;
+			return local18 == null ? arg1 : local18.value;
 		}
 	}
 
@@ -502,12 +502,12 @@ public final class NpcType {
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!tk;IIII)Lclient!ak;")
 	public final Model method2943(@OriginalArg(0) SeqType arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		if (this.anIntArray357 != null) {
-			@Pc(13) NpcType local13 = this.method2932();
+			@Pc(13) NpcType local13 = this.getMultiNpc();
 			return local13 == null ? null : local13.method2943(arg0, arg1, arg2, arg3);
 		} else if (this.anIntArray354 == null) {
 			return null;
 		} else {
-			@Pc(41) Model local41 = (Model) Static262.aClass99_35.method3106((long) this.anInt3741);
+			@Pc(41) Model local41 = (Model) Static262.aClass99_35.get((long) this.anInt3741);
 			if (local41 == null) {
 				@Pc(46) boolean local46 = false;
 				for (@Pc(48) int local48 = 0; local48 < this.anIntArray354.length; local48++) {
@@ -544,7 +544,7 @@ public final class NpcType {
 					}
 				}
 				local41 = local119.method1679(64, 768, -50, -10, -50);
-				Static262.aClass99_35.method3095(local41, (long) this.anInt3741);
+				Static262.aClass99_35.put(local41, (long) this.anInt3741);
 			}
 			if (arg0 != null) {
 				local41 = arg0.method4215(local41, arg2, arg1, arg3);
@@ -704,7 +704,7 @@ public final class NpcType {
 				if (this.anInt3734 == 65535) {
 					this.anInt3734 = -1;
 				}
-				this.anInt3746 = arg1.g1();
+				this.soundRadius = arg1.g1();
 			} else if (arg0 == 135) {
 				this.anInt3750 = arg1.g1();
 				this.anInt3719 = arg1.g2();
@@ -728,7 +728,7 @@ public final class NpcType {
 					} else {
 						local605 = new IntNode(arg1.g4());
 					}
-					this.aClass133_15.method3862(local605, (long) local596);
+					this.aClass133_15.put(local605, (long) local596);
 				}
 			}
 		}
diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java
index 927ac3a..07e00ae 100644
--- a/client/src/main/java/ObjType.java
+++ b/client/src/main/java/ObjType.java
@@ -208,7 +208,7 @@ public final class ObjType {
 			return arg0;
 		} else {
 			@Pc(21) StringNode local21 = (StringNode) this.aClass133_6.get((long) arg1);
-			return local21 == null ? arg0 : local21.aClass100_980;
+			return local21 == null ? arg0 : local21.value;
 		}
 	}
 
@@ -312,7 +312,7 @@ public final class ObjType {
 				return Static71.method1439(local22).method1824(arg0, arg1, arg2, 1, arg4);
 			}
 		}
-		@Pc(76) Model local76 = (Model) Static244.aClass99_32.method3106((long) this.anInt2354);
+		@Pc(76) Model local76 = (Model) Static244.aClass99_32.get((long) this.anInt2354);
 		if (local76 == null) {
 			@Pc(85) RawModel local85 = Static77.method1686(Static230.aClass153_95, this.anInt2320);
 			if (local85 == null) {
@@ -341,7 +341,7 @@ public final class ObjType {
 			if (GlRenderer.enabled) {
 				((GlModel) local76).method4111(false, false, false, false, false, true);
 			}
-			Static244.aClass99_32.method3095(local76, (long) this.anInt2354);
+			Static244.aClass99_32.put(local76, (long) this.anInt2354);
 		}
 		if (arg2 != null) {
 			local76 = arg2.method4215(local76, arg0, arg1, arg4);
@@ -512,7 +512,7 @@ public final class ObjType {
 					} else {
 						local523 = new IntNode(arg0.g4());
 					}
-					this.aClass133_6.method3862(local523, (long) local514);
+					this.aClass133_6.put(local523, (long) local514);
 				}
 			}
 		}
@@ -524,7 +524,7 @@ public final class ObjType {
 			return arg0;
 		} else {
 			@Pc(25) IntNode local25 = (IntNode) this.aClass133_6.get((long) arg1);
-			return local25 == null ? arg0 : local25.anInt3141;
+			return local25 == null ? arg0 : local25.value;
 		}
 	}
 
diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java
index f36817e..6f786fe 100644
--- a/client/src/main/java/PathingEntity.java
+++ b/client/src/main/java/PathingEntity.java
@@ -58,13 +58,13 @@ public abstract class PathingEntity extends Entity {
 	public int anInt3411;
 
 	@OriginalMember(owner = "client!fe", name = "Qb", descriptor = "I")
-	public int anInt3412;
+	public int xFine;
 
 	@OriginalMember(owner = "client!fe", name = "Ub", descriptor = "I")
 	public int anInt3416;
 
 	@OriginalMember(owner = "client!fe", name = "ac", descriptor = "I")
-	public int anInt3421;
+	public int zFine;
 
 	@OriginalMember(owner = "client!fe", name = "dc", descriptor = "I")
 	public int anInt3424;
@@ -127,7 +127,7 @@ public abstract class PathingEntity extends Entity {
 	public int anInt3390 = 0;
 
 	@OriginalMember(owner = "client!fe", name = "mb", descriptor = "[B")
-	public final byte[] aByteArray48 = new byte[10];
+	public final byte[] movementQueueSpeed = new byte[10];
 
 	@OriginalMember(owner = "client!fe", name = "W", descriptor = "I")
 	public int anInt3376 = 32;
@@ -163,7 +163,7 @@ public abstract class PathingEntity extends Entity {
 	protected int anInt3413 = -32768;
 
 	@OriginalMember(owner = "client!fe", name = "Nb", descriptor = "I")
-	public int anInt3409 = 0;
+	public int movementQueueSize = 0;
 
 	@OriginalMember(owner = "client!fe", name = "Zb", descriptor = "I")
 	public int anInt3420 = 0;
@@ -272,15 +272,15 @@ public abstract class PathingEntity extends Entity {
 			@Pc(32) int local32 = arg1 - this.movementQueueX[0];
 			@Pc(40) int local40 = arg2 - this.movementQueueZ[0];
 			if (local32 >= -8 && local32 <= 8 && local40 >= -8 && local40 <= 8) {
-				if (this.anInt3409 < 9) {
-					this.anInt3409++;
+				if (this.movementQueueSize < 9) {
+					this.movementQueueSize++;
 				}
-				for (@Pc(72) int local72 = this.anInt3409; local72 > 0; local72--) {
+				for (@Pc(72) int local72 = this.movementQueueSize; local72 > 0; local72--) {
 					this.movementQueueX[local72] = this.movementQueueX[local72 - 1];
 					this.movementQueueZ[local72] = this.movementQueueZ[local72 - 1];
-					this.aByteArray48[local72] = this.aByteArray48[local72 - 1];
+					this.movementQueueSpeed[local72] = this.movementQueueSpeed[local72 - 1];
 				}
-				this.aByteArray48[0] = 1;
+				this.movementQueueSpeed[0] = 1;
 				this.movementQueueX[0] = arg1;
 				this.movementQueueZ[0] = arg2;
 				return;
@@ -289,10 +289,10 @@ public abstract class PathingEntity extends Entity {
 		this.anInt3417 = 0;
 		this.movementQueueX[0] = arg1;
 		this.movementQueueZ[0] = arg2;
-		this.anInt3409 = 0;
+		this.movementQueueSize = 0;
 		this.anInt3405 = 0;
-		this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128;
-		this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128;
+		this.zFine = arg0 * 64 + this.movementQueueZ[0] * 128;
+		this.xFine = arg0 * 64 + this.movementQueueX[0] * 128;
 		if (GlRenderer.enabled && Static173.self == this) {
 			Static86.setInstantFade();
 		}
@@ -309,18 +309,18 @@ public abstract class PathingEntity extends Entity {
 		if (this.anInt3369 != -1 && Static36.method941(this.anInt3369).anInt5349 == 1) {
 			this.anInt3369 = -1;
 		}
-		if (this.anInt3409 < 9) {
-			this.anInt3409++;
+		if (this.movementQueueSize < 9) {
+			this.movementQueueSize++;
 		}
-		for (@Pc(50) int local50 = this.anInt3409; local50 > 0; local50--) {
+		for (@Pc(50) int local50 = this.movementQueueSize; local50 > 0; local50--) {
 			this.movementQueueX[local50] = this.movementQueueX[local50 - 1];
 			this.movementQueueZ[local50] = this.movementQueueZ[local50 - 1];
-			this.aByteArray48[local50] = this.aByteArray48[local50 - 1];
+			this.movementQueueSpeed[local50] = this.movementQueueSpeed[local50 - 1];
 		}
 		if (arg1 == 1) {
 			local15++;
 		}
-		this.aByteArray48[0] = (byte) arg0;
+		this.movementQueueSpeed[0] = (byte) arg0;
 		if (arg1 == 2) {
 			local15++;
 			local10++;
@@ -363,13 +363,13 @@ public abstract class PathingEntity extends Entity {
 		@Pc(53) int local53 = -local27 / 2;
 		@Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16;
 		@Pc(75) int local75 = local39 * local53 + local43 * local48 >> 16;
-		@Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.anInt3412, this.anInt3421 + local64);
+		@Pc(87) int local87 = Static207.method3685(Static55.level, local75 + this.xFine, this.zFine + local64);
 		@Pc(91) int local91 = local24 / 2;
 		@Pc(96) int local96 = -local27 / 2;
 		@Pc(106) int local106 = local91 * local43 + local96 * local39 >> 16;
 		@Pc(110) int local110 = local27 / 2;
 		@Pc(121) int local121 = local96 * local43 - local91 * local39 >> 16;
-		@Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.anInt3412, this.anInt3421 - -local121);
+		@Pc(134) int local134 = Static207.method3685(Static55.level, local106 + this.xFine, this.zFine - -local121);
 		@Pc(139) int local139 = -local24 / 2;
 		@Pc(150) int local150 = local110 * local43 - local39 * local139 >> 16;
 		@Pc(154) int local154 = local27 / 2;
@@ -377,9 +377,9 @@ public abstract class PathingEntity extends Entity {
 		@Pc(169) int local169 = local39 * local110 + local43 * local139 >> 16;
 		@Pc(179) int local179 = local154 * local43 - local39 * local158 >> 16;
 		@Pc(189) int local189 = local39 * local154 + local43 * local158 >> 16;
-		@Pc(201) int local201 = Static207.method3685(Static55.level, this.anInt3412 + local169, local150 + this.anInt3421);
+		@Pc(201) int local201 = Static207.method3685(Static55.level, this.xFine + local169, local150 + this.zFine);
 		@Pc(212) int local212 = local134 > local87 ? local87 : local134;
-		@Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.anInt3412, local179 + this.anInt3421);
+		@Pc(224) int local224 = Static207.method3685(Static55.level, local189 + this.xFine, local179 + this.zFine);
 		@Pc(231) int local231 = local224 > local201 ? local201 : local224;
 		@Pc(238) int local238 = local224 > local134 ? local134 : local224;
 		@Pc(245) int local245 = local201 <= local87 ? local201 : local87;
@@ -619,7 +619,7 @@ public abstract class PathingEntity extends Entity {
 
 	@OriginalMember(owner = "client!fe", name = "c", descriptor = "(I)V")
 	public final void method2689() {
-		this.anInt3409 = 0;
+		this.movementQueueSize = 0;
 		this.anInt3405 = 0;
 	}
 
@@ -634,7 +634,7 @@ public abstract class PathingEntity extends Entity {
 	}
 
 	@OriginalMember(owner = "client!fe", name = "c", descriptor = "(B)I")
-	public int method2693() {
+	public int getSize() {
 		return this.anInt3415;
 	}
 }
diff --git a/client/src/main/java/PcmStream.java b/client/src/main/java/PcmStream.java
index a686bd9..ba9b044 100644
--- a/client/src/main/java/PcmStream.java
+++ b/client/src/main/java/PcmStream.java
@@ -23,9 +23,9 @@ public abstract class PcmStream extends Node {
 	@OriginalMember(owner = "client!qb", name = "a", descriptor = "([III)V")
 	protected final void method4405(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (this.aBoolean292) {
-			this.method4408(arg0, arg1, arg2);
+			this.read(arg0, arg1, arg2);
 		} else {
-			this.method4410(arg2);
+			this.skip(arg2);
 		}
 	}
 
@@ -38,11 +38,11 @@ public abstract class PcmStream extends Node {
 	}
 
 	@OriginalMember(owner = "client!qb", name = "b", descriptor = "([III)V")
-	public abstract void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
+	public abstract void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2);
 
 	@OriginalMember(owner = "client!qb", name = "d", descriptor = "()Lclient!qb;")
 	public abstract PcmStream method4409();
 
 	@OriginalMember(owner = "client!qb", name = "c", descriptor = "(I)V")
-	public abstract void method4410(@OriginalArg(0) int arg0);
+	public abstract void skip(@OriginalArg(0) int arg0);
 }
diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java
index 9cdf0fe..9ae415c 100644
--- a/client/src/main/java/Player.java
+++ b/client/src/main/java/Player.java
@@ -34,7 +34,7 @@ public final class Player extends PathingEntity {
 	public int anInt1648 = -1;
 
 	@OriginalMember(owner = "client!e", name = "Pc", descriptor = "I")
-	public int anInt1664 = 0;
+	public int soundRadius = 0;
 
 	@OriginalMember(owner = "client!e", name = "Hc", descriptor = "I")
 	public int anInt1658 = -1;
@@ -56,8 +56,8 @@ public final class Player extends PathingEntity {
 
 	@OriginalMember(owner = "client!e", name = "c", descriptor = "(B)I")
 	@Override
-	public final int method2693() {
-		return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.method2693() : Static214.method4363(this.aClass59_1.anInt2492).anInt3713;
+	public final int getSize() {
+		return this.aClass59_1 == null || this.aClass59_1.anInt2492 == -1 ? super.getSize() : Static214.method4363(this.aClass59_1.anInt2492).anInt3713;
 	}
 
 	@OriginalMember(owner = "client!e", name = "b", descriptor = "(I)I")
@@ -73,12 +73,12 @@ public final class Player extends PathingEntity {
 		@Pc(22) int local22 = -1;
 		@Pc(26) int local26 = local20 & 0x1;
 		@Pc(37) boolean local37 = (local20 & 0x4) != 0;
-		@Pc(41) int local41 = super.method2693();
+		@Pc(41) int local41 = super.getSize();
 		@Pc(44) int[] local44 = new int[12];
 		this.method2692((local20 >> 3 & 0x7) + 1);
 		this.anInt1651 = local20 >> 6 & 0x3;
-		this.anInt3412 += (this.method2693() - local41) * 64;
-		this.anInt3421 += (this.method2693() - local41) * 64;
+		this.xFine += (this.getSize() - local41) * 64;
+		this.zFine += (this.getSize() - local41) * 64;
 		this.anInt1669 = arg0.g1s();
 		this.anInt1649 = arg0.g1s();
 		this.anInt1650 = 0;
@@ -134,9 +134,9 @@ public final class Player extends PathingEntity {
 				this.anInt1667 = -1;
 			}
 		}
-		local134 = this.anInt1664;
-		this.anInt1664 = arg0.g1();
-		if (this.anInt1664 == 0) {
+		local134 = this.soundRadius;
+		this.soundRadius = arg0.g1();
+		if (this.soundRadius == 0) {
 			Static271.method4597(this);
 		} else {
 			@Pc(309) int local309 = this.anInt1658;
@@ -147,7 +147,7 @@ public final class Player extends PathingEntity {
 			this.anInt1658 = arg0.g2();
 			this.anInt1654 = arg0.g2();
 			this.anInt1670 = arg0.g2();
-			if (this.anInt1664 != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) {
+			if (this.soundRadius != local134 || this.anInt1648 != local175 || this.anInt1658 != local309 || local312 != this.anInt1654 || this.anInt1670 != local315) {
 				Static214.method4359(this);
 			}
 		}
@@ -157,8 +157,8 @@ public final class Player extends PathingEntity {
 		local175 = this.aClass59_1.anInt2492;
 		this.aClass59_1.method1950(local197, local22, local26 == 1, local44, this.anInt3365);
 		if (local175 != local22) {
-			this.anInt3412 = this.movementQueueX[0] * 128 + this.method2693() * 64;
-			this.anInt3421 = this.movementQueueZ[0] * 128 + this.method2693() * 64;
+			this.xFine = this.movementQueueX[0] * 128 + this.getSize() * 64;
+			this.zFine = this.movementQueueZ[0] * 128 + this.getSize() * 64;
 		}
 		if (this.aClass47_Sub1_5 != null) {
 			this.aClass47_Sub1_5.method1646();
@@ -172,7 +172,7 @@ public final class Player extends PathingEntity {
 			return;
 		}
 		@Pc(25) SeqType local25 = this.anInt3369 != -1 && this.anInt3420 == 0 ? Static36.method941(this.anInt3369) : null;
-		@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().anInt1037 && local25 != null ? null : Static36.method941(this.anInt3366);
+		@Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().idleAnimationId && local25 != null ? null : Static36.method941(this.anInt3366);
 		@Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407);
 		@Pc(79) int local79 = Static198.method1029();
 		if (GlRenderer.enabled && GameShell.maxMemory < 96 && local79 > 50) {
@@ -196,7 +196,7 @@ public final class Player extends PathingEntity {
 		this.anInt3413 = local76.method4549();
 		@Pc(184) Model local184;
 		if (Static209.characterShadowsOn && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) {
-			local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.anInt3412, 0, this.anInt3421, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
+			local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.xFine, 0, this.zFine, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240);
 			if (GlRenderer.enabled) {
 				@Pc(188) float local188 = GlRenderer.method4179();
 				@Pc(190) float local190 = GlRenderer.method4166();
@@ -215,24 +215,24 @@ public final class Player extends PathingEntity {
 				if (local245 != null && local245.anInt4052 != -1) {
 					@Pc(291) int local291;
 					@Pc(302) int local302;
-					if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.aClass8_Sub4_Sub2Array1.length > local245.anInt4057) {
-						@Pc(278) Npc local278 = Static175.aClass8_Sub4_Sub2Array1[local245.anInt4057];
+					if (local245.anInt4058 == 1 && local245.anInt4057 >= 0 && Static175.npcs.length > local245.anInt4057) {
+						@Pc(278) Npc local278 = Static175.npcs[local245.anInt4057];
 						if (local278 != null) {
-							local291 = local278.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-							local302 = local278.anInt3421 / 32 - Static173.self.anInt3421 / 32;
+							local291 = local278.xFine / 32 - Static173.self.xFine / 32;
+							local302 = local278.zFine / 32 - Static173.self.zFine / 32;
 							this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 						}
 					}
 					if (local245.anInt4058 == 2) {
-						@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32;
-						local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32;
+						@Pc(340) int local340 = (local245.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32;
+						local291 = (local245.anInt4046 - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32;
 						this.method1263(null, local291, local76, local340, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 					}
 					if (local245.anInt4058 == 10 && local245.anInt4057 >= 0 && Static159.players.length > local245.anInt4057) {
 						@Pc(395) Player local395 = Static159.players[local245.anInt4057];
 						if (local395 != null) {
-							local291 = local395.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-							local302 = local395.anInt3421 / 32 - Static173.self.anInt3421 / 32;
+							local291 = local395.xFine / 32 - Static173.self.xFine / 32;
+							local302 = local395.zFine / 32 - Static173.self.zFine / 32;
 							this.method1263(null, local302, local76, local291, arg5, arg9, arg0, arg7, arg4, arg3, arg1, local245.anInt4052, arg2, arg6);
 						}
 					}
@@ -271,7 +271,7 @@ public final class Player extends PathingEntity {
 				} else {
 					local515 = (Model) this.attachment;
 				}
-				local515.method4575(this.anInt3379 - this.anInt3412, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.anInt3421);
+				local515.method4575(this.anInt3379 - this.xFine, this.anInt3406 + -this.anInt3424, this.anInt3426 - this.zFine);
 				if (this.anInt3400 == 512) {
 					local515.method4578();
 				} else if (this.anInt3400 == 1024) {
@@ -308,7 +308,7 @@ public final class Player extends PathingEntity {
 		} else if (this.anInt3400 == 1536) {
 			local515.method4578();
 		}
-		local515.method4575(this.anInt3412 - this.anInt3379, -this.anInt3406 + this.anInt3424, this.anInt3421 - this.anInt3426);
+		local515.method4575(this.xFine - this.anInt3379, -this.anInt3406 + this.anInt3424, this.zFine - this.anInt3426);
 	}
 
 	@OriginalMember(owner = "client!e", name = "a", descriptor = "(Lclient!ga;ILclient!ak;IIIIIIIIIIII)V")
@@ -318,7 +318,7 @@ public final class Player extends PathingEntity {
 			return;
 		}
 		@Pc(34) int local34 = (int) (Math.atan2((double) arg3, (double) arg1) * 325.949D) & 0x7FF;
-		@Pc(46) Model local46 = Static220.method3800(local34, this.anInt3421, arg11, this.anInt3412, arg2, this.anInt3424);
+		@Pc(46) Model local46 = Static220.method3800(local34, this.zFine, arg11, this.xFine, arg2, this.anInt3424);
 		if (local46 == null) {
 			return;
 		}
@@ -360,7 +360,7 @@ public final class Player extends PathingEntity {
 
 	@OriginalMember(owner = "client!e", name = "a", descriptor = "(BIZI)V")
 	public final void method1265(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2) {
-		super.method2683(this.method2693(), arg0, arg2, arg1);
+		super.method2683(this.getSize(), arg0, arg2, arg1);
 	}
 
 	@OriginalMember(owner = "client!e", name = "finalize", descriptor = "()V")
diff --git a/client/src/main/java/PlayerAppearance.java b/client/src/main/java/PlayerAppearance.java
index 4bef7a8..15da8bc 100644
--- a/client/src/main/java/PlayerAppearance.java
+++ b/client/src/main/java/PlayerAppearance.java
@@ -33,7 +33,7 @@ public final class PlayerAppearance {
 	@OriginalMember(owner = "client!hh", name = "a", descriptor = "(IIIILclient!tk;III)Lclient!ak;")
 	public final Model method1946(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) {
 		@Pc(24) long local24 = (long) arg2 | (long) (arg6 << 16) | (long) arg1 << 32;
-		@Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(local24);
+		@Pc(30) Model local30 = (Model) Static139.aClass99_21.get(local24);
 		if (local30 == null) {
 			@Pc(36) RawModel[] local36 = new RawModel[3];
 			@Pc(38) int local38 = 0;
@@ -63,7 +63,7 @@ public final class PlayerAppearance {
 				}
 			}
 			local30 = local66.method1679(64, 768, -50, -10, -50);
-			Static139.aClass99_21.method3095(local30, local24);
+			Static139.aClass99_21.put(local30, local24);
 		}
 		if (arg4 != null) {
 			local30 = arg4.method4215(local30, arg0, arg3, arg5);
@@ -176,7 +176,7 @@ public final class PlayerAppearance {
 				}
 			}
 		}
-		@Pc(154) Model local154 = (Model) Static250.aClass99_33.method3106(local41);
+		@Pc(154) Model local154 = (Model) Static250.aClass99_33.get(local41);
 		@Pc(158) boolean local158;
 		@Pc(353) int local353;
 		@Pc(360) int local360;
@@ -204,7 +204,7 @@ public final class PlayerAppearance {
 			}
 			if (local158) {
 				if (this.aLong87 != -1L) {
-					local154 = (Model) Static250.aClass99_33.method3106(this.aLong87);
+					local154 = (Model) Static250.aClass99_33.get(this.aLong87);
 				}
 				if (local154 == null) {
 					return null;
@@ -232,17 +232,17 @@ public final class PlayerAppearance {
 				if (this.anInt2497 != -1) {
 					local303 = Static90.method1856(this.anInt2497);
 				}
-				if (local303 != null && local303.anIntArrayArray7 != null) {
-					for (local250 = 0; local250 < local303.anIntArrayArray7.length; local250++) {
-						if (local303.anIntArrayArray7[local250] != null && local239[local250] != null) {
-							local346 = local303.anIntArrayArray7[local250][0];
-							local353 = local303.anIntArrayArray7[local250][1];
-							local360 = local303.anIntArrayArray7[local250][2];
-							local367 = local303.anIntArrayArray7[local250][4];
-							local374 = local303.anIntArrayArray7[local250][3];
-							local381 = local303.anIntArrayArray7[local250][5];
+				if (local303 != null && local303.modelRotateTranslate != null) {
+					for (local250 = 0; local250 < local303.modelRotateTranslate.length; local250++) {
+						if (local303.modelRotateTranslate[local250] != null && local239[local250] != null) {
+							local346 = local303.modelRotateTranslate[local250][0];
+							local353 = local303.modelRotateTranslate[local250][1];
+							local360 = local303.modelRotateTranslate[local250][2];
+							local367 = local303.modelRotateTranslate[local250][4];
+							local374 = local303.modelRotateTranslate[local250][3];
+							local381 = local303.modelRotateTranslate[local250][5];
 							if (this.anIntArrayArray19 == null) {
-								this.anIntArrayArray19 = new int[local303.anIntArrayArray7.length][];
+								this.anIntArrayArray19 = new int[local303.modelRotateTranslate.length][];
 							}
 							if (this.anIntArrayArray19[local250] == null) {
 								@Pc(404) int[] local404 = this.anIntArrayArray19[local250] = new int[15];
@@ -299,7 +299,7 @@ public final class PlayerAppearance {
 				if (GlRenderer.enabled) {
 					((GlModel) local154).method4111(false, false, true, false, false, true);
 				}
-				Static250.aClass99_33.method3095(local154, local41);
+				Static250.aClass99_33.put(local154, local41);
 				this.aLong87 = local41;
 			}
 		}
@@ -322,8 +322,8 @@ public final class PlayerAppearance {
 					local381 &= 0xFFFF;
 					Static241.anIntArray520[local353] = local381;
 					if (Static276.aClass3_Sub2_Sub7Array8[local353] != null) {
-						local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].method903(local381);
-						local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].method901(local381);
+						local836 |= Static276.aClass3_Sub2_Sub7Array8[local353].isColorTransformed(local381);
+						local827 |= Static276.aClass3_Sub2_Sub7Array8[local353].isAlphaTransformed(local381);
 						local838 |= local858.aBoolean278;
 					}
 					if ((local858.aBoolean277 || Static204.applyTweening) && local367 != -1 && local367 < local858.anIntArray473.length) {
@@ -334,8 +334,8 @@ public final class PlayerAppearance {
 						@Pc(991) int local991 = local979 & 0xFFFF;
 						Static216.anIntArray187[local353] = local991;
 						if (Static133.aClass3_Sub2_Sub7Array7[local353] != null) {
-							local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].method903(local991);
-							local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].method901(local991);
+							local836 |= Static133.aClass3_Sub2_Sub7Array7[local353].isColorTransformed(local991);
+							local827 |= Static133.aClass3_Sub2_Sub7Array7[local353].isAlphaTransformed(local991);
 						}
 					} else {
 						Static262.anIntArray515[local353] = 0;
@@ -360,8 +360,8 @@ public final class PlayerAppearance {
 			local1042 = Static72.method1566(local979);
 			local353 &= 0xFFFF;
 			if (local1042 != null) {
-				local836 |= local1042.method903(local353);
-				local827 |= local1042.method901(local353);
+				local836 |= local1042.isColorTransformed(local353);
+				local827 |= local1042.isAlphaTransformed(local353);
 				local838 |= arg3.aBoolean278;
 			}
 			if ((arg3.aBoolean277 || Static204.applyTweening) && arg1 != -1 && arg3.anIntArray473.length > arg1) {
@@ -375,8 +375,8 @@ public final class PlayerAppearance {
 					local1040 = Static72.method1566(local360 >>> 16);
 				}
 				if (local1040 != null) {
-					local836 |= local1040.method903(local360);
-					local827 |= local1040.method901(local360);
+					local836 |= local1040.isColorTransformed(local360);
+					local827 |= local1040.isAlphaTransformed(local360);
 				}
 			}
 		}
@@ -391,8 +391,8 @@ public final class PlayerAppearance {
 			local979 &= 0xFFFF;
 			local1154 = Static72.method1566(local475);
 			if (local1154 != null) {
-				local836 |= local1154.method903(local979);
-				local827 |= local1154.method901(local979);
+				local836 |= local1154.isColorTransformed(local979);
+				local827 |= local1154.isAlphaTransformed(local979);
 				local838 |= arg2.aBoolean278;
 			}
 			if ((arg2.aBoolean277 || Static204.applyTweening) && arg5 != -1 && arg2.anIntArray473.length > arg5) {
@@ -406,8 +406,8 @@ public final class PlayerAppearance {
 					local1156 = Static72.method1566(local451 >>> 16);
 				}
 				if (local1156 != null) {
-					local836 |= local1156.method903(local451);
-					local827 |= local1156.method901(local451);
+					local836 |= local1156.isColorTransformed(local451);
+					local827 |= local1156.isAlphaTransformed(local451);
 				}
 			}
 		}
@@ -441,7 +441,7 @@ public final class PlayerAppearance {
 		if (this.anInt2492 != -1) {
 			return Static214.method4363(this.anInt2492).method2943(arg1, arg0, arg3, arg2);
 		}
-		@Pc(30) Model local30 = (Model) Static139.aClass99_21.method3106(this.aLong88);
+		@Pc(30) Model local30 = (Model) Static139.aClass99_21.get(this.aLong88);
 		if (local30 == null) {
 			@Pc(42) boolean local42 = false;
 			@Pc(52) int local52;
@@ -486,7 +486,7 @@ public final class PlayerAppearance {
 				}
 			}
 			local30 = local171.method1679(64, 768, -50, -10, -50);
-			Static139.aClass99_21.method3095(local30, this.aLong88);
+			Static139.aClass99_21.put(local30, this.aLong88);
 		}
 		if (arg1 != null) {
 			local30 = arg1.method4215(local30, arg3, arg0, arg2);
diff --git a/client/src/main/java/SecondaryLinkedList.java b/client/src/main/java/SecondaryLinkedList.java
index 3350781..545cc43 100644
--- a/client/src/main/java/SecondaryLinkedList.java
+++ b/client/src/main/java/SecondaryLinkedList.java
@@ -65,7 +65,7 @@ public final class SecondaryLinkedList {
 	}
 
 	@OriginalMember(owner = "client!ce", name = "a", descriptor = "(Lclient!rg;B)V")
-	public final void method798(@OriginalArg(0) SecondaryNode arg0) {
+	public final void addTail(@OriginalArg(0) SecondaryNode arg0) {
 		if (arg0.aClass3_Sub2_66 != null) {
 			arg0.method4365();
 		}
diff --git a/client/src/main/java/SecondaryNode.java b/client/src/main/java/SecondaryNode.java
index 747cffe..ab0d495 100644
--- a/client/src/main/java/SecondaryNode.java
+++ b/client/src/main/java/SecondaryNode.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public class SecondaryNode extends Node {
 
 	@OriginalMember(owner = "client!rg", name = "v", descriptor = "J")
-	public long aLong185;
+	public long secondaryKey;
 
 	@OriginalMember(owner = "client!rg", name = "w", descriptor = "Lclient!rg;")
 	public SecondaryNode aClass3_Sub2_66;
diff --git a/client/src/main/java/SeqType.java b/client/src/main/java/SeqType.java
index dec2707..4c0023c 100644
--- a/client/src/main/java/SeqType.java
+++ b/client/src/main/java/SeqType.java
@@ -89,9 +89,9 @@ public final class SeqType {
 		}
 		@Pc(124) Model local124;
 		if (local41 == null) {
-			local124 = arg2.method4568(!local23.method901(local27), !local23.method903(local27), !this.aBoolean278);
+			local124 = arg2.method4568(!local23.isAlphaTransformed(local27), !local23.isColorTransformed(local27), !this.aBoolean278);
 		} else {
-			local124 = arg2.method4568(!local23.method901(local27) & !local41.method901(arg1), !local23.method903(local27) & !local41.method903(arg1), !this.aBoolean278);
+			local124 = arg2.method4568(!local23.isAlphaTransformed(local27) & !local41.isAlphaTransformed(arg1), !local23.isColorTransformed(local27) & !local41.isColorTransformed(arg1), !this.aBoolean278);
 		}
 		if (GlRenderer.enabled && this.aBoolean278) {
 			if (local39 == 1) {
@@ -162,19 +162,19 @@ public final class SeqType {
 				}
 			}
 		}
-		@Pc(163) boolean local163 = !local19.method901(local23);
-		@Pc(172) boolean local172 = !local19.method903(local23);
+		@Pc(163) boolean local163 = !local19.isAlphaTransformed(local23);
+		@Pc(172) boolean local172 = !local19.isColorTransformed(local23);
 		if (local71 != null) {
-			local163 &= !local71.method901(local83);
-			local172 &= !local71.method903(local83);
+			local163 &= !local71.isAlphaTransformed(local83);
+			local172 &= !local71.isColorTransformed(local83);
 		}
 		if (local34 != null) {
-			local163 &= !local34.method901(arg1);
-			local172 &= !local34.method903(arg1);
+			local163 &= !local34.isAlphaTransformed(arg1);
+			local172 &= !local34.isColorTransformed(arg1);
 		}
 		if (local81 != null) {
-			local163 &= !local81.method901(local85);
-			local172 &= !local81.method903(local85);
+			local163 &= !local81.isAlphaTransformed(local85);
+			local172 &= !local81.isColorTransformed(local85);
 		}
 		@Pc(258) Model local258 = arg0.method4572(local163, local172, !this.aBoolean278);
 		local258.method4558(local19, local23, local34, arg1, arg2 - 1, local13, this.aBoolean278);
@@ -202,9 +202,9 @@ public final class SeqType {
 		}
 		@Pc(106) Model local106;
 		if (local42 == null) {
-			local106 = arg4.method4572(!local19.method901(local27), !local19.method903(local27), !this.aBoolean278);
+			local106 = arg4.method4572(!local19.isAlphaTransformed(local27), !local19.isColorTransformed(local27), !this.aBoolean278);
 		} else {
-			local106 = arg4.method4572(!local19.method901(local27) & !local42.method901(arg0), !local19.method903(local27) & !local42.method903(arg0), !this.aBoolean278);
+			local106 = arg4.method4572(!local19.isAlphaTransformed(local27) & !local42.isAlphaTransformed(arg0), !local19.isColorTransformed(local27) & !local42.isColorTransformed(arg0), !this.aBoolean278);
 		}
 		if (this.aBoolean278 && GlRenderer.enabled) {
 			if (local40 == 1) {
@@ -276,9 +276,9 @@ public final class SeqType {
 		}
 		@Pc(103) Model local103;
 		if (local42 == null) {
-			local103 = arg3.method4560(!local27.method901(local31), !local27.method903(local31), !this.aBoolean278);
+			local103 = arg3.method4560(!local27.isAlphaTransformed(local31), !local27.isColorTransformed(local31), !this.aBoolean278);
 		} else {
-			local103 = arg3.method4560(!local27.method901(local31) & !local42.method901(arg0), !local27.method903(local31) & !local42.method903(arg0), !this.aBoolean278);
+			local103 = arg3.method4560(!local27.isAlphaTransformed(local31) & !local42.isAlphaTransformed(arg0), !local27.isColorTransformed(local31) & !local42.isColorTransformed(arg0), !this.aBoolean278);
 		}
 		local103.method4558(local27, local31, local42, arg0, arg1 - 1, local16, this.aBoolean278);
 		return local103;
diff --git a/client/src/main/java/SignLinkAudioChannel.java b/client/src/main/java/SignLinkAudioChannel.java
index 2d31d37..1079c84 100644
--- a/client/src/main/java/SignLinkAudioChannel.java
+++ b/client/src/main/java/SignLinkAudioChannel.java
@@ -27,7 +27,7 @@ public final class SignLinkAudioChannel extends AudioChannel {
 	@OriginalMember(owner = "client!hl", name = "a", descriptor = "()V")
 	@Override
 	protected final void write() {
-		audioSource.write(this.channel, this.anIntArray411);
+		audioSource.write(this.channel, this.samples);
 	}
 
 	@OriginalMember(owner = "client!hl", name = "a", descriptor = "(Ljava/awt/Component;)V")
diff --git a/client/src/main/java/SoftLruHashTable.java b/client/src/main/java/SoftLruHashTable.java
index 7afc0b7..0fbac03 100644
--- a/client/src/main/java/SoftLruHashTable.java
+++ b/client/src/main/java/SoftLruHashTable.java
@@ -29,26 +29,26 @@ public final class SoftLruHashTable {
 	}
 
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(BLjava/lang/Object;J)V")
-	public final void method3095(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
+	public final void put(@OriginalArg(1) Object arg0, @OriginalArg(2) long arg1) {
 		this.method3098(arg1);
 		if (this.anInt3966 == 0) {
 			@Pc(26) ReferenceNode local26 = (ReferenceNode) this.aClass16_8.method796();
-			local26.method4658();
+			local26.unlink();
 			local26.method4365();
 		} else {
 			this.anInt3966--;
 		}
 		@Pc(44) HardReferenceNode local44 = new HardReferenceNode(arg0);
-		this.aClass133_18.method3862(local44, arg1);
-		this.aClass16_8.method798(local44);
-		local44.aLong185 = 0L;
+		this.aClass133_18.put(local44, arg1);
+		this.aClass16_8.addTail(local44);
+		local44.secondaryKey = 0L;
 	}
 
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(JB)V")
 	public final void method3098(@OriginalArg(0) long arg0) {
 		@Pc(6) ReferenceNode local6 = (ReferenceNode) this.aClass133_18.get(arg0);
 		if (local6 != null) {
-			local6.method4658();
+			local6.unlink();
 			local6.method4365();
 			this.anInt3966++;
 		}
@@ -73,15 +73,15 @@ public final class SoftLruHashTable {
 		for (@Pc(9) ReferenceNode local9 = (ReferenceNode) this.aClass16_8.method795(); local9 != null; local9 = (ReferenceNode) this.aClass16_8.method797()) {
 			if (local9.method3619()) {
 				if (local9.method3618() == null) {
-					local9.method4658();
+					local9.unlink();
 					local9.method4365();
 					this.anInt3966++;
 				}
-			} else if (++local9.aLong185 > (long) arg0) {
+			} else if (++local9.secondaryKey > (long) arg0) {
 				@Pc(33) ReferenceNode local33 = Static252.aClass22_1.method1027(local9);
-				this.aClass133_18.method3862(local33, local9.uid);
+				this.aClass133_18.put(local33, local9.key);
 				Static84.method1772(local9, local33);
-				local9.method4658();
+				local9.unlink();
 				local9.method4365();
 			}
 		}
@@ -91,7 +91,7 @@ public final class SoftLruHashTable {
 	public final void method3103() {
 		for (@Pc(7) ReferenceNode local7 = (ReferenceNode) this.aClass16_8.method795(); local7 != null; local7 = (ReferenceNode) this.aClass16_8.method797()) {
 			if (local7.method3619()) {
-				local7.method4658();
+				local7.unlink();
 				local7.method4365();
 				this.anInt3966++;
 			}
@@ -106,28 +106,28 @@ public final class SoftLruHashTable {
 	}
 
 	@OriginalMember(owner = "client!n", name = "b", descriptor = "(JB)Ljava/lang/Object;")
-	public final Object method3106(@OriginalArg(0) long arg0) {
+	public final Object get(@OriginalArg(0) long arg0) {
 		@Pc(12) ReferenceNode local12 = (ReferenceNode) this.aClass133_18.get(arg0);
 		if (local12 == null) {
 			return null;
 		}
 		@Pc(27) Object local27 = local12.method3618();
 		if (local27 == null) {
-			local12.method4658();
+			local12.unlink();
 			local12.method4365();
 			this.anInt3966++;
 			return null;
 		}
 		if (local12.method3619()) {
 			@Pc(53) HardReferenceNode local53 = new HardReferenceNode(local27);
-			this.aClass133_18.method3862(local53, local12.uid);
-			this.aClass16_8.method798(local53);
-			local53.aLong185 = 0L;
-			local12.method4658();
+			this.aClass133_18.put(local53, local12.key);
+			this.aClass16_8.addTail(local53);
+			local53.secondaryKey = 0L;
+			local12.unlink();
 			local12.method4365();
 		} else {
-			this.aClass16_8.method798(local12);
-			local12.aLong185 = 0L;
+			this.aClass16_8.addTail(local12);
+			local12.secondaryKey = 0L;
 		}
 		return local27;
 	}
diff --git a/client/src/main/java/SoftwareIndexedSprite.java b/client/src/main/java/SoftwareIndexedSprite.java
index 9d17868..261be19 100644
--- a/client/src/main/java/SoftwareIndexedSprite.java
+++ b/client/src/main/java/SoftwareIndexedSprite.java
@@ -14,7 +14,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(IIIIII[B[I)V")
 	public SoftwareIndexedSprite(@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) byte[] arg6, @OriginalArg(7) int[] arg7) {
-		this.anInt4279 = arg0;
+		this.innerWidth = arg0;
 		this.anInt4276 = arg1;
 		this.anInt4280 = arg2;
 		this.anInt4273 = arg3;
@@ -26,7 +26,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!ek", name = "<init>", descriptor = "(III)V")
 	public SoftwareIndexedSprite(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		this.anInt4279 = this.width = arg0;
+		this.innerWidth = this.width = arg0;
 		this.anInt4276 = this.anInt4278 = arg1;
 		this.anInt4280 = this.anInt4273 = 0;
 		this.aByteArray18 = new byte[arg0 * arg1];
@@ -67,7 +67,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 		@Pc(5) int local5 = this.anInt4278;
 		@Pc(7) int local7 = 0;
 		@Pc(9) int local9 = 0;
-		@Pc(12) int local12 = this.anInt4279;
+		@Pc(12) int local12 = this.innerWidth;
 		@Pc(15) int local15 = this.anInt4276;
 		@Pc(21) int local21 = (local12 << 16) / arg2;
 		@Pc(27) int local27 = (local15 << 16) / arg3;
@@ -153,8 +153,8 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 		this.anInt4278 = this.width;
 		this.width = local10;
 		local10 = this.anInt4276;
-		this.anInt4276 = this.anInt4279;
-		this.anInt4279 = local10;
+		this.anInt4276 = this.innerWidth;
+		this.innerWidth = local10;
 	}
 
 	@OriginalMember(owner = "client!ek", name = "a", descriptor = "(III)V")
@@ -201,18 +201,18 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 
 	@OriginalMember(owner = "client!ek", name = "c", descriptor = "()V")
 	public final void method1396() {
-		if (this.width == this.anInt4279 && this.anInt4278 == this.anInt4276) {
+		if (this.width == this.innerWidth && this.anInt4278 == this.anInt4276) {
 			return;
 		}
-		@Pc(17) byte[] local17 = new byte[this.anInt4279 * this.anInt4276];
+		@Pc(17) byte[] local17 = new byte[this.innerWidth * this.anInt4276];
 		@Pc(19) int local19 = 0;
 		for (@Pc(21) int local21 = 0; local21 < this.anInt4278; local21++) {
 			for (@Pc(27) int local27 = 0; local27 < this.width; local27++) {
-				local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.anInt4279] = this.aByteArray18[local19++];
+				local17[local27 + this.anInt4280 + (local21 + this.anInt4273) * this.innerWidth] = this.aByteArray18[local19++];
 			}
 		}
 		this.aByteArray18 = local17;
-		this.width = this.anInt4279;
+		this.width = this.innerWidth;
 		this.anInt4278 = this.anInt4276;
 		this.anInt4280 = 0;
 		this.anInt4273 = 0;
@@ -224,7 +224,7 @@ public final class SoftwareIndexedSprite extends IndexedSprite {
 		@Pc(5) int local5 = this.anInt4278;
 		@Pc(7) int local7 = 0;
 		@Pc(9) int local9 = 0;
-		@Pc(12) int local12 = this.anInt4279;
+		@Pc(12) int local12 = this.innerWidth;
 		@Pc(15) int local15 = this.anInt4276;
 		@Pc(21) int local21 = (local12 << 16) / arg2;
 		@Pc(27) int local27 = (local15 << 16) / arg3;
diff --git a/client/src/main/java/Song.java b/client/src/main/java/Song.java
index 82d79c4..10c10d9 100644
--- a/client/src/main/java/Song.java
+++ b/client/src/main/java/Song.java
@@ -360,7 +360,7 @@ public final class Song extends Node {
 							@Pc(187) Class3_Sub9 local187 = (Class3_Sub9) this.aClass133_22.get((long) local179);
 							if (local187 == null) {
 								local187 = new Class3_Sub9(new byte[128]);
-								this.aClass133_22.method3862(local187, (long) local179);
+								this.aClass133_22.put(local187, (long) local179);
 							}
 							local187.aByteArray17[local98] = 1;
 						}
diff --git a/client/src/main/java/SoundBank.java b/client/src/main/java/SoundBank.java
index f9f84cc..c9666bc 100644
--- a/client/src/main/java/SoundBank.java
+++ b/client/src/main/java/SoundBank.java
@@ -38,7 +38,7 @@ public final class SoundBank {
 				return null;
 			}
 			local37 = local59.method3989();
-			this.aClass133_12.method3862(local37, local30);
+			this.aClass133_12.put(local37, local30);
 			if (arg0 != null) {
 				arg0[0] -= local37.aByteArray47.length;
 			}
@@ -74,14 +74,14 @@ public final class SoundBank {
 				if (local53 == null) {
 					return null;
 				}
-				this.aClass133_11.method3862(local53, local26);
+				this.aClass133_11.put(local53, local26);
 			}
 			local33 = local53.method2341(arg1);
 			if (local33 == null) {
 				return null;
 			} else {
-				local53.method4658();
-				this.aClass133_12.method3862(local33, local26);
+				local53.unlink();
+				this.aClass133_12.put(local33, local26);
 				return local33;
 			}
 		} else {
diff --git a/client/src/main/java/SoundPcmStream.java b/client/src/main/java/SoundPcmStream.java
index 59c15dd..025c246 100644
--- a/client/src/main/java/SoundPcmStream.java
+++ b/client/src/main/java/SoundPcmStream.java
@@ -79,9 +79,9 @@ public final class SoundPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!b", name = "b", descriptor = "([III)V")
 	@Override
-	public final synchronized void method4408(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public final synchronized void read(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (this.anInt343 == 0 && this.anInt351 == 0) {
-			this.method4410(arg2);
+			this.skip(arg2);
 			return;
 		}
 		@Pc(13) PcmSound local13 = (PcmSound) this.aClass3_Sub16_5;
@@ -97,7 +97,7 @@ public final class SoundPcmStream extends PcmStream {
 		if (this.anInt346 < 0) {
 			if (this.anInt342 <= 0) {
 				this.method406();
-				this.method4658();
+				this.unlink();
 				return;
 			}
 			this.anInt346 = 0;
@@ -105,7 +105,7 @@ public final class SoundPcmStream extends PcmStream {
 		if (this.anInt346 >= local29) {
 			if (this.anInt342 >= 0) {
 				this.method406();
-				this.method4658();
+				this.unlink();
 				return;
 			}
 			this.anInt346 = local29 - 1;
@@ -183,14 +183,14 @@ public final class SoundPcmStream extends PcmStream {
 				if (this.anInt346 < 0) {
 					this.anInt346 = -1;
 					this.method406();
-					this.method4658();
+					this.unlink();
 				}
 			} else {
 				this.method385(arg0, local40, local29, local44, 0);
 				if (this.anInt346 >= local29) {
 					this.anInt346 = local29;
 					this.method406();
-					this.method4658();
+					this.unlink();
 				}
 			}
 		} else if (this.aBoolean14) {
@@ -288,7 +288,7 @@ public final class SoundPcmStream extends PcmStream {
 		} else if (this.anInt343 == Integer.MIN_VALUE) {
 			this.anInt343 = 0;
 			this.anInt348 = this.anInt355 = this.anInt352 = 0;
-			this.method4658();
+			this.unlink();
 			return true;
 		} else {
 			this.method416();
@@ -300,12 +300,12 @@ public final class SoundPcmStream extends PcmStream {
 	public final synchronized void method384(@OriginalArg(0) int arg0) {
 		if (arg0 == 0) {
 			this.method397();
-			this.method4658();
+			this.unlink();
 		} else if (this.anInt355 == 0 && this.anInt352 == 0) {
 			this.anInt351 = 0;
 			this.anInt343 = 0;
 			this.anInt348 = 0;
-			this.method4658();
+			this.unlink();
 		} else {
 			@Pc(31) int local31 = -this.anInt348;
 			if (this.anInt348 > local31) {
@@ -407,13 +407,13 @@ public final class SoundPcmStream extends PcmStream {
 
 	@OriginalMember(owner = "client!b", name = "c", descriptor = "(I)V")
 	@Override
-	public final synchronized void method4410(@OriginalArg(0) int arg0) {
+	public final synchronized void skip(@OriginalArg(0) int arg0) {
 		if (this.anInt351 > 0) {
 			if (arg0 >= this.anInt351) {
 				if (this.anInt343 == Integer.MIN_VALUE) {
 					this.anInt343 = 0;
 					this.anInt348 = this.anInt355 = this.anInt352 = 0;
-					this.method4658();
+					this.unlink();
 					arg0 = this.anInt351;
 				}
 				this.anInt351 = 0;
@@ -436,7 +436,7 @@ public final class SoundPcmStream extends PcmStream {
 		if (this.anInt346 < 0) {
 			if (this.anInt342 <= 0) {
 				this.method406();
-				this.method4658();
+				this.unlink();
 				return;
 			}
 			this.anInt346 = 0;
@@ -444,7 +444,7 @@ public final class SoundPcmStream extends PcmStream {
 		if (this.anInt346 >= local87) {
 			if (this.anInt342 >= 0) {
 				this.method406();
-				this.method4658();
+				this.unlink();
 				return;
 			}
 			this.anInt346 = local87 - 1;
@@ -515,12 +515,12 @@ public final class SoundPcmStream extends PcmStream {
 				if (this.anInt346 < 0) {
 					this.anInt346 = -1;
 					this.method406();
-					this.method4658();
+					this.unlink();
 				}
 			} else if (this.anInt346 >= local87) {
 				this.anInt346 = local87;
 				this.method406();
-				this.method4658();
+				this.unlink();
 			}
 		} else if (this.aBoolean14) {
 			if (this.anInt342 < 0) {
diff --git a/client/src/main/java/SpotAnimType.java b/client/src/main/java/SpotAnimType.java
index 07ca214..4a0d285 100644
--- a/client/src/main/java/SpotAnimType.java
+++ b/client/src/main/java/SpotAnimType.java
@@ -99,7 +99,7 @@ public final class SpotAnimType {
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(IBII)Lclient!ak;")
 	public final Model method1319(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
-		@Pc(13) Model local13 = (Model) Static56.aClass99_9.method3106((long) this.anInt1751);
+		@Pc(13) Model local13 = (Model) Static56.aClass99_9.get((long) this.anInt1751);
 		if (local13 == null) {
 			@Pc(28) RawModel local28 = Static77.method1686(Static93.aClass153_41, this.anInt1753);
 			if (local28 == null) {
@@ -117,7 +117,7 @@ public final class SpotAnimType {
 				}
 			}
 			local13 = local28.method1679(this.anInt1749 + 64, this.anInt1748 + 850, -30, -50, -30);
-			Static56.aClass99_9.method3095(local13, (long) this.anInt1751);
+			Static56.aClass99_9.put(local13, (long) this.anInt1751);
 		}
 		@Pc(118) Model local118;
 		if (this.anInt1754 == -1 || arg1 == -1) {
diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java
index ce502d8..65d20e2 100644
--- a/client/src/main/java/Static1.java
+++ b/client/src/main/java/Static1.java
@@ -250,7 +250,7 @@ public final class Static1 {
 			}
 		}
 		@Pc(1161) GlTile local1161;
-		for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
+		for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
 			local1161.method1940();
 		}
 		for (local12 = 1; local12 <= 102; local12++) {
@@ -272,10 +272,10 @@ public final class Static1 {
 					@Pc(1261) GlTile local1261 = Static243.method4212(local10, local1250);
 					@Pc(1267) byte local1267 = arg7[local12][local17];
 					@Pc(1273) byte local1273 = arg5[local12][local17];
-					local168 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17]);
-					local143 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12 + 1][local17]);
-					local163 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
-					local153 = Static19.method588(local1250.anInt5892, local1250.anInt5899, arg6[local12][local17 + 1]);
+					local168 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]);
+					local143 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17]);
+					local163 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12 + 1][local17 + 1]);
+					local153 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17 + 1]);
 					Static58.method1324(local168, arg2, arg1, local12, arg0, local143, local1273, local30, local163, local38 != 0 && local1250.aBoolean310, local1267, local17, arg4, local153, local1261);
 				}
 				if ((arg8[local12][local17] & 0xFF) != 0 || local127 != 0 && arg7[local12][local17] == 0) {
@@ -470,10 +470,10 @@ public final class Static1 {
 						@Pc(2318) boolean[] local2318 = Static277.aBooleanArrayArray4[local2003 == local180 ? local143 : 0];
 						@Pc(2324) FloType local2324 = Static256.method4395(local2003 - 1);
 						@Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324);
-						@Pc(2345) int local2345 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
-						@Pc(2365) int local2365 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
-						@Pc(2385) int local2385 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
-						@Pc(2403) int local2403 = Static19.method588(local2324.anInt5892, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
+						@Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF;
+						@Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF;
+						@Pc(2385) int local2385 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF;
+						@Pc(2403) int local2403 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17 + 1]) << 8 | 0xFF;
 						@Pc(2422) boolean local2422 = local2003 != local202 && local1086[0] && local1068[1];
 						@Pc(2441) boolean local2441 = local2003 != local1035 && local1055[0] && local2318[1];
 						@Pc(2456) boolean local2456 = local214 != local2003 && local1068[0] && local1055[1];
@@ -515,9 +515,9 @@ public final class Static1 {
 				}
 			}
 		}
-		for (local1161 = (GlTile) local10.method3859(); local1161 != null; local1161 = (GlTile) local10.method3861()) {
+		for (local1161 = (GlTile) local10.head(); local1161 != null; local1161 = (GlTile) local10.next()) {
 			if (local1161.anInt2483 == 0) {
-				local1161.method4658();
+				local1161.unlink();
 			} else {
 				local1161.method1943();
 			}
@@ -527,7 +527,7 @@ public final class Static1 {
 		@Pc(2826) long[] local2826 = new long[local12];
 		local10.method3865(local2823);
 		for (local38 = 0; local38 < local12; local38++) {
-			local2826[local38] = local2823[local38].uid;
+			local2826[local38] = local2823[local38].key;
 		}
 		Static4.method23(local2826, local2823);
 		return local2823;
diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java
index 7c91ccd..c94e5cc 100644
--- a/client/src/main/java/Static10.java
+++ b/client/src/main/java/Static10.java
@@ -95,7 +95,7 @@ public final class Static10 {
 	@OriginalMember(owner = "client!an", name = "i", descriptor = "(I)V")
 	public static void method351() {
 		Static79.aClass99_11.clear();
-		Static7.aClass99_5.clear();
+		Static7.sprites.clear();
 	}
 
 	@OriginalMember(owner = "client!an", name = "a", descriptor = "(IIIIIII)V")
diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java
index 6032d8a..4e4e7f2 100644
--- a/client/src/main/java/Static102.java
+++ b/client/src/main/java/Static102.java
@@ -59,12 +59,12 @@ public final class Static102 {
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(IIIZIIIIIIII)Z")
 	public static boolean method2075(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) int arg10) {
-		if (Static173.self.method2693() == 2) {
+		if (Static173.self.getSize() == 2) {
 			return Static2.method8(arg6, arg7, arg4, arg0, arg9, arg3, arg2, arg1, arg5, arg8, arg10);
-		} else if (Static173.self.method2693() <= 2) {
+		} else if (Static173.self.getSize() <= 2) {
 			return Static45.method1171(arg5, arg4, arg10, arg9, arg8, arg2, arg1, arg3, arg7, arg0, arg6);
 		} else {
-			return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.method2693(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
+			return Static96.method1955(arg9, arg6, arg8, arg1, Static173.self.getSize(), arg5, arg7, arg4, arg10, arg2, arg3, arg0);
 		}
 	}
 }
diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java
index 8f0e834..49557ee 100644
--- a/client/src/main/java/Static103.java
+++ b/client/src/main/java/Static103.java
@@ -68,7 +68,7 @@ public final class Static103 {
 		}
 		@Pc(192) Npc local192;
 		if (local23 == 19) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static122.x = Static7.clickX;
@@ -80,7 +80,7 @@ public final class Static103 {
 			}
 		}
 		if (local23 == 17) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static122.x = Static7.clickX;
@@ -123,7 +123,7 @@ public final class Static103 {
 			Static153.method2909();
 		}
 		if (local23 == 45) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static122.x = Static7.clickX;
@@ -177,7 +177,7 @@ public final class Static103 {
 				Static6.outboundBuffer.p1isaac(92);
 				Static6.outboundBuffer.p2leadd(local36);
 			} else {
-				method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
+				method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { Static123.parseInt(local693.objCounts[local15]), Static249.aClass100_1039, Static71.method1439(local36).aClass100_495 }));
 			}
 			Static72.anInt2043 = 0;
 			Static257.aClass13_7 = Static5.getComponent(local19);
@@ -197,8 +197,8 @@ public final class Static103 {
 					Static6.outboundBuffer.p1(Static59.anInt1814);
 					Static6.outboundBuffer.p1(Static273.anInt4130);
 					Static6.outboundBuffer.p1(89);
-					Static6.outboundBuffer.p2(Static173.self.anInt3412);
-					Static6.outboundBuffer.p2(Static173.self.anInt3421);
+					Static6.outboundBuffer.p2(Static173.self.xFine);
+					Static6.outboundBuffer.p2(Static173.self.zFine);
 					Static6.outboundBuffer.p1(Static221.anInt4364);
 					Static6.outboundBuffer.p1(63);
 				}
@@ -209,11 +209,11 @@ public final class Static103 {
 			Static70.type = 2;
 			Static25.y = Static60.clickY;
 			Static122.x = Static7.clickX;
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
-				@Pc(884) NpcType local884 = local192.aClass96_1;
+				@Pc(884) NpcType local884 = local192.type;
 				if (local884.anIntArray357 != null) {
-					local884 = local884.method2932();
+					local884 = local884.getMultiNpc();
 				}
 				if (local884 != null) {
 					Static6.outboundBuffer.p1isaac(72);
@@ -326,7 +326,7 @@ public final class Static103 {
 			Static6.outboundBuffer.p2leadd(Static142.originZ + local19);
 		}
 		if (local23 == 4) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static70.type = 2;
@@ -419,7 +419,7 @@ public final class Static103 {
 			Static250.anInt5444 = local15;
 		}
 		if (local23 == 2) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static25.y = Static60.clickY;
@@ -444,7 +444,7 @@ public final class Static103 {
 			}
 		}
 		if (local23 == 26) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static70.type = 2;
@@ -704,7 +704,7 @@ public final class Static103 {
 			Static6.outboundBuffer.p2le(Static142.originZ + local19);
 		}
 		if (local23 == 16) {
-			local192 = Static175.aClass8_Sub4_Sub2Array1[local36];
+			local192 = Static175.npcs[local36];
 			if (local192 != null) {
 				Static102.method2075(Static173.self.movementQueueZ[0], 0, 1, false, 0, local192.movementQueueX[0], 1, 0, 2, local192.movementQueueZ[0], Static173.self.movementQueueX[0]);
 				Static122.x = Static7.clickX;
@@ -795,7 +795,7 @@ public final class Static103 {
 
 	@OriginalMember(owner = "client!i", name = "i", descriptor = "(Z)V")
 	public static void method2245() {
-		for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.method3859(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
+		for (@Pc(6) Class3_Sub31 local6 = (Class3_Sub31) Static119.aClass133_9.head(); local6 != null; local6 = (Class3_Sub31) Static119.aClass133_9.next()) {
 			@Pc(14) int local14 = local6.anInt5878;
 			if (Static245.load(local14)) {
 				@Pc(21) boolean local21 = true;
@@ -808,7 +808,7 @@ public final class Static103 {
 					}
 				}
 				if (!local21) {
-					local27 = (int) local6.uid;
+					local27 = (int) local6.key;
 					@Pc(60) Component local60 = Static5.getComponent(local27);
 					if (local60 != null) {
 						Static43.redraw(local60);
diff --git a/client/src/main/java/Static104.java b/client/src/main/java/Static104.java
index 73afa29..66f681a 100644
--- a/client/src/main/java/Static104.java
+++ b/client/src/main/java/Static104.java
@@ -10,8 +10,8 @@ public final class Static104 {
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
 	public static void method2247(@OriginalArg(1) PathingEntity arg0) {
 		@Pc(9) BasType local9 = arg0.method2681();
-		arg0.anInt3366 = local9.anInt1037;
-		if (arg0.anInt3409 == 0) {
+		arg0.anInt3366 = local9.idleAnimationId;
+		if (arg0.movementQueueSize == 0) {
 			arg0.anInt3417 = 0;
 			return;
 		}
@@ -26,13 +26,13 @@ public final class Static104 {
 				return;
 			}
 		}
-		@Pc(79) int local79 = arg0.anInt3412;
-		@Pc(82) int local82 = arg0.anInt3421;
-		@Pc(99) int local99 = arg0.movementQueueX[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
-		@Pc(116) int local116 = arg0.movementQueueZ[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
+		@Pc(79) int local79 = arg0.xFine;
+		@Pc(82) int local82 = arg0.zFine;
+		@Pc(99) int local99 = arg0.movementQueueX[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
+		@Pc(116) int local116 = arg0.movementQueueZ[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
 		if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
-			arg0.anInt3412 = local99;
-			arg0.anInt3421 = local116;
+			arg0.xFine = local99;
+			arg0.zFine = local116;
 			return;
 		}
 		if (local99 <= local79) {
@@ -57,87 +57,87 @@ public final class Static104 {
 			arg0.anInt3400 = 1536;
 		}
 		@Pc(224) int local224 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
-		@Pc(227) int local227 = local9.anInt1056;
+		@Pc(227) int local227 = local9.turnAnimation1;
 		if (local224 > 1024) {
 			local224 -= 2048;
 		}
 		@Pc(233) boolean local233 = true;
 		@Pc(235) byte local235 = 1;
 		if (local224 >= -256 && local224 <= 256) {
-			local227 = local9.anInt1051;
+			local227 = local9.walkAnimation;
 		} else if (local224 >= 256 && local224 < 768) {
-			local227 = local9.anInt1035;
+			local227 = local9.turnAnimation3;
 		} else if (local224 >= -768 && local224 <= -256) {
-			local227 = local9.anInt1057;
+			local227 = local9.turnAnimation2;
 		}
 		@Pc(273) int local273 = 4;
 		if (local227 == -1) {
-			local227 = local9.anInt1051;
+			local227 = local9.walkAnimation;
 		}
 		arg0.anInt3366 = local227;
 		if (arg0 instanceof Npc) {
-			local233 = ((Npc) arg0).aClass96_1.aBoolean181;
+			local233 = ((Npc) arg0).type.aBoolean181;
 		}
 		if (local233) {
 			if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) {
 				local273 = 2;
 			}
-			if (arg0.anInt3409 > 2) {
+			if (arg0.movementQueueSize > 2) {
 				local273 = 6;
 			}
-			if (arg0.anInt3409 > 3) {
+			if (arg0.movementQueueSize > 3) {
 				local273 = 8;
 			}
-			if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
+			if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
 				local273 = 8;
 				arg0.anInt3417--;
 			}
 		} else {
-			if (arg0.anInt3409 > 1) {
+			if (arg0.movementQueueSize > 1) {
 				local273 = 6;
 			}
-			if (arg0.anInt3409 > 2) {
+			if (arg0.movementQueueSize > 2) {
 				local273 = 8;
 			}
-			if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
+			if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
 				arg0.anInt3417--;
 				local273 = 8;
 			}
 		}
-		if (arg0.aByteArray48[arg0.anInt3409 - 1] == 2) {
+		if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 2) {
 			local273 <<= 0x1;
 			local235 = 2;
-		} else if (arg0.aByteArray48[arg0.anInt3409 - 1] == 0) {
+		} else if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 0) {
 			local235 = 0;
 			local273 >>= 0x1;
 		}
-		if (local273 < 8 || local9.anInt1058 == -1) {
+		if (local273 < 8 || local9.runAnimationId == -1) {
 			if (local9.anInt1062 != -1 && local235 == 0) {
-				if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1042 != -1) {
+				if (local9.turnAnimation1 == arg0.anInt3366 && local9.anInt1042 != -1) {
 					arg0.anInt3366 = local9.anInt1042;
-				} else if (local9.anInt1057 == arg0.anInt3366 && local9.anInt1066 != -1) {
+				} else if (local9.turnAnimation2 == arg0.anInt3366 && local9.anInt1066 != -1) {
 					arg0.anInt3366 = local9.anInt1066;
-				} else if (local9.anInt1035 == arg0.anInt3366 && local9.anInt1048 != -1) {
+				} else if (local9.turnAnimation3 == arg0.anInt3366 && local9.anInt1048 != -1) {
 					arg0.anInt3366 = local9.anInt1048;
 				} else {
 					arg0.anInt3366 = local9.anInt1062;
 				}
 			}
-		} else if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1054 != -1) {
-			arg0.anInt3366 = local9.anInt1054;
-		} else if (arg0.anInt3366 == local9.anInt1057 && local9.anInt1043 != -1) {
-			arg0.anInt3366 = local9.anInt1043;
-		} else if (arg0.anInt3366 == local9.anInt1035 && local9.anInt1045 != -1) {
-			arg0.anInt3366 = local9.anInt1045;
+		} else if (local9.turnAnimation1 == arg0.anInt3366 && local9.runAnimationId2 != -1) {
+			arg0.anInt3366 = local9.runAnimationId2;
+		} else if (arg0.anInt3366 == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
+			arg0.anInt3366 = local9.runAnimationId3;
+		} else if (arg0.anInt3366 == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
+			arg0.anInt3366 = local9.runAnimationId4;
 		} else {
-			arg0.anInt3366 = local9.anInt1058;
+			arg0.anInt3366 = local9.runAnimationId;
 		}
 		if (local9.anInt1032 != -1) {
 			local273 <<= 0x7;
-			if (arg0.anInt3409 == 1) {
-				@Pc(594) int local594 = (local99 >= arg0.anInt3412 ? local99 - arg0.anInt3412 : -local99 + arg0.anInt3412) << 7;
+			if (arg0.movementQueueSize == 1) {
+				@Pc(594) int local594 = (local99 >= arg0.xFine ? local99 - arg0.xFine : -local99 + arg0.xFine) << 7;
 				@Pc(600) int local600 = arg0.anInt3358 * arg0.anInt3358;
-				@Pc(622) int local622 = (local116 < arg0.anInt3421 ? arg0.anInt3421 - local116 : -arg0.anInt3421 + local116) << 7;
+				@Pc(622) int local622 = (local116 < arg0.zFine ? arg0.zFine - local116 : -arg0.zFine + local116) << 7;
 				@Pc(629) int local629 = local594 > local622 ? local594 : local622;
 				@Pc(636) int local636 = local9.anInt1032 * 2 * local629;
 				if (local636 < local600) {
@@ -170,29 +170,29 @@ public final class Static104 {
 			}
 		}
 		if (local79 < local99) {
-			arg0.anInt3412 += local273;
-			if (local99 < arg0.anInt3412) {
-				arg0.anInt3412 = local99;
+			arg0.xFine += local273;
+			if (local99 < arg0.xFine) {
+				arg0.xFine = local99;
 			}
 		} else if (local79 > local99) {
-			arg0.anInt3412 -= local273;
-			if (local99 > arg0.anInt3412) {
-				arg0.anInt3412 = local99;
+			arg0.xFine -= local273;
+			if (local99 > arg0.xFine) {
+				arg0.xFine = local99;
 			}
 		}
 		if (local82 < local116) {
-			arg0.anInt3421 += local273;
-			if (arg0.anInt3421 > local116) {
-				arg0.anInt3421 = local116;
+			arg0.zFine += local273;
+			if (arg0.zFine > local116) {
+				arg0.zFine = local116;
 			}
 		} else if (local116 < local82) {
-			arg0.anInt3421 -= local273;
-			if (local116 > arg0.anInt3421) {
-				arg0.anInt3421 = local116;
+			arg0.zFine -= local273;
+			if (local116 > arg0.zFine) {
+				arg0.zFine = local116;
 			}
 		}
-		if (arg0.anInt3412 == local99 && local116 == arg0.anInt3421) {
-			arg0.anInt3409--;
+		if (arg0.xFine == local99 && local116 == arg0.zFine) {
+			arg0.movementQueueSize--;
 			if (arg0.anInt3405 > 0) {
 				arg0.anInt3405--;
 			}
diff --git a/client/src/main/java/Static105.java b/client/src/main/java/Static105.java
index b88e2e3..b404035 100644
--- a/client/src/main/java/Static105.java
+++ b/client/src/main/java/Static105.java
@@ -8,7 +8,7 @@ public final class Static105 {
 	public static Class114[] aClass114Array1;
 
 	@OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;")
-	public static final ColorImageCacheEntry aClass3_Sub28_1 = new ColorImageCacheEntry(0, 0);
+	public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0);
 
 	@OriginalMember(owner = "client!ib", name = "d", descriptor = "Lclient!gn;")
 	public static final LruHashTable aClass54_9 = new LruHashTable(128);
diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java
index aee6073..d427f10 100644
--- a/client/src/main/java/Static107.java
+++ b/client/src/main/java/Static107.java
@@ -31,7 +31,7 @@ public final class Static107 {
 	public static QuickChatCommandDecoder anInterface3_1 = null;
 
 	@OriginalMember(owner = "client!id", name = "b", descriptor = "(I)V")
-	public static void method2261() {
+	public static void loop() {
 		if (Static147.soundChannel != null) {
 			Static147.soundChannel.loop();
 		}
diff --git a/client/src/main/java/Static109.java b/client/src/main/java/Static109.java
index e5622e1..8856ef4 100644
--- a/client/src/main/java/Static109.java
+++ b/client/src/main/java/Static109.java
@@ -20,9 +20,9 @@ public final class Static109 {
 	public static void method2274() {
 		for (@Pc(7) int local7 = 0; local7 < Static272.anInt5214; local7++) {
 			@Pc(18) int local18 = Static33.anIntArray79[local7];
-			@Pc(22) Npc local22 = Static175.aClass8_Sub4_Sub2Array1[local18];
+			@Pc(22) Npc local22 = Static175.npcs[local18];
 			if (local22 != null) {
-				Static263.method4514(local22.aClass96_1.anInt3713, local22);
+				Static263.method4514(local22.type.anInt3713, local22);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java
index a355213..54b0cad 100644
--- a/client/src/main/java/Static110.java
+++ b/client/src/main/java/Static110.java
@@ -50,56 +50,56 @@ public final class Static110 {
 		@Pc(141) int local141;
 		for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
 			local37 = 1;
-			local42 = local6.aClass8_Sub4_Sub2_1.method2681();
-			if (local42.anInt1037 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
+			local42 = local6.npc.method2681();
+			if (local42.idleAnimationId == local6.npc.anInt3366) {
 				local37 = 0;
-			} else if (local42.anInt1058 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1054 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1045 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1043 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
+			} else if (local42.runAnimationId == local6.npc.anInt3366 || local42.runAnimationId2 == local6.npc.anInt3366 || local42.runAnimationId4 == local6.npc.anInt3366 || local42.runAnimationId3 == local6.npc.anInt3366) {
 				local37 = 2;
-			} else if (local42.anInt1062 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local42.anInt1042 == local6.aClass8_Sub4_Sub2_1.anInt3366 || local6.aClass8_Sub4_Sub2_1.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.aClass8_Sub4_Sub2_1.anInt3366) {
+			} else if (local42.anInt1062 == local6.npc.anInt3366 || local42.anInt1042 == local6.npc.anInt3366 || local6.npc.anInt3366 == local42.anInt1048 || local42.anInt1066 == local6.npc.anInt3366) {
 				local37 = 3;
 			}
 			if (local6.anInt2038 != local37) {
-				local141 = Static112.method2299(local6.aClass8_Sub4_Sub2_1);
-				if (local141 != local6.anInt2044) {
-					if (local6.aClass3_Sub3_Sub1_1 != null) {
-						Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
-						local6.aClass3_Sub3_Sub1_1 = null;
+				local141 = Static112.getSound(local6.npc);
+				if (local141 != local6.sound) {
+					if (local6.primaryStream != null) {
+						Static204.soundStream.removeSubStream(local6.primaryStream);
+						local6.primaryStream = null;
 					}
-					local6.anInt2044 = local141;
+					local6.sound = local141;
 				}
 				local6.anInt2038 = local37;
 			}
-			local6.anInt2041 = local6.aClass8_Sub4_Sub2_1.anInt3412;
-			local6.anInt2037 = local6.aClass8_Sub4_Sub2_1.anInt3412 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
-			local6.anInt2029 = local6.aClass8_Sub4_Sub2_1.anInt3421;
-			local6.anInt2028 = local6.aClass8_Sub4_Sub2_1.anInt3421 + local6.aClass8_Sub4_Sub2_1.method2693() * 64;
+			local6.anInt2041 = local6.npc.xFine;
+			local6.anInt2037 = local6.npc.xFine + local6.npc.getSize() * 64;
+			local6.anInt2029 = local6.npc.zFine;
+			local6.anInt2028 = local6.npc.zFine + local6.npc.getSize() * 64;
 			Static150.method2804(arg1, local6, arg3, arg0, arg2);
 		}
-		for (local6 = (AreaSound) Static93.aClass133_7.method3859(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.method3861()) {
+		for (local6 = (AreaSound) Static93.aClass133_7.head(); local6 != null; local6 = (AreaSound) Static93.aClass133_7.next()) {
 			local37 = 1;
-			local42 = local6.aClass8_Sub4_Sub1_1.method2681();
-			if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1037) {
+			local42 = local6.player.method2681();
+			if (local6.player.anInt3366 == local42.idleAnimationId) {
 				local37 = 0;
-			} else if (local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1058 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1054 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1045 || local42.anInt1043 == local6.aClass8_Sub4_Sub1_1.anInt3366) {
+			} else if (local6.player.anInt3366 == local42.runAnimationId || local6.player.anInt3366 == local42.runAnimationId2 || local6.player.anInt3366 == local42.runAnimationId4 || local42.runAnimationId3 == local6.player.anInt3366) {
 				local37 = 2;
-			} else if (local42.anInt1062 == local6.aClass8_Sub4_Sub1_1.anInt3366 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1042 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1048 || local6.aClass8_Sub4_Sub1_1.anInt3366 == local42.anInt1066) {
+			} else if (local42.anInt1062 == local6.player.anInt3366 || local6.player.anInt3366 == local42.anInt1042 || local6.player.anInt3366 == local42.anInt1048 || local6.player.anInt3366 == local42.anInt1066) {
 				local37 = 3;
 			}
 			if (local6.anInt2038 != local37) {
-				local141 = Static140.method2706(local6.aClass8_Sub4_Sub1_1);
-				if (local6.anInt2044 != local141) {
-					if (local6.aClass3_Sub3_Sub1_1 != null) {
-						Static204.soundStream.method1347(local6.aClass3_Sub3_Sub1_1);
-						local6.aClass3_Sub3_Sub1_1 = null;
+				local141 = Static140.getSound(local6.player);
+				if (local6.sound != local141) {
+					if (local6.primaryStream != null) {
+						Static204.soundStream.removeSubStream(local6.primaryStream);
+						local6.primaryStream = null;
 					}
-					local6.anInt2044 = local141;
+					local6.sound = local141;
 				}
 				local6.anInt2038 = local37;
 			}
-			local6.anInt2041 = local6.aClass8_Sub4_Sub1_1.anInt3412;
-			local6.anInt2037 = local6.aClass8_Sub4_Sub1_1.anInt3412 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
-			local6.anInt2029 = local6.aClass8_Sub4_Sub1_1.anInt3421;
-			local6.anInt2028 = local6.aClass8_Sub4_Sub1_1.anInt3421 + local6.aClass8_Sub4_Sub1_1.method2693() * 64;
+			local6.anInt2041 = local6.player.xFine;
+			local6.anInt2037 = local6.player.xFine + local6.player.getSize() * 64;
+			local6.anInt2029 = local6.player.zFine;
+			local6.anInt2028 = local6.player.zFine + local6.player.getSize() * 64;
 			Static150.method2804(arg1, local6, arg3, arg0, arg2);
 		}
 	}
diff --git a/client/src/main/java/Static111.java b/client/src/main/java/Static111.java
index 7a510b6..b709264 100644
--- a/client/src/main/java/Static111.java
+++ b/client/src/main/java/Static111.java
@@ -63,7 +63,7 @@ public final class Static111 {
 	}
 
 	@OriginalMember(owner = "client!ii", name = "b", descriptor = "(I)V")
-	public static void handleMouse() {
+	public static void loop() {
 		@Pc(2) Mouse local2 = Static93.instance;
 		synchronized (Static93.instance) {
 			Static22.anInt723 = Static57.anInt1759;
diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java
index 910f66b..67e70a1 100644
--- a/client/src/main/java/Static112.java
+++ b/client/src/main/java/Static112.java
@@ -15,8 +15,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 (Static209.js5Archive8.isFileReady(Static55.anInt1736) && Static209.js5Archive8.isFileReady(Static169.anInt4073)) {
-				Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.js5Archive8, Static55.anInt1736);
-				Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.js5Archive8, Static169.anInt4073);
+				Static39.aClass3_Sub2_Sub1_1 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static55.anInt1736);
+				Static181.aClass3_Sub2_Sub1_9 = Static80.loadSoftwareAlphaSprite(Static209.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);
@@ -66,9 +66,9 @@ public final class Static112 {
 			}
 		}
 		if ((Static165.aClass3_Sub2_Sub1_8 == null || Static92.aClass3_Sub2_Sub1_6 == null || Static204.aClass3_Sub2_Sub1_10 == null) && Static209.js5Archive8.isFileReady(Static85.anInt2261) && Static209.js5Archive8.isFileReady(Static136.anInt3324) && Static209.js5Archive8.isFileReady(Static254.anInt5556)) {
-			Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.js5Archive8, Static85.anInt2261);
-			Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.js5Archive8, Static136.anInt3324);
-			Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.js5Archive8, Static254.anInt5556);
+			Static165.aClass3_Sub2_Sub1_8 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static85.anInt2261);
+			Static92.aClass3_Sub2_Sub1_6 = Static80.loadSoftwareAlphaSprite(Static209.js5Archive8, Static136.anInt3324);
+			Static204.aClass3_Sub2_Sub1_10 = Static80.loadSoftwareAlphaSprite(Static209.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);
@@ -113,19 +113,19 @@ public final class Static112 {
 	}
 
 	@OriginalMember(owner = "client!ij", name = "a", descriptor = "(Lclient!km;I)I")
-	public static int method2299(@OriginalArg(0) Npc arg0) {
-		@Pc(13) NpcType local13 = arg0.aClass96_1;
+	public static int getSound(@OriginalArg(0) Npc arg0) {
+		@Pc(13) NpcType local13 = arg0.type;
 		if (local13.anIntArray357 != null) {
-			local13 = local13.method2932();
+			local13 = local13.getMultiNpc();
 			if (local13 == null) {
 				return -1;
 			}
 		}
 		@Pc(29) int local29 = local13.anInt3747;
 		@Pc(33) BasType local33 = arg0.method2681();
-		if (local33.anInt1037 == arg0.anInt3366) {
+		if (local33.idleAnimationId == arg0.anInt3366) {
 			local29 = local13.anInt3728;
-		} else if (arg0.anInt3366 == local33.anInt1058 || local33.anInt1054 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1045 || arg0.anInt3366 == local33.anInt1043) {
+		} else if (arg0.anInt3366 == local33.runAnimationId || local33.runAnimationId2 == arg0.anInt3366 || arg0.anInt3366 == local33.runAnimationId4 || arg0.anInt3366 == local33.runAnimationId3) {
 			local29 = local13.anInt3734;
 		} else if (local33.anInt1062 == arg0.anInt3366 || arg0.anInt3366 == local33.anInt1042 || arg0.anInt3366 == local33.anInt1048 || arg0.anInt3366 == local33.anInt1066) {
 			local29 = local13.anInt3745;
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index 0b87d7a..391166d 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -42,7 +42,7 @@ public final class Static114 {
 	@OriginalMember(owner = "client!j", name = "a", descriptor = "(BZLclient!na;)V")
 	public static void drawTextOnScreen(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) {
 		@Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250);
-		@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.method2860(arg1, 250) * 13;
+		@Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.getParagraphLineCount(arg1, 250) * 13;
 		if (GlRenderer.enabled) {
 			Static46.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0);
 			Static46.method1179(6, 6, local24 + 4 + 4, local31 + 4 + 4, 16777215);
@@ -55,7 +55,7 @@ public final class Static114 {
 		if (!arg0) {
 			Static121.method2407(10, 10, local31, local24);
 		} else if (GlRenderer.enabled) {
-			GlRenderer.method4153();
+			GlRenderer.swapBuffers();
 		} else {
 			try {
 				@Pc(159) Graphics local159 = GameShell.canvas.getGraphics();
diff --git a/client/src/main/java/Static116.java b/client/src/main/java/Static116.java
index ef2da7b..68fdfcd 100644
--- a/client/src/main/java/Static116.java
+++ b/client/src/main/java/Static116.java
@@ -47,7 +47,7 @@ public final class Static116 {
 		Static248.anIntArrayArrayArray17 = null;
 		Static41.anInt1309 = 0;
 		Static269.aClass3_Sub2_Sub4_2 = null;
-		Static145.aClass69_84.method2278();
+		Static145.aClass69_84.clear();
 		Static203.aClass134_1 = null;
 		Static217.anInt4901 = -1;
 		Static130.aClass41_2 = null;
diff --git a/client/src/main/java/Static118.java b/client/src/main/java/Static118.java
index c5af3f6..421cb46 100644
--- a/client/src/main/java/Static118.java
+++ b/client/src/main/java/Static118.java
@@ -22,7 +22,7 @@ public final class Static118 {
 	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(IB)V")
 	public static void method2353(@OriginalArg(0) int arg0) {
 		@Pc(12) DelayedStateChange local12 = Static238.method4143(12, arg0);
-		local12.method1007();
+		local12.pushClient();
 	}
 
 	@OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V")
diff --git a/client/src/main/java/Static119.java b/client/src/main/java/Static119.java
index 611d2b1..5943513 100644
--- a/client/src/main/java/Static119.java
+++ b/client/src/main/java/Static119.java
@@ -81,13 +81,13 @@ public final class Static119 {
 	public static void method2386() {
 		@Pc(6) AreaSound local6;
 		for (local6 = (AreaSound) Static3.aClass69_135.method2289(); local6 != null; local6 = (AreaSound) Static3.aClass69_135.method2288()) {
-			if (local6.aBoolean117) {
-				local6.method1567();
+			if (local6.multiLocOrNpc) {
+				local6.update();
 			}
 		}
 		for (local6 = (AreaSound) Static152.aClass69_87.method2289(); local6 != null; local6 = (AreaSound) Static152.aClass69_87.method2288()) {
-			if (local6.aBoolean117) {
-				local6.method1567();
+			if (local6.multiLocOrNpc) {
+				local6.update();
 			}
 		}
 	}
diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java
index 0f3380d..389b56e 100644
--- a/client/src/main/java/Static121.java
+++ b/client/src/main/java/Static121.java
@@ -36,7 +36,7 @@ public final class Static121 {
 	public static void method2407(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		for (@Pc(3) int local3 = 0; local3 < Static24.anInt766; local3++) {
 			if (arg0 < Static264.anIntArray410[local3] + Static224.anIntArray443[local3] && arg0 + arg3 > Static264.anIntArray410[local3] && Static50.anIntArray133[local3] + Static67.anIntArray320[local3] > arg1 && Static50.anIntArray133[local3] < arg2 + arg1) {
-				Static31.aBooleanArray29[local3] = true;
+				Static31.rectangleRedraw[local3] = true;
 			}
 		}
 	}
diff --git a/client/src/main/java/Static122.java b/client/src/main/java/Static122.java
index 6c79305..fea6b6a 100644
--- a/client/src/main/java/Static122.java
+++ b/client/src/main/java/Static122.java
@@ -40,11 +40,11 @@ public final class Static122 {
 		local13.anInt2041 = arg4 * 128;
 		local13.anInt2033 = arg5;
 		if (arg1 != null) {
-			local13.anIntArray181 = arg1.anIntArray381;
-			local13.anInt2042 = arg1.anInt4402 * 128;
+			local13.sounds = arg1.anIntArray381;
+			local13.radius = arg1.soundRadius * 128;
 			local13.anInt2040 = arg1.anInt4414;
-			local13.aClass118_1 = arg1;
-			local13.anInt2044 = arg1.anInt4412;
+			local13.locType = arg1;
+			local13.sound = arg1.sound;
 			local13.anInt2032 = arg1.anInt4419;
 			@Pc(57) int local57 = arg1.anInt4397;
 			@Pc(60) int local60 = arg1.anInt4403;
@@ -55,34 +55,34 @@ public final class Static122 {
 			local13.anInt2028 = (local60 + arg0) * 128;
 			local13.anInt2037 = (arg4 + local57) * 128;
 			if (arg1.anIntArray380 != null) {
-				local13.aBoolean117 = true;
-				local13.method1567();
+				local13.multiLocOrNpc = true;
+				local13.update();
 			}
-			if (local13.anIntArray181 != null) {
+			if (local13.sounds != null) {
 				local13.anInt2034 = local13.anInt2032 + (int) (Math.random() * (double) (local13.anInt2040 - local13.anInt2032));
 			}
 			Static3.aClass69_135.method2282(local13);
 		} else if (arg3 != null) {
-			local13.aClass8_Sub4_Sub2_1 = arg3;
-			@Pc(138) NpcType local138 = arg3.aClass96_1;
+			local13.npc = arg3;
+			@Pc(138) NpcType local138 = arg3.type;
 			if (local138.anIntArray357 != null) {
-				local13.aBoolean117 = true;
-				local138 = local138.method2932();
+				local13.multiLocOrNpc = true;
+				local138 = local138.getMultiNpc();
 			}
 			if (local138 != null) {
 				local13.anInt2028 = (local138.anInt3713 + arg0) * 128;
 				local13.anInt2037 = (arg4 + local138.anInt3713) * 128;
-				local13.anInt2044 = Static112.method2299(arg3);
-				local13.anInt2042 = local138.anInt3746 * 128;
+				local13.sound = Static112.getSound(arg3);
+				local13.radius = local138.soundRadius * 128;
 			}
 			Static152.aClass69_87.method2282(local13);
 		} else if (arg6 != null) {
-			local13.aClass8_Sub4_Sub1_1 = arg6;
-			local13.anInt2037 = (arg6.method2693() + arg4) * 128;
-			local13.anInt2028 = (arg6.method2693() + arg0) * 128;
-			local13.anInt2044 = Static140.method2706(arg6);
-			local13.anInt2042 = arg6.anInt1664 * 128;
-			Static93.aClass133_7.method3862(local13, arg6.aClass100_364.encode37());
+			local13.player = arg6;
+			local13.anInt2037 = (arg6.getSize() + arg4) * 128;
+			local13.anInt2028 = (arg6.getSize() + arg0) * 128;
+			local13.sound = Static140.getSound(arg6);
+			local13.radius = arg6.soundRadius * 128;
+			Static93.aClass133_7.put(local13, arg6.aClass100_364.encode37());
 		}
 	}
 
diff --git a/client/src/main/java/Static123.java b/client/src/main/java/Static123.java
index faed652..4bebead 100644
--- a/client/src/main/java/Static123.java
+++ b/client/src/main/java/Static123.java
@@ -36,9 +36,9 @@ public final class Static123 {
 
 	@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
 	public static void topBannerRefresh() {
-		if (!Static249.aBoolean282 && Static83.modeWhere != 2) {
+		if (!Static249.advertSuppressed && Static83.modeWhere != 2) {
 			try {
-				Static206.aClass100_900.method3157(Static215.aClient1);
+				Static206.aClass100_900.method3157(Static215.instance);
 			} catch (@Pc(26) Throwable local26) {
 			}
 		}
diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java
index 63f3426..f0120ed 100644
--- a/client/src/main/java/Static125.java
+++ b/client/src/main/java/Static125.java
@@ -45,7 +45,7 @@ public final class Static125 {
 
 	@OriginalMember(owner = "client!jl", name = "a", descriptor = "(IB)Lclient!kk;")
 	public static VarbitType method2449(@OriginalArg(0) int arg0) {
-		@Pc(10) VarbitType local10 = (VarbitType) aClass99_19.method3106((long) arg0);
+		@Pc(10) VarbitType local10 = (VarbitType) aClass99_19.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -54,7 +54,7 @@ public final class Static125 {
 		if (local31 != null) {
 			local10.method2651(new Buffer(local31));
 		}
-		aClass99_19.method3095(local10, (long) arg0);
+		aClass99_19.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java
index 207b5a4..af2bcb9 100644
--- a/client/src/main/java/Static126.java
+++ b/client/src/main/java/Static126.java
@@ -22,7 +22,7 @@ public final class Static126 {
 		}
 		for (@Pc(15) int local15 = 0; local15 < Static24.anInt766; local15++) {
 			if (Static186.aBooleanArray100[local15]) {
-				Static31.aBooleanArray29[local15] = true;
+				Static31.rectangleRedraw[local15] = true;
 			}
 			Static223.aBooleanArray116[local15] = Static186.aBooleanArray100[local15];
 			Static186.aBooleanArray100[local15] = false;
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index 703e06c..2cfa084 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -59,32 +59,32 @@ public final class Static127 {
 		if (arg4) {
 			Static272.anInt5214 = 0;
 			for (local96 = 0; local96 < 32768; local96++) {
-				local103 = Static175.aClass8_Sub4_Sub2Array1[local96];
+				local103 = Static175.npcs[local96];
 				if (local103 != null) {
-					local103.anInt3412 -= local86 * 128;
-					local103.anInt3421 -= local81 * 128;
-					if (local103.anInt3412 >= 0 && local103.anInt3412 <= 13184 && local103.anInt3421 >= 0 && local103.anInt3421 <= 13184) {
+					local103.xFine -= local86 * 128;
+					local103.zFine -= local81 * 128;
+					if (local103.xFine >= 0 && local103.xFine <= 13184 && local103.zFine >= 0 && local103.zFine <= 13184) {
 						for (local109 = 0; local109 < 10; local109++) {
 							local103.movementQueueX[local109] -= local86;
 							local103.movementQueueZ[local109] -= local81;
 						}
 						Static33.anIntArray79[Static272.anInt5214++] = local96;
 					} else {
-						Static175.aClass8_Sub4_Sub2Array1[local96].method2698(null);
-						Static175.aClass8_Sub4_Sub2Array1[local96] = null;
+						Static175.npcs[local96].method2698(null);
+						Static175.npcs[local96] = null;
 					}
 				}
 			}
 		} else {
 			for (local96 = 0; local96 < 32768; local96++) {
-				local103 = Static175.aClass8_Sub4_Sub2Array1[local96];
+				local103 = Static175.npcs[local96];
 				if (local103 != null) {
 					for (local109 = 0; local109 < 10; local109++) {
 						local103.movementQueueX[local109] -= local86;
 						local103.movementQueueZ[local109] -= local81;
 					}
-					local103.anInt3412 -= local86 * 128;
-					local103.anInt3421 -= local81 * 128;
+					local103.xFine -= local86 * 128;
+					local103.zFine -= local81 * 128;
 				}
 			}
 		}
@@ -95,8 +95,8 @@ public final class Static127 {
 					local265.movementQueueX[local109] -= local86;
 					local265.movementQueueZ[local109] -= local81;
 				}
-				local265.anInt3412 -= local86 * 128;
-				local265.anInt3421 -= local81 * 128;
+				local265.xFine -= local86 * 128;
+				local265.zFine -= local81 * 128;
 			}
 		}
 		Static55.level = arg0;
@@ -134,7 +134,7 @@ public final class Static127 {
 			local451.anInt916 -= local81;
 			local451.anInt928 -= local86;
 			if (local451.anInt928 < 0 || local451.anInt916 < 0 || local451.anInt928 >= 104 || local451.anInt916 >= 104) {
-				local451.method4658();
+				local451.unlink();
 			}
 		}
 		if (arg4) {
@@ -156,29 +156,29 @@ public final class Static127 {
 			Static86.setInstantFade();
 		}
 		Static107.anInt2875 = -1;
-		Static99.aClass69_64.method2278();
-		Static217.aClass69_116.method2278();
+		Static99.aClass69_64.clear();
+		Static217.aClass69_116.clear();
 	}
 
 	@OriginalMember(owner = "client!k", name = "a", descriptor = "(B)Lclient!da;")
 	public static DelayedStateChange poll() {
-		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.aClass16_9.method795();
+		@Pc(10) DelayedStateChange local10 = (DelayedStateChange) Static215.serverQueue.method795();
 		if (local10 != null) {
-			local10.method4658();
+			local10.unlink();
 			local10.method4365();
 			return local10;
 		}
 		do {
-			local10 = (DelayedStateChange) Static140.aClass16_7.method795();
+			local10 = (DelayedStateChange) Static140.clientQueue.method795();
 			if (local10 == null) {
 				return null;
 			}
-			if (local10.method1009() > MonotonicClock.currentTimeMillis()) {
+			if (local10.getTime() > MonotonicClock.currentTimeMillis()) {
 				return null;
 			}
-			local10.method4658();
+			local10.unlink();
 			local10.method4365();
-		} while ((Long.MIN_VALUE & local10.aLong185) == 0L);
+		} while ((Long.MIN_VALUE & local10.secondaryKey) == 0L);
 		return local10;
 	}
 
@@ -207,7 +207,7 @@ public final class Static127 {
 													if (local14 == -1) {
 														return arg1;
 													}
-													@Pc(246) JagString local246 = Static186.EMPTY_FILE;
+													@Pc(246) JagString local246 = Static186.EMPTY;
 													if (Static232.aClass212_5 != null) {
 														local246 = Static181.method3341(Static232.aClass212_5.intArg2);
 														try {
@@ -218,22 +218,22 @@ public final class Static127 {
 														} catch (@Pc(274) UnsupportedEncodingException local274) {
 														}
 													}
-													arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.method3136(local14 + 4) });
+													arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), local246, arg1.substring(local14 + 4) });
 												}
 											}
-											arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) });
+											arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.substring(local14 + 2) });
 										}
 									}
-									arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) });
+									arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.substring(local14 + 2) });
 								}
 							}
-							arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) });
+							arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.substring(local14 + 2) });
 						}
 					}
-					arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) });
+					arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.substring(local14 + 2) });
 				}
 			}
-			arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) });
+			arg1 = Static34.concatenate(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.substring(local14 + 2) });
 		}
 	}
 
@@ -281,7 +281,7 @@ public final class Static127 {
 				Static175.method3279();
 			}
 			if (arg0.method3111(Static279.aClass100_1106)) {
-				Static107.js5NetQueue.method2329();
+				Static107.js5NetQueue.quit();
 			}
 			if (arg0.method3111(Static185.aClass100_823)) {
 				Static107.js5NetQueue.method2319();
@@ -324,20 +324,20 @@ public final class Static127 {
 					}
 				}
 			}
-			if (arg0.method3138(Static241.aClass100_1088)) {
-				Static76.setParticles(arg0.method3136(15).parseInt());
+			if (arg0.startsWith(Static241.aClass100_1088)) {
+				Static76.setParticles(arg0.substring(15).parseInt());
 				Static203.savePreferences(GameShell.signLink);
 				Static18.serverUpdatedPreferences = false;
 			}
-			if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
-				Static115.method2312(arg0.method3136(6).parseInt());
+			if (arg0.startsWith(Static170.aClass100_623) && Static83.modeWhere != 0) {
+				Static115.method2312(arg0.substring(6).parseInt());
 			}
 			if (arg0.method3111(Static272.aClass100_990)) {
 				throw new RuntimeException();
 			}
-			if (arg0.method3138(Static211.aClass100_232)) {
-				Static199.anInt4672 = arg0.method3136(12).method3144().parseInt();
-				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.anInt4672) }));
+			if (arg0.startsWith(Static211.aClass100_232)) {
+				Static199.rectDebug = arg0.substring(12).method3144().parseInt();
+				Static103.method2231(null, 0, Static34.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) }));
 			}
 			if (arg0.method3111(Static181.aClass100_810)) {
 				Static121.aBoolean154 = true;
@@ -363,6 +363,6 @@ public final class Static127 {
 		}
 		Static6.outboundBuffer.p1isaac(44);
 		Static6.outboundBuffer.p1(arg0.length() - 1);
-		Static6.outboundBuffer.pjstr(arg0.method3136(2));
+		Static6.outboundBuffer.pjstr(arg0.substring(2));
 	}
 }
diff --git a/client/src/main/java/Static13.java b/client/src/main/java/Static13.java
index 6d52025..9843312 100644
--- a/client/src/main/java/Static13.java
+++ b/client/src/main/java/Static13.java
@@ -45,12 +45,12 @@ public final class Static13 {
 	public static void method472(@OriginalArg(0) int arg0) {
 		@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
 		if (local14 != null) {
-			local14.method4658();
+			local14.unlink();
 		}
 	}
 
 	@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Ljava/awt/Color;ZZLclient!na;I)V")
-	public static void method473(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
+	public static void render(@OriginalArg(0) Color arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) JagString arg2, @OriginalArg(4) int arg3) {
 		try {
 			@Pc(6) Graphics local6 = GameShell.canvas.getGraphics();
 			if (Static222.aFont1 == null) {
diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java
index 208dcf9..4fe15ce 100644
--- a/client/src/main/java/Static132.java
+++ b/client/src/main/java/Static132.java
@@ -18,9 +18,9 @@ public final class Static132 {
 
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ZLclient!wk;Z)V")
 	public static void method2605(@OriginalArg(0) boolean arg0, @OriginalArg(1) Class3_Sub31 arg1) {
-		@Pc(9) int local9 = (int) arg1.uid;
+		@Pc(9) int local9 = (int) arg1.key;
 		@Pc(16) int local16 = arg1.anInt5878;
-		arg1.method4658();
+		arg1.unlink();
 		if (arg0) {
 			Static109.method2275(local16);
 		}
@@ -41,9 +41,9 @@ public final class Static132 {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 		} else {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
-			local43 = Static280.aClass3_Sub2_Sub9_43.method2858(LocalizedText.CHOOSE_OPTION);
+			local43 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION);
 			for (@Pc(75) int local75 = 0; local75 < Static231.anInt5204; local75++) {
-				@Pc(88) int local88 = Static280.aClass3_Sub2_Sub9_43.method2858(Static269.method2228(local75));
+				@Pc(88) int local88 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local75));
 				if (local43 < local88) {
 					local43 = local88;
 				}
@@ -59,14 +59,14 @@ public final class Static132 {
 	@OriginalMember(owner = "client!ke", name = "c", descriptor = "(III)V")
 	public static void method2606(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(1, arg0);
-		local8.method1017();
+		local8.pushServer();
 		local8.intArg1 = arg1;
 	}
 
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(IIIBI)V")
 	public static void method2607(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg2);
-		local8.method1017();
+		local8.pushServer();
 		local8.intArg3 = arg3;
 		local8.intArg2 = arg0;
 		local8.intArg1 = arg1;
diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java
index 378366b..6d458ad 100644
--- a/client/src/main/java/Static136.java
+++ b/client/src/main/java/Static136.java
@@ -1,4 +1,3 @@
-import java.awt.event.KeyEvent;
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
@@ -20,7 +19,7 @@ public final class Static136 {
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(IIB)V")
 	public static void method2649(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(4) DelayedStateChange local4 = Static238.method4143(6, arg1);
-		local4.method1017();
+		local4.pushServer();
 		local4.intArg1 = arg0;
 	}
 
diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java
index 74b3907..7ef28c4 100644
--- a/client/src/main/java/Static139.java
+++ b/client/src/main/java/Static139.java
@@ -29,7 +29,7 @@ public final class Static139 {
 	@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 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
-		return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.aLong52;
+		return local7 == null || local7.aClass24_1 == null ? 0L : local7.aClass24_1.key;
 	}
 
 	@OriginalMember(owner = "client!l", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java
index b296493..7516933 100644
--- a/client/src/main/java/Static140.java
+++ b/client/src/main/java/Static140.java
@@ -9,7 +9,7 @@ public final class Static140 {
 	public static int[][][] anIntArrayArrayArray12;
 
 	@OriginalMember(owner = "client!la", name = "f", descriptor = "Lclient!ce;")
-	public static final SecondaryLinkedList aClass16_7 = new SecondaryLinkedList();
+	public static final SecondaryLinkedList clientQueue = new SecondaryLinkedList();
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V")
 	public static void method2705(@OriginalArg(0) Buffer arg0) {
@@ -34,12 +34,12 @@ public final class Static140 {
 	}
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(ILclient!e;)I")
-	public static int method2706(@OriginalArg(1) Player arg0) {
+	public static int getSound(@OriginalArg(1) Player arg0) {
 		@Pc(14) int local14 = arg0.anInt1654;
 		@Pc(18) BasType local18 = arg0.method2681();
-		if (local18.anInt1037 == arg0.anInt3366) {
+		if (local18.idleAnimationId == arg0.anInt3366) {
 			local14 = arg0.anInt1648;
-		} else if (local18.anInt1058 == arg0.anInt3366 || arg0.anInt3366 == local18.anInt1054 || arg0.anInt3366 == local18.anInt1045 || local18.anInt1043 == arg0.anInt3366) {
+		} else if (local18.runAnimationId == arg0.anInt3366 || arg0.anInt3366 == local18.runAnimationId2 || arg0.anInt3366 == local18.runAnimationId4 || local18.runAnimationId3 == arg0.anInt3366) {
 			local14 = arg0.anInt1670;
 		} else if (arg0.anInt3366 == local18.anInt1062 || arg0.anInt3366 == local18.anInt1042 || arg0.anInt3366 == local18.anInt1048 || arg0.anInt3366 == local18.anInt1066) {
 			local14 = arg0.anInt1658;
@@ -53,25 +53,25 @@ public final class Static140 {
 			return;
 		}
 		if (Static35.anInt1093 >= 100) {
-			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORELISTFULL);
+			Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORELISTFULL);
 			return;
 		}
 		@Pc(34) JagString local34 = Static79.decode37(arg0).method3125();
 		@Pc(36) int local36;
 		for (local36 = 0; local36 < Static35.anInt1093; local36++) {
 			if (Static190.aLongArray6[local36] == arg0) {
-				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
+				Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { local34, LocalizedText.IGNORELISTDUPE}));
 				return;
 			}
 		}
 		for (local36 = 0; local36 < Static9.anInt178; local36++) {
 			if (Static92.aLongArray3[local36] == arg0) {
-				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
+				Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL2, local34, LocalizedText.REMOVEFRIEND}));
 				return;
 			}
 		}
 		if (local34.strEquals(Static173.self.aClass100_364)) {
-			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.IGNORECANTADDSELF);
+			Static103.method2231(Static186.EMPTY, 0, LocalizedText.IGNORECANTADDSELF);
 			return;
 		}
 		Static190.aLongArray6[Static35.anInt1093] = arg0;
@@ -83,7 +83,7 @@ public final class Static140 {
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(II)Lclient!ic;")
 	public static LightType method2709(@OriginalArg(1) int arg0) {
-		@Pc(10) LightType local10 = (LightType) Static220.aClass99_28.method3106((long) arg0);
+		@Pc(10) LightType local10 = (LightType) Static220.aClass99_28.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -92,7 +92,7 @@ public final class Static140 {
 		if (local26 != null) {
 			local10.method2257(new Buffer(local26), arg0);
 		}
-		Static220.aClass99_28.method3095(local10, (long) arg0);
+		Static220.aClass99_28.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java
index 0c5db6b..4c0626a 100644
--- a/client/src/main/java/Static141.java
+++ b/client/src/main/java/Static141.java
@@ -17,7 +17,7 @@ public final class Static141 {
 	public static int anInt3469 = 0;
 
 	@OriginalMember(owner = "client!lb", name = "v", descriptor = "I")
-	public static int anInt3470 = 0;
+	public static int language = 0;
 
 	@OriginalMember(owner = "client!lb", name = "A", descriptor = "I")
 	public static int buildArea = 0;
diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java
index f8ef76a..43e6036 100644
--- a/client/src/main/java/Static142.java
+++ b/client/src/main/java/Static142.java
@@ -33,14 +33,14 @@ public final class Static142 {
 			} else if (Static267.anInt5774 > local5) {
 				local17 = Static159.players[Static105.anIntArray256[local5]];
 			} else {
-				local17 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local5 - Static267.anInt5774]];
+				local17 = Static175.npcs[Static33.anIntArray79[local5 - Static267.anInt5774]];
 			}
 			if (local17 != null && local17.method2682()) {
 				@Pc(58) NpcType local58;
 				if (local17 instanceof Npc) {
-					local58 = ((Npc) local17).aClass96_1;
+					local58 = ((Npc) local17).type;
 					if (local58.anIntArray357 != null) {
-						local58 = local58.method2932();
+						local58 = local58.getMultiNpc();
 					}
 					if (local58 == null) {
 						continue;
@@ -48,9 +48,9 @@ public final class Static142 {
 				}
 				@Pc(161) int local161;
 				if (local5 >= Static267.anInt5774) {
-					local58 = ((Npc) local17).aClass96_1;
+					local58 = ((Npc) local17).type;
 					if (local58.anIntArray357 != null) {
-						local58 = local58.method2932();
+						local58 = local58.getMultiNpc();
 					}
 					if (local58.anInt3732 >= 0 && Static138.aClass3_Sub2_Sub1Array5.length > local58.anInt3732) {
 						if (local58.anInt3730 == -1) {
@@ -110,8 +110,8 @@ public final class Static142 {
 				if (local17.aClass100_640 != null && (local5 >= Static267.anInt5774 || Static59.anInt1812 == 0 || Static59.anInt1812 == 3 || Static59.anInt1812 == 1 && Static98.method1965(((Player) local17).aClass100_364))) {
 					Static180.method3326(arg4 >> 1, arg3, local17, arg5, local17.method2691(), arg1 >> 1);
 					if (Static65.anInt1951 > -1 && Static277.anInt5854 < Static191.anInt4506) {
-						Static191.anIntArray389[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.method2858(local17.aClass100_640) / 2;
-						Static191.anIntArray387[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.anInt3626;
+						Static191.anIntArray389[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.getStringWidth(local17.aClass100_640) / 2;
+						Static191.anIntArray387[Static277.anInt5854] = Static280.aClass3_Sub2_Sub9_43.lineHeight;
 						Static191.anIntArray385[Static277.anInt5854] = Static65.anInt1951;
 						Static191.anIntArray392[Static277.anInt5854] = Static16.anInt548;
 						Static191.anIntArray390[Static277.anInt5854] = local17.anInt3429;
@@ -126,18 +126,18 @@ public final class Static142 {
 					@Pc(512) Sprite local512 = Static116.aClass3_Sub2_Sub1Array3[1];
 					if (local17 instanceof Npc) {
 						@Pc(518) Npc local518 = (Npc) local17;
-						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.method3106((long) local518.aClass96_1.anInt3736);
+						@Pc(528) Sprite[] local528 = (Sprite[]) Static73.aClass99_10.get((long) local518.type.anInt3736);
 						if (local528 == null) {
-							local528 = Static209.method3708(local518.aClass96_1.anInt3736, Static209.js5Archive8);
+							local528 = Static209.method3708(local518.type.anInt3736, Static209.js5Archive8);
 							if (local528 != null) {
-								Static73.aClass99_10.method3095(local528, (long) local518.aClass96_1.anInt3736);
+								Static73.aClass99_10.put(local528, (long) local518.type.anInt3736);
 							}
 						}
 						if (local528 != null && local528.length == 2) {
 							local512 = local528[1];
 							local508 = local528[0];
 						}
-						@Pc(571) NpcType local571 = local518.aClass96_1;
+						@Pc(571) NpcType local571 = local518.type;
 						if (local571.anInt3730 == -1) {
 							local310 = local17.method2691();
 						} else {
@@ -170,7 +170,7 @@ public final class Static142 {
 					if (local17.anIntArray319[local74] > Static83.loop) {
 						if (local17 instanceof Npc) {
 							@Pc(725) Npc local725 = (Npc) local17;
-							@Pc(728) NpcType local728 = local725.aClass96_1;
+							@Pc(728) NpcType local728 = local725.type;
 							if (local728.anInt3730 == -1) {
 								local265 = local17.method2691() / 2;
 							} else {
@@ -193,7 +193,7 @@ public final class Static142 {
 								Static65.anInt1951 += 15;
 							}
 							Static213.aClass3_Sub2_Sub1Array8[local17.anIntArray321[local74]].method1423(arg2 + Static65.anInt1951 - 12, arg0 + Static16.anInt548 - 12);
-							Static114.aClass3_Sub2_Sub9_42.method2875(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
+							Static114.aClass3_Sub2_Sub9_42.renderCenter(Static123.parseInt(local17.anIntArray322[local74]), Static65.anInt1951 + arg2 - 1, Static16.anInt548 + 3 + arg0, 16777215, 0);
 						}
 					}
 				}
@@ -262,19 +262,19 @@ public final class Static142 {
 					}
 				}
 				if (Static191.anIntArray391[local5] == 0) {
-					Static280.aClass3_Sub2_Sub9_43.method2875(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
+					Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, arg0 + Static16.anInt548, local639, 0);
 				}
 				if (Static191.anIntArray391[local5] == 1) {
-					Static280.aClass3_Sub2_Sub9_43.method2872(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
+					Static280.aClass3_Sub2_Sub9_43.renderWave(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325);
 				}
 				if (Static191.anIntArray391[local5] == 2) {
-					Static280.aClass3_Sub2_Sub9_43.method2871(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
+					Static280.aClass3_Sub2_Sub9_43.renderWave2(local962, arg2 + Static65.anInt1951, arg0 - -Static16.anInt548, local639, Static136.anInt3325);
 				}
 				if (Static191.anIntArray391[local5] == 3) {
-					Static280.aClass3_Sub2_Sub9_43.method2868(local962, arg2 + Static65.anInt1951, Static16.anInt548 + arg0, local639, Static136.anInt3325, 150 - Static191.anIntArray384[local5]);
+					Static280.aClass3_Sub2_Sub9_43.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]) * (Static280.aClass3_Sub2_Sub9_43.method2858(local962) + 100) / 150;
+					local642 = (150 - Static191.anIntArray384[local5]) * (Static280.aClass3_Sub2_Sub9_43.getStringWidth(local962) + 100) / 150;
 					if (GlRenderer.enabled) {
 						Static46.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0);
 					} else {
@@ -291,16 +291,16 @@ public final class Static142 {
 					@Pc(1372) int local1372 = 0;
 					local642 = 150 - Static191.anIntArray384[local5];
 					if (GlRenderer.enabled) {
-						Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
+						Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5);
 					} else {
-						Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
+						Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.lineHeight - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5);
 					}
 					if (local642 < 25) {
 						local1372 = local642 - 25;
 					} else if (local642 > 125) {
 						local1372 = local642 - 125;
 					}
-					Static280.aClass3_Sub2_Sub9_43.method2875(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
+					Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0);
 					if (GlRenderer.enabled) {
 						Static46.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4);
 					} else {
@@ -308,7 +308,7 @@ public final class Static142 {
 					}
 				}
 			} else {
-				Static280.aClass3_Sub2_Sub9_43.method2875(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
+				Static280.aClass3_Sub2_Sub9_43.renderCenter(local962, arg2 + Static65.anInt1951, arg0 + Static16.anInt548, 16776960, 0);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java
index 0114b0c..56cf44b 100644
--- a/client/src/main/java/Static144.java
+++ b/client/src/main/java/Static144.java
@@ -261,7 +261,7 @@ public final class Static144 {
 	}
 
 	@OriginalMember(owner = "client!le", name = "a", descriptor = "(I)I")
-	public static int method2736() {
+	public static int getWindowMode() {
 		if (GameShell.fullScreenFrame != null) {
 			return 3;
 		} else if (GlRenderer.enabled && Static124.aBoolean156) {
diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java
index bcef561..d585fa2 100644
--- a/client/src/main/java/Static145.java
+++ b/client/src/main/java/Static145.java
@@ -94,7 +94,7 @@ public final class Static145 {
 	@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 = Static238.method4143(10, arg0);
-		local8.method1017();
+		local8.pushServer();
 		local8.intArg3 = arg2;
 		local8.intArg1 = arg3;
 		local8.intArg2 = arg1;
diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java
index b1d2ebf..e32bd0a 100644
--- a/client/src/main/java/Static148.java
+++ b/client/src/main/java/Static148.java
@@ -41,7 +41,7 @@ public final class Static148 {
 		@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0);
 		if (local21 == null) {
 			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
-			Static199.aClass133_20.method3862(local21, (long) arg0);
+			Static199.aClass133_20.put(local21, (long) arg0);
 		} else {
 			local21.aLong55 = MonotonicClock.currentTimeMillis() + 500L;
 		}
@@ -49,14 +49,14 @@ public final class Static148 {
 
 	@OriginalMember(owner = "client!li", name = "a", descriptor = "(II)Lclient!dd;")
 	public static SoftwareFont method2768(@OriginalArg(1) int arg0) {
-		@Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.method3106((long) arg0);
+		@Pc(16) SoftwareFont local16 = (SoftwareFont) Static139.aClass99_22.get((long) arg0);
 		if (local16 != null) {
 			return local16;
 		}
 		@Pc(26) byte[] local26 = Static261.js5Archive13.getFile(arg0, 0);
 		local16 = new SoftwareFont(local26);
-		local16.method2873(Static159.aClass36Array12, null);
-		Static139.aClass99_22.method3095(local16, (long) arg0);
+		local16.setNameIcons(Static159.aClass36Array12, null);
+		Static139.aClass99_22.put(local16, (long) arg0);
 		return local16;
 	}
 }
diff --git a/client/src/main/java/Static15.java b/client/src/main/java/Static15.java
index 75e1319..714b299 100644
--- a/client/src/main/java/Static15.java
+++ b/client/src/main/java/Static15.java
@@ -25,14 +25,14 @@ public final class Static15 {
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(Z)Lclient!na;")
 	public static JagString method479() {
 		@Pc(8) JagString local8 = Static93.aClass100_518;
-		@Pc(10) JagString local10 = Static186.EMPTY_FILE;
+		@Pc(10) JagString local10 = Static186.EMPTY;
 		if (Static83.modeWhere != 0) {
 			local8 = Static50.aClass100_365;
 		}
-		if (Static47.aClass100_991 != null) {
-			local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.aClass100_991 });
+		if (Static47.settings != null) {
+			local10 = Static34.concatenate(new JagString[] { Static150.aClass100_687, Static47.settings});
 		}
-		return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.anInt3470), Static257.aClass100_98, Static123.parseInt(Static204.anInt4760), local10, Static41.aClass100_268 });
+		return Static34.concatenate(new JagString[] { Static61.aClass100_424, local8, Static80.aClass100_886, Static123.parseInt(Static141.language), Static257.aClass100_98, Static123.parseInt(Static204.affiliate), local10, Static41.aClass100_268 });
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
diff --git a/client/src/main/java/Static150.java b/client/src/main/java/Static150.java
index bf03d2f..c513bff 100644
--- a/client/src/main/java/Static150.java
+++ b/client/src/main/java/Static150.java
@@ -8,7 +8,7 @@ public final class Static150 {
 	public static final JagString aClass100_687 = Static28.parse(")4p=");
 
 	@OriginalMember(owner = "client!lk", name = "U", descriptor = "Z")
-	public static boolean aBoolean175 = false;
+	public static boolean objectTag = false;
 
 	@OriginalMember(owner = "client!lk", name = "V", descriptor = "I")
 	public static int anInt3582 = 0;
@@ -95,7 +95,7 @@ public final class Static150 {
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!fl;IIII)V")
 	public static void method2804(@OriginalArg(0) int arg0, @OriginalArg(1) AreaSound arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
-		if (arg1.anInt2044 == -1 && arg1.anIntArray181 == null) {
+		if (arg1.sound == -1 && arg1.sounds == null) {
 			return;
 		}
 		@Pc(20) int local20 = 0;
@@ -109,14 +109,14 @@ public final class Static150 {
 		} else if (arg4 < arg1.anInt2029) {
 			local20 += arg1.anInt2029 - arg4;
 		}
-		if (arg1.anInt2042 == 0 || arg1.anInt2042 < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
-			if (arg1.aClass3_Sub3_Sub1_1 != null) {
-				Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_1);
-				arg1.aClass3_Sub3_Sub1_1 = null;
+		if (arg1.radius == 0 || arg1.radius < local20 - 64 || Static30.ambientSoundsVolume == 0 || arg2 != arg1.anInt2033) {
+			if (arg1.primaryStream != null) {
+				Static204.soundStream.removeSubStream(arg1.primaryStream);
+				arg1.primaryStream = null;
 			}
-			if (arg1.aClass3_Sub3_Sub1_2 != null) {
-				Static204.soundStream.method1347(arg1.aClass3_Sub3_Sub1_2);
-				arg1.aClass3_Sub3_Sub1_2 = null;
+			if (arg1.secondaryStream != null) {
+				Static204.soundStream.removeSubStream(arg1.secondaryStream);
+				arg1.secondaryStream = null;
 			}
 			return;
 		}
@@ -124,34 +124,34 @@ public final class Static150 {
 		if (local20 < 0) {
 			local20 = 0;
 		}
-		@Pc(134) int local134 = (arg1.anInt2042 - local20) * Static30.ambientSoundsVolume / arg1.anInt2042;
-		if (arg1.aClass3_Sub3_Sub1_1 != null) {
-			arg1.aClass3_Sub3_Sub1_1.method386(local134);
-		} else if (arg1.anInt2044 >= 0) {
-			@Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.anInt2044, 0);
+		@Pc(134) int local134 = (arg1.radius - local20) * Static30.ambientSoundsVolume / arg1.radius;
+		if (arg1.primaryStream != null) {
+			arg1.primaryStream.method386(local134);
+		} else if (arg1.sound >= 0) {
+			@Pc(150) SynthSound local150 = Static292.method3988(Static248.js5Archive4, arg1.sound, 0);
 			if (local150 != null) {
 				@Pc(158) PcmSound local158 = local150.method3989().method2648(Static56.resampler);
 				@Pc(163) SoundPcmStream local163 = Static284.method404(local158, local134);
 				local163.method396(-1);
 				Static204.soundStream.method1343(local163);
-				arg1.aClass3_Sub3_Sub1_1 = local163;
+				arg1.primaryStream = local163;
 			}
 		}
-		if (arg1.aClass3_Sub3_Sub1_2 != null) {
-			arg1.aClass3_Sub3_Sub1_2.method386(local134);
-			if (!arg1.aClass3_Sub3_Sub1_2.method4654()) {
-				arg1.aClass3_Sub3_Sub1_2 = null;
+		if (arg1.secondaryStream != null) {
+			arg1.secondaryStream.method386(local134);
+			if (!arg1.secondaryStream.method4654()) {
+				arg1.secondaryStream = null;
 			}
-		} else if (arg1.anIntArray181 != null && (arg1.anInt2034 -= arg3) <= 0) {
-			@Pc(219) int local219 = (int) ((double) arg1.anIntArray181.length * Math.random());
-			@Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.anIntArray181[local219], 0);
+		} else if (arg1.sounds != null && (arg1.anInt2034 -= arg3) <= 0) {
+			@Pc(219) int local219 = (int) ((double) arg1.sounds.length * Math.random());
+			@Pc(227) SynthSound local227 = Static292.method3988(Static248.js5Archive4, arg1.sounds[local219], 0);
 			if (local227 != null) {
 				@Pc(236) PcmSound local236 = local227.method3989().method2648(Static56.resampler);
 				@Pc(241) SoundPcmStream local241 = Static284.method404(local236, local134);
 				local241.method396(0);
 				Static204.soundStream.method1343(local241);
 				arg1.anInt2034 = (int) ((double) (arg1.anInt2040 - arg1.anInt2032) * Math.random()) + arg1.anInt2032;
-				arg1.aClass3_Sub3_Sub1_2 = local241;
+				arg1.secondaryStream = local241;
 			}
 		}
 	}
diff --git a/client/src/main/java/Static153.java b/client/src/main/java/Static153.java
index 94f8278..41e8b62 100644
--- a/client/src/main/java/Static153.java
+++ b/client/src/main/java/Static153.java
@@ -40,7 +40,7 @@ public final class Static153 {
 	@OriginalMember(owner = "client!mc", name = "c", descriptor = "(III)V")
 	public static void method2905(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(7, arg0);
-		local14.method1017();
+		local14.pushServer();
 		local14.intArg1 = arg1;
 	}
 
@@ -68,7 +68,7 @@ public final class Static153 {
 	@OriginalMember(owner = "client!mc", name = "f", descriptor = "(B)V")
 	public static void method2909() {
 		Static6.outboundBuffer.p1isaac(184);
-		for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
+		for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) {
 			if (local18.anInt5879 == 0) {
 				Static132.method2605(true, local18);
 			}
@@ -82,6 +82,6 @@ public final class Static153 {
 	@OriginalMember(owner = "client!mc", name = "a", descriptor = "(BI)V")
 	public static void method2910(@OriginalArg(1) int arg0) {
 		@Pc(4) DelayedStateChange local4 = Static238.method4143(8, arg0);
-		local4.method1007();
+		local4.pushClient();
 	}
 }
diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java
index e833f0e..235c76b 100644
--- a/client/src/main/java/Static158.java
+++ b/client/src/main/java/Static158.java
@@ -21,7 +21,7 @@ public final class Static158 {
 	public static int anInt3857 = 0;
 
 	@OriginalMember(owner = "client!mh", name = "f", descriptor = "(B)V")
-	public static void handleAccountCreation() {
+	public static void loop() {
 		if (Static179.accountCreationStep == 0) {
 			return;
 		}
@@ -157,20 +157,20 @@ public final class Static158 {
 					@Pc(129) int local129 = local103 & 0x3F;
 					@Pc(142) int local142 = local129 + (Static238.regionBitPacked[local16] & 0xFF) * 64 - Static142.originZ;
 					@Pc(148) NpcType local148 = Static214.method4363(local74.g2());
-					if (Static175.aClass8_Sub4_Sub2Array1[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
-						Static175.aClass8_Sub4_Sub2Array1[local97] = new Npc();
-						@Pc(198) Npc local198 = Static175.aClass8_Sub4_Sub2Array1[local97];
+					if (Static175.npcs[local97] == null && (local148.aByte10 & 0x1) > 0 && local107 == Static41.anInt1316 && local125 >= 0 && local148.anInt3713 + local125 < 104 && local142 >= 0 && local142 + local148.anInt3713 < 104) {
+						Static175.npcs[local97] = new Npc();
+						@Pc(198) Npc local198 = Static175.npcs[local97];
 						Static33.anIntArray79[Static272.anInt5214++] = local97;
 						local198.anInt3430 = Static83.loop;
 						local198.method2698(local148);
-						local198.method2692(local198.aClass96_1.anInt3713);
-						local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.aClass96_1.aByte11];
-						local198.anInt3376 = local198.aClass96_1.anInt3733;
+						local198.method2692(local198.type.anInt3713);
+						local198.anInt3400 = local198.anInt3381 = Static56.anIntArray141[local198.type.aByte11];
+						local198.anInt3376 = local198.type.anInt3733;
 						if (local198.anInt3376 == 0) {
 							local198.anInt3381 = 0;
 						}
-						local198.anInt3365 = local198.aClass96_1.anInt3737;
-						local198.method2683(local198.method2693(), local125, local142, true);
+						local198.anInt3365 = local198.type.anInt3737;
+						local198.method2683(local198.getSize(), local125, local142, true);
 					}
 				}
 			}
diff --git a/client/src/main/java/Static159.java b/client/src/main/java/Static159.java
index 51641fe..0e06de5 100644
--- a/client/src/main/java/Static159.java
+++ b/client/src/main/java/Static159.java
@@ -52,7 +52,7 @@ public final class Static159 {
 									local65.anInt5398 = 1;
 									local65.anInt5404 = 0;
 									local65.anInt5408 = local23;
-									Static152.method2836(arg1.anInt3421, local60, arg1.anInt3412, false, 0);
+									Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0);
 								} else if (local68 == 2) {
 									local65.anInt5400 = 0;
 								}
@@ -68,7 +68,7 @@ public final class Static159 {
 							local65.anInt5396 = local15;
 							local65.anInt5400 = 0;
 							local65.anInt5399 = 0;
-							Static152.method2836(arg1.anInt3421, local60, arg1.anInt3412, false, 0);
+							Static152.method2836(arg1.zFine, local60, arg1.xFine, false, 0);
 						}
 					}
 				}
diff --git a/client/src/main/java/Static16.java b/client/src/main/java/Static16.java
index 33e4b47..a72a1bd 100644
--- a/client/src/main/java/Static16.java
+++ b/client/src/main/java/Static16.java
@@ -45,7 +45,7 @@ public final class Static16 {
 						if (local54.aClass24_1 != null) {
 							if (local54.aClass24_1.aClass8_3 instanceof GlModel) {
 								local71 = (GlModel) local54.aClass24_1.aClass8_3;
-								if ((local54.aClass24_1.aLong52 & Long.MIN_VALUE) == 0L) {
+								if ((local54.aClass24_1.key & Long.MIN_VALUE) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
@@ -53,7 +53,7 @@ public final class Static16 {
 							}
 							if (local54.aClass24_1.aClass8_2 instanceof GlModel) {
 								local71 = (GlModel) local54.aClass24_1.aClass8_2;
-								if ((Long.MIN_VALUE & local54.aClass24_1.aLong52) == 0L) {
+								if ((Long.MIN_VALUE & local54.aClass24_1.key) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
@@ -63,7 +63,7 @@ public final class Static16 {
 						if (local54.aClass77_1 != null) {
 							if (local54.aClass77_1.aClass8_5 instanceof GlModel) {
 								local71 = (GlModel) local54.aClass77_1.aClass8_5;
-								if ((local54.aClass77_1.aLong107 & Long.MIN_VALUE) == 0L) {
+								if ((local54.aClass77_1.key & Long.MIN_VALUE) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
@@ -71,7 +71,7 @@ public final class Static16 {
 							}
 							if (local54.aClass77_1.aClass8_6 instanceof GlModel) {
 								local71 = (GlModel) local54.aClass77_1.aClass8_6;
-								if ((Long.MIN_VALUE & local54.aClass77_1.aLong107) == 0L) {
+								if ((Long.MIN_VALUE & local54.aClass77_1.key) == 0L) {
 									local71.method4111(false, true, true, false, true, true);
 								} else {
 									local71.method4111(true, true, true, true, true, true);
diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java
index a11e142..9fc9145 100644
--- a/client/src/main/java/Static160.java
+++ b/client/src/main/java/Static160.java
@@ -44,7 +44,7 @@ public final class Static160 {
 		} else {
 			((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Camera.getYaw(), arg2.anIntArray37, arg2.anIntArray45);
 		}
-		Static31.aBooleanArray29[arg3] = true;
+		Static31.rectangleRedraw[arg3] = true;
 	}
 
 	@OriginalMember(owner = "client!mj", name = "a", descriptor = "(IIIII)Z")
diff --git a/client/src/main/java/Static163.java b/client/src/main/java/Static163.java
index 464db78..d430f26 100644
--- a/client/src/main/java/Static163.java
+++ b/client/src/main/java/Static163.java
@@ -16,7 +16,7 @@ public final class Static163 {
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(II)V")
 	public static void method3096(@OriginalArg(0) int arg0) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(3, arg0);
-		local8.method1007();
+		local8.pushClient();
 	}
 
 	@OriginalMember(owner = "client!n", name = "a", descriptor = "(B)V")
diff --git a/client/src/main/java/Static166.java b/client/src/main/java/Static166.java
index 87f1515..b800970 100644
--- a/client/src/main/java/Static166.java
+++ b/client/src/main/java/Static166.java
@@ -75,7 +75,7 @@ public final class Static166 {
 										local214--;
 										@Pc(312) LocType local312 = Static271.method4601(local214);
 										if (local312.anIntArray380 != null) {
-											local312 = local312.method3417();
+											local312 = local312.getMultiLoc();
 											if (local312 == null || local312.anInt4400 == -1) {
 												continue;
 											}
diff --git a/client/src/main/java/Static167.java b/client/src/main/java/Static167.java
index 6a97e48..a1fe10d 100644
--- a/client/src/main/java/Static167.java
+++ b/client/src/main/java/Static167.java
@@ -35,13 +35,13 @@ public final class Static167 {
 	public static final JagString aClass100_783 = Static28.parse(")4p=");
 
 	@OriginalMember(owner = "client!nd", name = "a", descriptor = "(ZLclient!qb;)V")
-	public static void method3170(@OriginalArg(1) PcmStream arg0) {
+	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()) {
-			method3170(local14);
+			setInactive(local14);
 		}
 	}
 
diff --git a/client/src/main/java/Static168.java b/client/src/main/java/Static168.java
index 7acd855..58aad78 100644
--- a/client/src/main/java/Static168.java
+++ b/client/src/main/java/Static168.java
@@ -3,20 +3,20 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static168 {
 
 	@OriginalMember(owner = "client!ne", name = "h", descriptor = "[B")
-	public static final byte[] aByteArray54 = new byte[500];
+	public static final byte[] tempFlags = new byte[500];
 
 	@OriginalMember(owner = "client!ne", name = "i", descriptor = "[S")
-	public static final short[] aShortArray45 = new short[500];
+	public static final short[] tempZ = new short[500];
 
 	@OriginalMember(owner = "client!ne", name = "j", descriptor = "[S")
-	public static final short[] aShortArray46 = new short[500];
+	public static final short[] tempY = new short[500];
 
 	@OriginalMember(owner = "client!ne", name = "k", descriptor = "[S")
-	public static final short[] aShortArray47 = new short[500];
+	public static final short[] tempPrevOriginIndices = new short[500];
 
 	@OriginalMember(owner = "client!ne", name = "m", descriptor = "[S")
-	public static final short[] aShortArray48 = new short[500];
+	public static final short[] tempX = new short[500];
 
 	@OriginalMember(owner = "client!ne", name = "p", descriptor = "[S")
-	public static final short[] aShortArray51 = new short[500];
+	public static final short[] tempIndices = new short[500];
 }
diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java
index 62acc74..c35cdd7 100644
--- a/client/src/main/java/Static169.java
+++ b/client/src/main/java/Static169.java
@@ -72,7 +72,7 @@ public final class Static169 {
 		if (local103 == null) {
 			return null;
 		} else if (local90.status == 2) {
-			Static25.method714(local103, arg3);
+			Static25.exitFullScreen(local103, arg3);
 			return null;
 		} else {
 			return local103;
diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java
index 359bca9..d9033b4 100644
--- a/client/src/main/java/Static170.java
+++ b/client/src/main/java/Static170.java
@@ -79,7 +79,7 @@ public final class Static170 {
 		@Pc(20) LongNode local20 = (LongNode) Static199.aClass133_20.get((long) arg1);
 		if (local20 == null) {
 			local20 = new LongNode(4611686018427387905L);
-			Static199.aClass133_20.method3862(local20, (long) arg1);
+			Static199.aClass133_20.put(local20, (long) arg1);
 		} else if (local20.aLong55 != 4611686018427387905L) {
 			local20.aLong55 = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L;
 		}
diff --git a/client/src/main/java/Static173.java b/client/src/main/java/Static173.java
index 5eaee87..99db387 100644
--- a/client/src/main/java/Static173.java
+++ b/client/src/main/java/Static173.java
@@ -30,29 +30,29 @@ public final class Static173 {
 		@Pc(158) int local158;
 		@Pc(171) int local171;
 		for (local7 = 0; local7 < Static272.anInt5214; local7++) {
-			local16 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local7]];
-			if (local16 != null && local16.method2682() && local16.aClass96_1.aBoolean182 == arg0 && local16.aClass96_1.method2933()) {
-				@Pc(42) int local42 = local16.method2693();
+			local16 = Static175.npcs[Static33.anIntArray79[local7]];
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
+				@Pc(42) int local42 = local16.getSize();
 				@Pc(97) int local97;
 				if (local42 == 1) {
-					if ((local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
-						local97 = local16.anInt3412 >> 7;
-						local107 = local16.anInt3421 >> 7;
+					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+						local97 = local16.xFine >> 7;
+						local107 = local16.zFine >> 7;
 						if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
 							local171 = Static31.anIntArrayArray6[local97][local107]++;
 						}
 					}
-				} else if (((local42 & 0x1) != 0 || (local16.anInt3412 & 0x7F) == 0 && (local16.anInt3421 & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64)) {
-					local97 = local16.anInt3412 - local42 * 64 >> 7;
-					local107 = local16.anInt3421 - local42 * 64 >> 7;
-					local113 = local16.method2693() + local97;
+				} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
+					local97 = local16.xFine - local42 * 64 >> 7;
+					local107 = local16.zFine - local42 * 64 >> 7;
+					local113 = local16.getSize() + local97;
 					if (local97 < 0) {
 						local97 = 0;
 					}
 					if (local113 > 104) {
 						local113 = 104;
 					}
-					local133 = local107 + local16.method2693();
+					local133 = local107 + local16.getSize();
 					if (local107 < 0) {
 						local107 = 0;
 					}
@@ -68,14 +68,14 @@ public final class Static173 {
 			}
 		}
 		label200: for (local7 = 0; local7 < Static272.anInt5214; local7++) {
-			local16 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local7]];
+			local16 = Static175.npcs[Static33.anIntArray79[local7]];
 			@Pc(262) long local262 = (long) Static33.anIntArray79[local7] << 32 | 0x20000000L;
-			if (local16 != null && local16.method2682() && local16.aClass96_1.aBoolean182 == arg0 && local16.aClass96_1.method2933()) {
-				local107 = local16.method2693();
+			if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
+				local107 = local16.getSize();
 				if (local107 == 1) {
-					if ((local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
-						local113 = local16.anInt3412 >> 7;
-						local133 = local16.anInt3421 >> 7;
+					if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+						local113 = local16.xFine >> 7;
+						local133 = local16.zFine >> 7;
 						if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
 							continue;
 						}
@@ -84,9 +84,9 @@ public final class Static173 {
 							continue;
 						}
 					}
-				} else if ((local107 & 0x1) == 0 && (local16.anInt3412 & 0x7F) == 0 && (local16.anInt3421 & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
-					local113 = local16.anInt3412 - local107 * 64 >> 7;
-					local133 = local16.anInt3421 - local107 * 64 >> 7;
+				} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
+					local113 = local16.xFine - local107 * 64 >> 7;
+					local133 = local16.zFine - local107 * 64 >> 7;
 					local158 = local133 + local107;
 					if (local133 < 0) {
 						local133 = 0;
@@ -125,11 +125,11 @@ public final class Static173 {
 						}
 					}
 				}
-				if (!local16.aClass96_1.aBoolean183) {
+				if (!local16.type.aBoolean183) {
 					local262 |= Long.MIN_VALUE;
 				}
-				local16.anInt3424 = Static207.method3685(Static55.level, local16.anInt3412, local16.anInt3421);
-				Static43.method1141(Static55.level, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
+				local16.anInt3424 = Static207.method3685(Static55.level, local16.xFine, local16.zFine);
+				Static43.method1141(Static55.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static175.java b/client/src/main/java/Static175.java
index f1f3323..ff195f5 100644
--- a/client/src/main/java/Static175.java
+++ b/client/src/main/java/Static175.java
@@ -9,7 +9,7 @@ public final class Static175 {
 	public static JagString url;
 
 	@OriginalMember(owner = "client!nm", name = "S", descriptor = "[Lclient!km;")
-	public static final Npc[] aClass8_Sub4_Sub2Array1 = new Npc[32768];
+	public static final Npc[] npcs = new Npc[32768];
 
 	@OriginalMember(owner = "client!nm", name = "U", descriptor = "I")
 	public static int mapFilesMissingCount = 0;
diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java
index be2bab6..1ee8e2e 100644
--- a/client/src/main/java/Static176.java
+++ b/client/src/main/java/Static176.java
@@ -47,12 +47,12 @@ public final class Static176 {
 				local62 = Static34.concatenate(new JagString[] { Static31.aClass100_193, Static123.parseInt(local3.anInt382 + 7000) });
 			}
 			@Pc(89) JagString local89 = Static211.aClass100_230;
-			if (Static47.aClass100_991 != null) {
-				local89 = Static34.concatenate(new JagString[] { Static167.aClass100_783, Static47.aClass100_991 });
+			if (Static47.settings != null) {
+				local89 = Static34.concatenate(new JagString[] { Static167.aClass100_783, Static47.settings});
 			}
-			@Pc(182) JagString local182 = Static34.concatenate(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.parseInt(Static141.anInt3470), aClass100_801, Static123.parseInt(Static204.anInt4760), local89, Static139.aClass100_659, Static150.aBoolean175 ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, Static233.aBoolean254 ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, Static249.aBoolean282 ? Static30.aClass100_184 : Static260.aClass100_945 });
+			@Pc(182) JagString local182 = Static34.concatenate(new JagString[] { Static115.aClass100_582, local3.aClass100_71, local62, Static279.aClass100_1107, Static123.parseInt(Static141.language), aClass100_801, Static123.parseInt(Static204.affiliate), local89, Static139.aClass100_659, Static150.objectTag ? Static30.aClass100_184 : Static260.aClass100_945, Static60.aClass100_420, Static233.javaScript ? Static30.aClass100_184 : Static260.aClass100_945, Static198.aClass100_260, Static249.advertSuppressed ? Static30.aClass100_184 : Static260.aClass100_945 });
 			try {
-				Static215.aClient1.getAppletContext().showDocument(local182.method3107(), "_self");
+				Static215.instance.getAppletContext().showDocument(local182.method3107(), "_self");
 				return true;
 			} catch (@Pc(191) Exception local191) {
 				return false;
@@ -80,9 +80,9 @@ public final class Static176 {
 				}
 			} else {
 				if (Static266.game == 1) {
-					Static98.method1966(-1, 0L, Static186.EMPTY_FILE, local33, (short) 36, LocalizedText.FACEHERE, local47);
+					Static98.method1966(-1, 0L, Static186.EMPTY, local33, (short) 36, LocalizedText.FACEHERE, local47);
 				}
-				Static98.method1966(-1, 0L, Static186.EMPTY_FILE, local33, (short) 60, Static195.aClass100_859, local47);
+				Static98.method1966(-1, 0L, Static186.EMPTY, local33, (short) 60, Static195.aClass100_859, local47);
 			}
 		}
 		@Pc(112) long local112 = -1L;
@@ -98,7 +98,7 @@ public final class Static176 {
 				if (local133 == 2 && Static257.method523(Static55.level, local47, local147, local121)) {
 					@Pc(172) LocType local172 = Static271.method4601(local140);
 					if (local172.anIntArray380 != null) {
-						local172 = local172.method3417();
+						local172 = local172.getMultiLoc();
 					}
 					if (local172 == null) {
 						continue;
@@ -155,47 +155,47 @@ public final class Static176 {
 				@Pc(502) Npc local502;
 				@Pc(597) Player local597;
 				if (local133 == 1) {
-					@Pc(421) Npc local421 = Static175.aClass8_Sub4_Sub2Array1[local140];
-					if ((local421.aClass96_1.anInt3713 & 0x1) == 0 && (local421.anInt3412 & 0x7F) == 0 && (local421.anInt3421 & 0x7F) == 0 || (local421.aClass96_1.anInt3713 & 0x1) == 1 && (local421.anInt3412 & 0x7F) == 64 && (local421.anInt3421 & 0x7F) == 64) {
-						local479 = local421.anInt3412 + 64 - local421.aClass96_1.anInt3713 * 64;
-						local240 = local421.anInt3421 - (local421.aClass96_1.anInt3713 - 1) * 64;
+					@Pc(421) Npc local421 = Static175.npcs[local140];
+					if ((local421.type.anInt3713 & 0x1) == 0 && (local421.xFine & 0x7F) == 0 && (local421.zFine & 0x7F) == 0 || (local421.type.anInt3713 & 0x1) == 1 && (local421.xFine & 0x7F) == 64 && (local421.zFine & 0x7F) == 64) {
+						local479 = local421.xFine + 64 - local421.type.anInt3713 * 64;
+						local240 = local421.zFine - (local421.type.anInt3713 - 1) * 64;
 						for (local493 = 0; local493 < Static272.anInt5214; local493++) {
-							local502 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local493]];
-							local514 = local502.anInt3412 + 64 - local502.aClass96_1.anInt3713 * 64;
-							local526 = local502.anInt3421 + 64 - local502.aClass96_1.anInt3713 * 64;
-							if (local502 != null && local421 != local502 && local514 >= local479 && local421.aClass96_1.anInt3713 - (local514 - local479 >> 7) >= local502.aClass96_1.anInt3713 && local240 <= local526 && local502.aClass96_1.anInt3713 <= local421.aClass96_1.anInt3713 - (local526 - local240 >> 7)) {
-								Static246.method4240(local502.aClass96_1, local47, Static33.anIntArray79[local493], local147);
+							local502 = Static175.npcs[Static33.anIntArray79[local493]];
+							local514 = local502.xFine + 64 - local502.type.anInt3713 * 64;
+							local526 = local502.zFine + 64 - local502.type.anInt3713 * 64;
+							if (local502 != null && local421 != local502 && local514 >= local479 && local421.type.anInt3713 - (local514 - local479 >> 7) >= local502.type.anInt3713 && local240 <= local526 && local502.type.anInt3713 <= local421.type.anInt3713 - (local526 - local240 >> 7)) {
+								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
 							}
 						}
 						for (local493 = 0; local493 < Static267.anInt5774; local493++) {
 							local597 = Static159.players[Static105.anIntArray256[local493]];
-							local514 = local597.anInt3412 + 64 - local597.method2693() * 64;
-							local526 = local597.anInt3421 + 64 - local597.method2693() * 64;
-							if (local597 != null && local514 >= local479 && local597.method2693() <= local421.aClass96_1.anInt3713 - (local514 - local479 >> 7) && local526 >= local240 && local597.method2693() <= local421.aClass96_1.anInt3713 - (local526 - local240 >> 7)) {
+							local514 = local597.xFine + 64 - local597.getSize() * 64;
+							local526 = local597.zFine + 64 - local597.getSize() * 64;
+							if (local597 != null && local514 >= local479 && local597.getSize() <= local421.type.anInt3713 - (local514 - local479 >> 7) && local526 >= local240 && local597.getSize() <= local421.type.anInt3713 - (local526 - local240 >> 7)) {
 								Static217.method3767(Static105.anIntArray256[local493], local147, local597, local47);
 							}
 						}
 					}
-					Static246.method4240(local421.aClass96_1, local47, local140, local147);
+					Static246.method4240(local421.type, local47, local140, local147);
 				}
 				if (local133 == 0) {
 					@Pc(688) Player local688 = Static159.players[local140];
-					if ((local688.anInt3412 & 0x7F) == 64 && (local688.anInt3421 & 0x7F) == 64) {
-						local479 = local688.anInt3412 - (local688.method2693() - 1) * 64;
-						local240 = local688.anInt3421 + 64 - local688.method2693() * 64;
+					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 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local493]];
-							local514 = local502.anInt3412 + 64 - local502.aClass96_1.anInt3713 * 64;
-							local526 = local502.anInt3421 + 64 - local502.aClass96_1.anInt3713 * 64;
-							if (local502 != null && local514 >= local479 && local502.aClass96_1.anInt3713 <= local688.method2693() - (local514 - local479 >> 7) && local526 >= local240 && local502.aClass96_1.anInt3713 <= local688.method2693() - (local526 - local240 >> 7)) {
-								Static246.method4240(local502.aClass96_1, local47, Static33.anIntArray79[local493], local147);
+							local502 = Static175.npcs[Static33.anIntArray79[local493]];
+							local514 = local502.xFine + 64 - local502.type.anInt3713 * 64;
+							local526 = local502.zFine + 64 - local502.type.anInt3713 * 64;
+							if (local502 != null && local514 >= local479 && local502.type.anInt3713 <= local688.getSize() - (local514 - local479 >> 7) && local526 >= local240 && local502.type.anInt3713 <= local688.getSize() - (local526 - local240 >> 7)) {
+								Static246.method4240(local502.type, local47, Static33.anIntArray79[local493], local147);
 							}
 						}
 						for (local493 = 0; local493 < Static267.anInt5774; local493++) {
 							local597 = Static159.players[Static105.anIntArray256[local493]];
-							local514 = local597.anInt3412 - (local597.method2693() - 1) * 64;
-							local526 = local597.anInt3421 + 64 - local597.method2693() * 64;
-							if (local597 != null && local597 != local688 && local479 <= local514 && local597.method2693() <= local688.method2693() - (local514 - local479 >> 7) && local526 >= local240 && local597.method2693() <= local688.method2693() - (local526 - local240 >> 7)) {
+							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(Static105.anIntArray256[local493], local147, local597, local47);
 							}
 						}
diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java
index 8ff152e..aba3c11 100644
--- a/client/src/main/java/Static178.java
+++ b/client/src/main/java/Static178.java
@@ -17,7 +17,7 @@ public final class Static178 {
 	public static int anInt4247 = 0;
 
 	@OriginalMember(owner = "client!od", name = "n", descriptor = "Z")
-	public static boolean aBoolean203 = false;
+	public static boolean haveIe6 = false;
 
 	@OriginalMember(owner = "client!od", name = "a", descriptor = "(ILclient!na;)V")
 	public static void method3318(@OriginalArg(1) JagString arg0) {
@@ -29,12 +29,12 @@ public final class Static178 {
 		if (local22 == 0L) {
 			return;
 		}
-		while (Static199.aClass3_Sub22Array1.length > local24 && Static199.aClass3_Sub22Array1[local24].uid != local22) {
+		while (Static199.aClass3_Sub22Array1.length > local24 && Static199.aClass3_Sub22Array1[local24].key != local22) {
 			local24++;
 		}
 		if (local24 < Static199.aClass3_Sub22Array1.length && Static199.aClass3_Sub22Array1[local24] != null) {
 			Static6.outboundBuffer.p1isaac(162);
-			Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].uid);
+			Static6.outboundBuffer.p8(Static199.aClass3_Sub22Array1[local24].key);
 		}
 	}
 
@@ -52,9 +52,9 @@ public final class Static178 {
 					@Pc(68) IntNode local68 = (IntNode) local56.aClass133_6.get((long) arg2);
 					if (local68 != null) {
 						if (arg0) {
-							local27 += local19.anIntArray422[local29] * local68.anInt3141;
+							local27 += local19.anIntArray422[local29] * local68.value;
 						} else {
-							local27 += local68.anInt3141;
+							local27 += local68.value;
 						}
 					}
 				}
diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java
index df9fd11..ab83a0b 100644
--- a/client/src/main/java/Static18.java
+++ b/client/src/main/java/Static18.java
@@ -28,13 +28,13 @@ public final class Static18 {
 	@OriginalMember(owner = "client!bh", name = "a", descriptor = "(Lclient!fe;Z)V")
 	public static void method553(@OriginalArg(0) PathingEntity arg0) {
 		@Pc(8) int local8 = arg0.anInt3395 - Static83.loop;
-		@Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.method2693() * 64;
-		@Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.method2693() * 64;
+		@Pc(20) int local20 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
+		@Pc(36) int local36 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
 		if (arg0.anInt3431 == 0) {
 			arg0.anInt3400 = 1024;
 		}
-		arg0.anInt3412 += (local20 - arg0.anInt3412) / local8;
-		arg0.anInt3421 += (local36 - arg0.anInt3421) / local8;
+		arg0.xFine += (local20 - arg0.xFine) / local8;
+		arg0.zFine += (local36 - arg0.zFine) / local8;
 		if (arg0.anInt3431 == 1) {
 			arg0.anInt3400 = 1536;
 		}
diff --git a/client/src/main/java/Static180.java b/client/src/main/java/Static180.java
index 5c63a4c..9e7040c 100644
--- a/client/src/main/java/Static180.java
+++ b/client/src/main/java/Static180.java
@@ -29,7 +29,7 @@ public final class Static180 {
 
 	@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.anInt3421, arg4, arg0, arg2.anInt3412, arg3);
+		Static198.method1026(arg5, arg1, arg2.zFine, arg4, arg0, arg2.xFine, arg3);
 	}
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(Lclient!ve;I)V")
@@ -40,7 +40,7 @@ public final class Static180 {
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(II)V")
 	public static void method3328(@OriginalArg(0) int arg0) {
 		@Pc(12) DelayedStateChange local12 = Static238.method4143(10, arg0);
-		local12.method1007();
+		local12.pushClient();
 	}
 
 	@OriginalMember(owner = "client!og", name = "a", descriptor = "(I)V")
diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java
index f6db4ab..9457398 100644
--- a/client/src/main/java/Static181.java
+++ b/client/src/main/java/Static181.java
@@ -59,7 +59,7 @@ public final class Static181 {
 	@OriginalMember(owner = "client!oi", name = "b", descriptor = "(II)V")
 	public static void method3345(@OriginalArg(0) int arg0) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(5, arg0);
-		local8.method1007();
+		local8.pushClient();
 	}
 
 	@OriginalMember(owner = "client!oi", name = "a", descriptor = "(I[I[Ljava/lang/Object;)V")
diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java
index c1be986..95cbe3d 100644
--- a/client/src/main/java/Static182.java
+++ b/client/src/main/java/Static182.java
@@ -26,7 +26,7 @@ public final class Static182 {
 	public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false };
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V")
-	public static void method3359(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) {
+	public static void render(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) {
 		@Pc(9) int local9;
 		if (GlRenderer.enabled || arg0) {
 			local9 = GameShell.canvasHeight;
@@ -34,7 +34,7 @@ public final class Static182 {
 			Static78.titleBg.renderResizedTransparent((GameShell.canvasWidth - local15) / 2, 0, local15, local9);
 			Static243.logo.renderTransparent(GameShell.canvasWidth / 2 - Static243.logo.width / 2, 18);
 		}
-		arg1.method2875(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1);
+		arg1.renderCenter(LocalizedText.GAME0_LOADING, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 - 26, 16777215, -1);
 		local9 = GameShell.canvasHeight / 2 - 18;
 		if (GlRenderer.enabled) {
 			Static46.method1179(GameShell.canvasWidth / 2 - 152, local9, 304, 34, 9179409);
@@ -47,7 +47,7 @@ public final class Static182 {
 			Static129.method2495(GameShell.canvasWidth / 2 - 150, local9 + 2, Static199.mainLoadPercentage * 3, 30, 9179409);
 			Static129.method2495(Static199.mainLoadPercentage * 3 + GameShell.canvasWidth / 2 - 150, local9 + 2, 300 - Static199.mainLoadPercentage * 3, 30, 0);
 		}
-		arg1.method2875(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
+		arg1.renderCenter(Static126.mainLoadSecondaryText, GameShell.canvasWidth / 2, GameShell.canvasHeight / 2 + 4, 16777215, -1);
 	}
 
 	@OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;")
diff --git a/client/src/main/java/Static183.java b/client/src/main/java/Static183.java
index fd31add..11d95e0 100644
--- a/client/src/main/java/Static183.java
+++ b/client/src/main/java/Static183.java
@@ -16,7 +16,7 @@ public final class Static183 {
 	@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.method4658();
+			arg0.unlink();
 		}
 		arg0.aClass3_222 = arg1;
 		arg0.aClass3_223 = arg1.aClass3_223;
@@ -29,7 +29,7 @@ public final class Static183 {
 		@Pc(9) SecondaryLinkedList local9 = new SecondaryLinkedList();
 		for (@Pc(14) Map local14 = (Map) Static228.aClass69_120.method2289(); local14 != null; local14 = (Map) Static228.aClass69_120.method2288()) {
 			if (local14.aBoolean50 && local14.method664(arg1, arg0)) {
-				local9.method798(local14);
+				local9.addTail(local14);
 			}
 		}
 		return local9;
diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java
index 75f1a0c..a532420 100644
--- a/client/src/main/java/Static185.java
+++ b/client/src/main/java/Static185.java
@@ -149,7 +149,7 @@ public final class Static185 {
 				}
 			}
 			if (local62.anInt4435 != 0 && arg4 != null) {
-				arg4.method3043(arg7, local62.aBoolean207, arg8, local84, local81);
+				arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 			}
 		} else if (arg6 >= 12) {
 			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
@@ -166,7 +166,7 @@ public final class Static185 {
 				Static60.anIntArrayArrayArray6[arg2][arg7][arg8] |= 0x4;
 			}
 			if (local62.anInt4435 != 0 && arg4 != null) {
-				arg4.method3043(arg7, local62.aBoolean207, arg8, local84, local81);
+				arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 			}
 		} else if (arg6 == 0) {
 			if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) {
@@ -325,7 +325,7 @@ public final class Static185 {
 				}
 				Static5.method35(arg2, arg7, arg8, local199, 1, 1, local387, local261);
 				if (local62.anInt4435 != 0 && arg4 != null) {
-					arg4.method3043(arg7, local62.aBoolean207, arg8, local84, local81);
+					arg4.flagScenery(arg7, local62.aBoolean207, arg8, local84, local81);
 				}
 				if (local62.anInt4428 != 16) {
 					Static18.method559(arg2, arg7, arg8, local62.anInt4428);
diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java
index 6a4683c..a0fdd57 100644
--- a/client/src/main/java/Static186.java
+++ b/client/src/main/java/Static186.java
@@ -14,16 +14,16 @@ public final class Static186 {
 	public static int antiAliasingMode = 0;
 
 	@OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
-	public static final JagString EMPTY_FILE = Static28.parse("");
+	public static final JagString EMPTY = Static28.parse("");
 
 	@OriginalMember(owner = "client!pa", name = "P", descriptor = "Lclient!na;")
-	public static JagString password = EMPTY_FILE;
+	public static JagString password = EMPTY;
 
 	@OriginalMember(owner = "client!pa", name = "R", descriptor = "[Z")
 	public static final boolean[] aBooleanArray100 = new boolean[100];
 
 	@OriginalMember(owner = "client!pa", name = "S", descriptor = "Lclient!na;")
-	public static JagString username = EMPTY_FILE;
+	public static JagString username = EMPTY;
 
 	@OriginalMember(owner = "client!pa", name = "d", descriptor = "(I)V")
 	public static void method3413() {
@@ -62,9 +62,9 @@ public final class Static186 {
 				Static83.aFloat3 = 8.0F;
 				Static138.aFloat14 = 8.0F;
 			}
-			@Pc(144) int local144 = (Static173.self.anInt3412 >> 7) + Static225.originX - Static158.anInt3846;
+			@Pc(144) int local144 = (Static173.self.xFine >> 7) + Static225.originX - Static158.anInt3846;
 			@Pc(153) int local153 = local144 + (int) (Math.random() * 10.0D) - 5;
-			@Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.originZ - (Static173.self.anInt3421 >> 7) - 1;
+			@Pc(168) int local168 = Static2.anInt13 + Static181.anInt4296 - Static142.originZ - (Static173.self.zFine >> 7) - 1;
 			@Pc(177) int local177 = local168 + (int) (Math.random() * 10.0D) - 5;
 			if (local153 >= 0 && Static48.anInt1449 > local153 && local177 >= 0 && local177 < Static181.anInt4296) {
 				Static13.anInt435 = local153;
@@ -93,20 +93,20 @@ public final class Static186 {
 			Static33.method868(new Buffer(Static119.aClass153_44.fetchFile(Static166.aClass100_779, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 30;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 30) {
 			Static47.method3998(new Buffer(Static119.aClass153_44.fetchFile(Static4.aClass100_7, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 40;
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 40) {
 			Static231.method3980(new Buffer(Static119.aClass153_44.fetchFile(Static73.aClass100_455, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 50;
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 50) {
 			Static166.method3166(new Buffer(Static119.aClass153_44.fetchFile(Static42.aClass100_331, Static269.aClass3_Sub2_Sub4_2.aClass100_138)));
 			Static41.anInt1309 = 60;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 60) {
 			if (Static119.aClass153_44.method4497(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
 				if (!Static119.aClass153_44.allFilesComplete(Static34.concatenate(new JagString[] { Static269.aClass3_Sub2_Sub4_2.aClass100_138, Static265.aClass100_1086 }))) {
@@ -117,47 +117,47 @@ public final class Static186 {
 				Static203.aClass134_1 = new MapFunctionGroup(0);
 			}
 			Static41.anInt1309 = 70;
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 70) {
 			Static273.aClass41_7 = new WorldMapFont(11, true, GameShell.canvas);
 			Static41.anInt1309 = 73;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 73) {
 			Static152.aClass41_3 = new WorldMapFont(12, true, GameShell.canvas);
 			Static41.anInt1309 = 76;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 76) {
 			Static169.aClass41_5 = new WorldMapFont(14, true, GameShell.canvas);
 			Static41.anInt1309 = 79;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 79) {
 			Static130.aClass41_1 = new WorldMapFont(17, true, GameShell.canvas);
 			Static41.anInt1309 = 82;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 82) {
 			Static203.aClass41_8 = new WorldMapFont(19, true, GameShell.canvas);
 			Static41.anInt1309 = 85;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 85) {
 			Static130.aClass41_2 = new WorldMapFont(22, true, GameShell.canvas);
 			Static41.anInt1309 = 88;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static41.anInt1309 == 88) {
 			Static270.aClass41_9 = new WorldMapFont(26, true, GameShell.canvas);
 			Static41.anInt1309 = 91;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 		} else {
 			Static160.aClass41_4 = new WorldMapFont(30, true, GameShell.canvas);
 			Static41.anInt1309 = 100;
 			Static7.ping(true);
-			Static234.method4020();
+			Static234.resetTimer();
 			System.gc();
 		}
 	}
@@ -173,7 +173,7 @@ public final class Static186 {
 				arg2.anInt3373 = 1;
 				arg2.anInt3425 = 0;
 				arg2.anInt3371 = 0;
-				Static152.method2836(arg2.anInt3421, local89, arg2.anInt3412, Static173.self == arg2, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, local89, arg2.xFine, Static173.self == arg2, arg2.anInt3425);
 			}
 			if (local92 == 2) {
 				arg2.anInt3371 = 0;
@@ -182,12 +182,12 @@ public final class Static186 {
 			arg2.anInt3373 = 1;
 			arg2.anInt3425 = 0;
 			arg2.anInt3420 = arg0;
-			arg2.anInt3405 = arg2.anInt3409;
+			arg2.anInt3405 = arg2.movementQueueSize;
 			arg2.anInt3371 = 0;
 			arg2.anInt3360 = 0;
 			arg2.anInt3369 = arg1;
 			if (arg2.anInt3369 != -1) {
-				Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, arg2 == Static173.self, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, Static36.method941(arg2.anInt3369), arg2.xFine, arg2 == Static173.self, arg2.anInt3425);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java
index ee0797d..917bd5d 100644
--- a/client/src/main/java/Static19.java
+++ b/client/src/main/java/Static19.java
@@ -62,7 +62,7 @@ public final class Static19 {
 		}
 		for (local11 = 0; local11 < Static272.anInt5214; local11++) {
 			@Pc(68) int local68 = Static33.anIntArray79[local11];
-			@Pc(72) Npc local72 = Static175.aClass8_Sub4_Sub2Array1[local68];
+			@Pc(72) Npc local72 = Static175.npcs[local68];
 			if (local72 != null && local72.anInt3408 > 0) {
 				local72.anInt3408--;
 				if (local72.anInt3408 == 0) {
diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java
index 4066d4c..5a86fda 100644
--- a/client/src/main/java/Static190.java
+++ b/client/src/main/java/Static190.java
@@ -35,14 +35,14 @@ public final class Static190 {
 	public static Sprite method3443(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		@Pc(27) int local27 = (arg2 ? 65536 : 0) + arg1 + (arg0 << 17) + (arg4 << 19);
 		@Pc(37) long local37 = (long) local27 * 3849834839L + (long) arg3 * 3147483667L;
-		@Pc(43) Sprite local43 = (Sprite) Static118.objectSpriteCache.method3106(local37);
+		@Pc(43) Sprite local43 = (Sprite) Static118.objectSpriteCache.get(local37);
 		if (local43 != null) {
 			return local43;
 		}
 		Rasteriser.textureHasTransparency = false;
 		local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false);
 		if (local43 != null && !Rasteriser.textureHasTransparency) {
-			Static118.objectSpriteCache.method3095(local43, local37);
+			Static118.objectSpriteCache.put(local43, local37);
 		}
 		return local43;
 	}
@@ -50,7 +50,7 @@ public final class Static190 {
 	@OriginalMember(owner = "client!pf", name = "a", descriptor = "(III)V")
 	public static void method3444(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(13, arg1);
-		local14.method1017();
+		local14.pushServer();
 		local14.intArg1 = arg0;
 	}
 
diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java
index c048ffb..8c3f852 100644
--- a/client/src/main/java/Static192.java
+++ b/client/src/main/java/Static192.java
@@ -24,7 +24,7 @@ public final class Static192 {
 				}
 			} else {
 				local29 = local17.anInt1192 - 1;
-				local40 = Static175.aClass8_Sub4_Sub2Array1[local29];
+				local40 = Static175.npcs[local29];
 			}
 			if (local40 != null) {
 				@Pc(63) LocType local63 = Static271.method4601(local17.anInt1189);
diff --git a/client/src/main/java/Static193.java b/client/src/main/java/Static193.java
index 65ab988..4bd75a2 100644
--- a/client/src/main/java/Static193.java
+++ b/client/src/main/java/Static193.java
@@ -19,7 +19,7 @@ public final class Static193 {
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "(Lclient!na;BI)V")
 	public static void method3498(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
 		@Pc(10) DelayedStateChange local10 = Static238.method4143(2, arg1);
-		local10.method1017();
+		local10.pushServer();
 		local10.stringArg = arg0;
 	}
 
@@ -101,7 +101,7 @@ public final class Static193 {
 					@Pc(233) GlTile local233 = (GlTile) local103.get(local227);
 					if (local233 == null) {
 						local233 = new GlTile((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155);
-						local103.method3862(local233, local227);
+						local103.put(local233, local227);
 					}
 					local233.anInt2484++;
 					local233.anInt2482 += local219;
@@ -109,7 +109,7 @@ public final class Static193 {
 						local233 = (GlTile) local103.get(local188);
 						if (local233 == null) {
 							local233 = new GlTile((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155);
-							local103.method3862(local233, local188);
+							local103.put(local233, local188);
 						}
 						local233.anInt2484++;
 						local233.anInt2482 += local219;
@@ -119,7 +119,7 @@ public final class Static193 {
 						local233 = (GlTile) local103.get(local340);
 						if (local233 == null) {
 							local233 = new GlTile((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155);
-							local103.method3862(local233, local340);
+							local103.put(local233, local340);
 						}
 						local233.anInt2482 += local219;
 						local233.anInt2484++;
@@ -128,7 +128,7 @@ public final class Static193 {
 						local233 = (GlTile) local103.get(local214);
 						if (local233 == null) {
 							local233 = new GlTile((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155);
-							local103.method3862(local233, local214);
+							local103.put(local233, local214);
 						}
 						local233.anInt2484++;
 						local233.anInt2482 += local219;
@@ -137,7 +137,7 @@ public final class Static193 {
 			}
 		}
 		@Pc(493) GlTile local493;
-		for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) {
+		for (local493 = (GlTile) local103.head(); local493 != null; local493 = (GlTile) local103.next()) {
 			local493.method1940();
 		}
 		for (local16 = 1; local16 <= 102; local16++) {
@@ -253,9 +253,9 @@ public final class Static193 {
 				}
 			}
 		}
-		for (local493 = (GlTile) local103.method3859(); local493 != null; local493 = (GlTile) local103.method3861()) {
+		for (local493 = (GlTile) local103.head(); local493 != null; local493 = (GlTile) local103.next()) {
 			if (local493.anInt2483 == 0) {
-				local493.method4658();
+				local493.unlink();
 			} else {
 				local493.method1943();
 			}
@@ -265,7 +265,7 @@ public final class Static193 {
 		local103.method3865(local1348);
 		@Pc(1358) long[] local1358 = new long[local16];
 		for (local155 = 0; local155 < local16; local155++) {
-			local1358[local155] = local1348[local155].uid;
+			local1358[local155] = local1348[local155].key;
 		}
 		Static4.method23(local1358, local1348);
 		return local1348;
diff --git a/client/src/main/java/Static195.java b/client/src/main/java/Static195.java
index d186a8c..621e03a 100644
--- a/client/src/main/java/Static195.java
+++ b/client/src/main/java/Static195.java
@@ -28,12 +28,12 @@ public final class Static195 {
 		for (@Pc(16) ProjAnimNode local16 = (ProjAnimNode) Static217.aClass69_116.method2289(); local16 != null; local16 = (ProjAnimNode) Static217.aClass69_116.method2288()) {
 			@Pc(21) ProjAnim local21 = local16.aClass8_Sub6_1;
 			if (Static55.level != local21.anInt4810 || local21.anInt4800 < Static83.loop) {
-				local16.method4658();
+				local16.unlink();
 			} else if (Static83.loop >= local21.anInt4822) {
 				if (local21.anInt4819 > 0) {
-					@Pc(54) Npc local54 = Static175.aClass8_Sub4_Sub2Array1[local21.anInt4819 - 1];
-					if (local54 != null && local54.anInt3412 >= 0 && local54.anInt3412 < 13312 && local54.anInt3421 >= 0 && local54.anInt3421 < 13312) {
-						local21.method3705(local54.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local54.anInt3412, local54.anInt3421) - local21.anInt4805, local54.anInt3412);
+					@Pc(54) Npc local54 = Static175.npcs[local21.anInt4819 - 1];
+					if (local54 != null && local54.xFine >= 0 && local54.xFine < 13312 && local54.zFine >= 0 && local54.zFine < 13312) {
+						local21.method3705(local54.zFine, Static83.loop, Static207.method3685(local21.anInt4810, local54.xFine, local54.zFine) - local21.anInt4805, local54.xFine);
 					}
 				}
 				if (local21.anInt4819 < 0) {
@@ -44,8 +44,8 @@ public final class Static195 {
 					} else {
 						local107 = Static159.players[local102];
 					}
-					if (local107 != null && local107.anInt3412 >= 0 && local107.anInt3412 < 13312 && local107.anInt3421 >= 0 && local107.anInt3421 < 13312) {
-						local21.method3705(local107.anInt3421, Static83.loop, Static207.method3685(local21.anInt4810, local107.anInt3412, local107.anInt3421) - local21.anInt4805, local107.anInt3412);
+					if (local107 != null && local107.xFine >= 0 && local107.xFine < 13312 && local107.zFine >= 0 && local107.zFine < 13312) {
+						local21.method3705(local107.zFine, Static83.loop, Static207.method3685(local21.anInt4810, local107.xFine, local107.zFine) - local21.anInt4805, local107.xFine);
 					}
 				}
 				local21.method3704(Static178.anInt4247);
diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java
index 4522aff..869af84 100644
--- a/client/src/main/java/Static197.java
+++ b/client/src/main/java/Static197.java
@@ -50,7 +50,7 @@ public final class Static197 {
 			GlRenderer.quit();
 		}
 		if (GameShell.fullScreenFrame != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) {
-			Static25.method714(GameShell.fullScreenFrame, GameShell.signLink);
+			Static25.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
 			GameShell.fullScreenFrame = null;
 		}
 		if (arg1 == 3 && GameShell.fullScreenFrame == null) {
@@ -94,11 +94,11 @@ public final class Static197 {
 		}
 		if (arg0) {
 			Keyboard.stop(GameShell.canvas);
-			Static223.method3866(GameShell.canvas);
+			Static223.stop(GameShell.canvas);
 			if (Static71.mouseWheel != null) {
-				Static71.mouseWheel.method3291(GameShell.canvas);
+				Static71.mouseWheel.stop(GameShell.canvas);
 			}
-			Static215.aClient1.addCanvas();
+			Static215.instance.addCanvas();
 			Keyboard.start(GameShell.canvas);
 			Static88.start(GameShell.canvas);
 			if (Static71.mouseWheel != null) {
@@ -127,7 +127,7 @@ public final class Static197 {
 				Static260.frameBuffer = Static131.create(GameShell.canvasHeight, GameShell.canvasWidth, GameShell.canvas);
 				Static129.clear();
 				if (Static244.gameState == 5) {
-					Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43);
+					Static182.render(true, Static280.aClass3_Sub2_Sub9_43);
 				} else {
 					Static114.drawTextOnScreen(false, LocalizedText.LOADING);
 				}
@@ -142,7 +142,7 @@ public final class Static197 {
 				} else {
 					Static260.frameBuffer = null;
 				}
-				@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(Static215.aClient1.getClass());
+				@Pc(300) PrivilegedRequest local300 = GameShell.signLink.loadGlNatives(Static215.instance.getClass());
 				while (local300.status == 0) {
 					Static231.sleep(100L);
 				}
diff --git a/client/src/main/java/Static199.java b/client/src/main/java/Static199.java
index 4db628b..38cf244 100644
--- a/client/src/main/java/Static199.java
+++ b/client/src/main/java/Static199.java
@@ -17,14 +17,14 @@ public final class Static199 {
 	public static int mainLoadPercentage = 10;
 
 	@OriginalMember(owner = "client!qc", name = "U", descriptor = "I")
-	public static int anInt4672 = 0;
+	public static int rectDebug = 0;
 
 	@OriginalMember(owner = "client!qc", name = "ab", descriptor = "[I")
 	public static final int[] anIntArray417 = new int[1000];
 
 	@OriginalMember(owner = "client!qc", name = "a", descriptor = "(ZI)Lclient!ni;")
 	public static FluType method3593(@OriginalArg(1) int arg0) {
-		@Pc(10) FluType local10 = (FluType) Static83.aClass99_3.method3106((long) arg0);
+		@Pc(10) FluType local10 = (FluType) Static83.aClass99_3.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -33,7 +33,7 @@ public final class Static199 {
 		if (local27 != null) {
 			local10.method3217(arg0, new Buffer(local27));
 		}
-		Static83.aClass99_3.method3095(local10, (long) arg0);
+		Static83.aClass99_3.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static20.java b/client/src/main/java/Static20.java
index c0f1b17..5329fc7 100644
--- a/client/src/main/java/Static20.java
+++ b/client/src/main/java/Static20.java
@@ -25,8 +25,8 @@ public final class Static20 {
 	@OriginalMember(owner = "client!bj", name = "d", descriptor = "(B)V")
 	public static void method601() {
 		Static36.aClass133_3.method3856();
-		Static140.aClass16_7.method802();
-		Static215.aClass16_9.method802();
+		Static140.clientQueue.method802();
+		Static215.serverQueue.method802();
 	}
 
 	@OriginalMember(owner = "client!bj", name = "a", descriptor = "(III)J")
diff --git a/client/src/main/java/Static202.java b/client/src/main/java/Static202.java
index f826f28..23513d5 100644
--- a/client/src/main/java/Static202.java
+++ b/client/src/main/java/Static202.java
@@ -130,16 +130,16 @@ public final class Static202 {
 
 	@OriginalMember(owner = "client!qg", name = "d", descriptor = "(II)Lclient!ia;")
 	public static CursorType method3660(@OriginalArg(0) int arg0) {
-		@Pc(10) CursorType local10 = (CursorType) Static79.aClass99_11.method3106((long) arg0);
+		@Pc(10) CursorType local10 = (CursorType) Static79.aClass99_11.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
 		@Pc(20) byte[] local20 = Static153.aClass153_57.getFile(33, arg0);
 		local10 = new CursorType();
 		if (local20 != null) {
-			local10.method2249(new Buffer(local20), arg0);
+			local10.decode(new Buffer(local20), arg0);
 		}
-		Static79.aClass99_11.method3095(local10, (long) arg0);
+		Static79.aClass99_11.put(local10, (long) arg0);
 		return local10;
 	}
 }
diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java
index 4a4193d..583b209 100644
--- a/client/src/main/java/Static203.java
+++ b/client/src/main/java/Static203.java
@@ -42,7 +42,7 @@ public final class Static203 {
 			GameShell.frameHeight -= local35.bottom + local35.top;
 			GameShell.frameWidth -= local35.right + local35.left;
 		}
-		if (Static144.method2736() >= 2) {
+		if (Static144.getWindowMode() >= 2) {
 			GameShell.canvasWidth = GameShell.frameWidth;
 			GameShell.leftMargin = 0;
 			GameShell.topMargin = 0;
diff --git a/client/src/main/java/Static204.java b/client/src/main/java/Static204.java
index 2dc25ba..c494529 100644
--- a/client/src/main/java/Static204.java
+++ b/client/src/main/java/Static204.java
@@ -11,7 +11,7 @@ public final class Static204 {
 	public static MixerPcmStream soundStream;
 
 	@OriginalMember(owner = "client!qi", name = "r", descriptor = "I")
-	public static int anInt4760 = 0;
+	public static int affiliate = 0;
 
 	@OriginalMember(owner = "client!qi", name = "t", descriptor = "I")
 	public static int anInt4762 = 0;
diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java
index 05d88b1..9a4d00b 100644
--- a/client/src/main/java/Static209.java
+++ b/client/src/main/java/Static209.java
@@ -22,16 +22,16 @@ public final class Static209 {
 	@OriginalMember(owner = "client!ra", name = "a", descriptor = "(ILclient!pb;BII)V")
 	public static void method3701(@OriginalArg(0) int arg0, @OriginalArg(1) LocType arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		for (@Pc(10) AreaSound local10 = (AreaSound) Static3.aClass69_135.method2289(); local10 != null; local10 = (AreaSound) Static3.aClass69_135.method2288()) {
-			if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.aClass118_1.anInt4426) {
-				if (local10.aClass3_Sub3_Sub1_1 != null) {
-					Static204.soundStream.method1347(local10.aClass3_Sub3_Sub1_1);
-					local10.aClass3_Sub3_Sub1_1 = null;
+			if (arg3 == local10.anInt2033 && local10.anInt2041 == arg0 * 128 && local10.anInt2029 == arg2 * 128 && arg1.anInt4426 == local10.locType.anInt4426) {
+				if (local10.primaryStream != null) {
+					Static204.soundStream.removeSubStream(local10.primaryStream);
+					local10.primaryStream = null;
 				}
-				if (local10.aClass3_Sub3_Sub1_2 != null) {
-					Static204.soundStream.method1347(local10.aClass3_Sub3_Sub1_2);
-					local10.aClass3_Sub3_Sub1_2 = null;
+				if (local10.secondaryStream != null) {
+					Static204.soundStream.removeSubStream(local10.secondaryStream);
+					local10.secondaryStream = null;
 				}
-				local10.method4658();
+				local10.unlink();
 				return;
 			}
 		}
@@ -52,7 +52,7 @@ public final class Static209 {
 	@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 = Static238.method4143(9, arg0);
-		local12.method1017();
+		local12.pushServer();
 		local12.intArg1 = arg2;
 		local12.intArg3 = arg1;
 	}
diff --git a/client/src/main/java/Static211.java b/client/src/main/java/Static211.java
index d5de22d..a5dab5d 100644
--- a/client/src/main/java/Static211.java
+++ b/client/src/main/java/Static211.java
@@ -39,10 +39,10 @@ public final class Static211 {
 	@OriginalMember(owner = "client!rc", name = "d", descriptor = "(I)V")
 	public static void method930() {
 		if (Static11.musicChannel != null) {
-			Static11.musicChannel.method3575();
+			Static11.musicChannel.quit();
 		}
 		if (Static147.soundChannel != null) {
-			Static147.soundChannel.method3575();
+			Static147.soundChannel.quit();
 		}
 		AudioChannel.init(Static99.stereo);
 		Static11.musicChannel = AudioChannel.create(22050, GameShell.signLink, GameShell.canvas, 0);
diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java
index 3043b4e..aad16fe 100644
--- a/client/src/main/java/Static213.java
+++ b/client/src/main/java/Static213.java
@@ -13,7 +13,7 @@ public final class Static213 {
 	public static Js5 js5Archive0;
 
 	@OriginalMember(owner = "client!re", name = "a", descriptor = "(I)V")
-	public static void method3729() {
+	public static void clean() {
 		Static8.method119();
 		Static71.method1443();
 		Static238.method4142();
diff --git a/client/src/main/java/Static214.java b/client/src/main/java/Static214.java
index 08ba416..62beb0e 100644
--- a/client/src/main/java/Static214.java
+++ b/client/src/main/java/Static214.java
@@ -31,7 +31,7 @@ public final class Static214 {
 		if (local12 == null) {
 			Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0);
 		} else {
-			local12.method1567();
+			local12.update();
 		}
 	}
 
@@ -56,7 +56,7 @@ public final class Static214 {
 
 	@OriginalMember(owner = "client!rg", name = "b", descriptor = "(II)Lclient!me;")
 	public static NpcType method4363(@OriginalArg(0) int arg0) {
-		@Pc(10) NpcType local10 = (NpcType) Static93.aClass99_13.method3106((long) arg0);
+		@Pc(10) NpcType local10 = (NpcType) Static93.aClass99_13.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -67,7 +67,7 @@ public final class Static214 {
 			local10.method2939(new Buffer(local26));
 		}
 		local10.method2942();
-		Static93.aClass99_13.method3095(local10, (long) arg0);
+		Static93.aClass99_13.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static215.java b/client/src/main/java/Static215.java
index 5bd159b..5f1dcb8 100644
--- a/client/src/main/java/Static215.java
+++ b/client/src/main/java/Static215.java
@@ -12,10 +12,10 @@ public final class Static215 {
 	public static Font aClass3_Sub2_Sub9_32;
 
 	@OriginalMember(owner = "client!rh", name = "j", descriptor = "Lclient!client;")
-	public static client aClient1;
+	public static client instance;
 
 	@OriginalMember(owner = "client!rh", name = "e", descriptor = "Lclient!ce;")
-	public static final SecondaryLinkedList aClass16_9 = new SecondaryLinkedList();
+	public static final SecondaryLinkedList serverQueue = new SecondaryLinkedList();
 
 	@OriginalMember(owner = "client!rh", name = "g", descriptor = "I")
 	public static final int anInt4868 = -1;
diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java
index a5e4f78..0af76e8 100644
--- a/client/src/main/java/Static216.java
+++ b/client/src/main/java/Static216.java
@@ -16,7 +16,7 @@ public final class Static216 {
 	public static final int[] anIntArray187 = new int[14];
 
 	@OriginalMember(owner = "client!ri", name = "a", descriptor = "(B)V")
-	public static void handleLogin() {
+	public static void loop() {
 		if (Static184.loginStep == 0 || Static184.loginStep == 5) {
 			return;
 		}
@@ -27,7 +27,7 @@ public final class Static216 {
 					Static124.socket = null;
 				}
 				if (Static276.anInt5816 >= 1) {
-					Static266.returnCode = -5;
+					Static266.reply = -5;
 					Static184.loginStep = 0;
 					return;
 				}
@@ -73,7 +73,7 @@ public final class Static216 {
 					Static147.soundChannel.method3571();
 				}
 				if (local150 != 0) {
-					Static266.returnCode = local150;
+					Static266.reply = local150;
 					Static184.loginStep = 0;
 					Static124.socket.close();
 					Static124.socket = null;
@@ -118,18 +118,18 @@ public final class Static216 {
 					// pretend that we're loading the archive so we don't throw the packet size off
 					offset = 4;
 				}
-				Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(Static47.aClass100_991) + (159 + offset));
+				Static17.aClass3_Sub15_Sub1_2.p2(Static6.outboundBuffer.offset + Static229.method3937(Static47.settings) + (159 + offset));
 				Static17.aClass3_Sub15_Sub1_2.p4(530);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static5.anInt39);
-				Static17.aClass3_Sub15_Sub1_2.p1(Static249.aBoolean282 ? 1 : 0);
+				Static17.aClass3_Sub15_Sub1_2.p1(Static249.advertSuppressed ? 1 : 0);
 				Static17.aClass3_Sub15_Sub1_2.p1(1);
-				Static17.aClass3_Sub15_Sub1_2.p1(Static144.method2736());
+				Static17.aClass3_Sub15_Sub1_2.p1(Static144.getWindowMode());
 				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasWidth);
 				Static17.aClass3_Sub15_Sub1_2.p2(GameShell.canvasHeight);
 				Static17.aClass3_Sub15_Sub1_2.p1(Static186.antiAliasingMode);
 				Static140.method2705(Static17.aClass3_Sub15_Sub1_2);
-				Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.aClass100_991);
-				Static17.aClass3_Sub15_Sub1_2.p4(Static204.anInt4760);
+				Static17.aClass3_Sub15_Sub1_2.pjstr(Static47.settings);
+				Static17.aClass3_Sub15_Sub1_2.p4(Static204.affiliate);
 				Static17.aClass3_Sub15_Sub1_2.p4(Static145.method2746());
 				Static18.serverUpdatedPreferences = true;
 				Static17.aClass3_Sub15_Sub1_2.p2(Static189.anInt4443);
@@ -184,13 +184,13 @@ public final class Static216 {
 					Static184.loginStep = 10;
 				} else if (local623 == 1) {
 					Static184.loginStep = 5;
-					Static266.returnCode = local623;
+					Static266.reply = local623;
 					return;
 				} else if (local623 == 2) {
 					Static184.loginStep = 8;
 				} else if (local623 == 15) {
 					Static184.loginStep = 0;
-					Static266.returnCode = local623;
+					Static266.reply = local623;
 					return;
 				} else if (local623 == 23 && Static276.anInt5816 < 1) {
 					Static184.loginStep = 1;
@@ -200,7 +200,7 @@ public final class Static216 {
 					Static124.socket = null;
 					return;
 				} else {
-					Static266.returnCode = local623;
+					Static266.reply = local623;
 					Static184.loginStep = 0;
 					Static124.socket.close();
 					Static124.socket = null;
@@ -218,7 +218,7 @@ public final class Static216 {
 				if (Static124.socket.available() >= 1) {
 					Static231.anInt5202 = (Static124.socket.read() + 3) * 60;
 					Static184.loginStep = 0;
-					Static266.returnCode = 21;
+					Static266.reply = 21;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
@@ -229,7 +229,7 @@ public final class Static216 {
 				if (Static124.socket.available() >= 1) {
 					Static204.anInt4765 = Static124.socket.read();
 					Static184.loginStep = 0;
-					Static266.returnCode = 29;
+					Static266.reply = 29;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
@@ -254,7 +254,7 @@ public final class Static216 {
 				Static2.aBoolean1 = Static57.aClass3_Sub15_Sub1_3.g1() == 1;
 				Static189.method3438(Static2.aBoolean1);
 				Static9.method186(Static2.aBoolean1);
-				if (!Static249.aBoolean282) {
+				if (!Static249.advertSuppressed) {
 					if (Static124.aBoolean157 && !Static25.aBoolean57 || Static202.aBoolean233) {
 						try {
 							Static167.aClass100_781.method3157(GameShell.signLink.applet);
@@ -277,7 +277,7 @@ public final class Static216 {
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
 				Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
-				Static266.returnCode = 2;
+				Static266.reply = 2;
 				Static184.loginStep = 0;
 				Static243.method4221();
 				Static80.anInt4701 = -1;
@@ -292,7 +292,7 @@ public final class Static216 {
 			}
 			if (Static276.anInt5816 >= 1) {
 				Static184.loginStep = 0;
-				Static266.returnCode = -4;
+				Static266.reply = -4;
 			} else {
 				Static184.loginStep = 1;
 				Static92.anInt2430 = 0;
diff --git a/client/src/main/java/Static218.java b/client/src/main/java/Static218.java
index 5451de5..988eb1e 100644
--- a/client/src/main/java/Static218.java
+++ b/client/src/main/java/Static218.java
@@ -5,115 +5,115 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static218 {
 
 	@OriginalMember(owner = "client!rk", name = "K", descriptor = "Lclient!na;")
-	public static final JagString aClass100_695 = Static28.parse("gt");
+	public static final JagString TAG_GT = Static28.parse("gt");
 
 	@OriginalMember(owner = "client!rk", name = "L", descriptor = "Lclient!na;")
-	public static final JagString aClass100_696 = Static28.parse("lt");
+	public static final JagString TAG_LT = Static28.parse("lt");
 
 	@OriginalMember(owner = "client!rk", name = "M", descriptor = "Lclient!na;")
-	public static final JagString aClass100_697 = Static28.parse("shad=");
+	public static final JagString TAG_SHAD1 = Static28.parse("shad=");
 
 	@OriginalMember(owner = "client!rk", name = "N", descriptor = "Lclient!na;")
-	public static final JagString aClass100_698 = Static28.parse("shy");
+	public static final JagString TAB_SHY = Static28.parse("shy");
 
 	@OriginalMember(owner = "client!rk", name = "O", descriptor = "Lclient!na;")
-	public static final JagString aClass100_699 = Static28.parse("trans=");
+	public static final JagString TAG_TRANS1 = Static28.parse("trans=");
 
 	@OriginalMember(owner = "client!rk", name = "P", descriptor = "Lclient!na;")
-	public static final JagString aClass100_700 = Static28.parse("u=");
+	public static final JagString TAG_U1 = Static28.parse("u=");
 
 	@OriginalMember(owner = "client!rk", name = "Q", descriptor = "Lclient!na;")
-	public static final JagString aClass100_701 = Static28.parse("str=");
+	public static final JagString TAG_STR1 = Static28.parse("str=");
 
 	@OriginalMember(owner = "client!rk", name = "R", descriptor = "Lclient!na;")
-	public static final JagString aClass100_702 = Static28.parse("euro");
+	public static final JagString TAB_EURO = Static28.parse("euro");
 
 	@OriginalMember(owner = "client!rk", name = "T", descriptor = "Lclient!na;")
-	public static final JagString aClass100_703 = Static28.parse(")4col");
+	public static final JagString TAG_COL2 = Static28.parse(")4col");
 
 	@OriginalMember(owner = "client!rk", name = "X", descriptor = "Lclient!na;")
-	public static final JagString aClass100_704 = Static28.parse(")4shad");
+	public static final JagString TAG_SHAD3 = Static28.parse(")4shad");
 
 	@OriginalMember(owner = "client!rk", name = "Y", descriptor = "Lclient!na;")
-	public static final JagString aClass100_705 = Static28.parse("col=");
+	public static final JagString TAG_COL1 = Static28.parse("col=");
 
 	@OriginalMember(owner = "client!rk", name = "Z", descriptor = "Lclient!na;")
 	private static final JagString aClass100_706 = Static28.parse("<gt>");
 
 	@OriginalMember(owner = "client!rk", name = "bb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_707 = Static28.parse("u");
+	public static final JagString TAG_U2 = Static28.parse("u");
 
 	@OriginalMember(owner = "client!rk", name = "cb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_708 = Static28.parse("times");
+	public static final JagString TAB_TIMES = Static28.parse("times");
 
 	@OriginalMember(owner = "client!rk", name = "eb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_709 = Static28.parse(")4trans");
+	public static final JagString TAG_TRANS2 = Static28.parse(")4trans");
 
 	@OriginalMember(owner = "client!rk", name = "fb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_710 = Static28.parse("nbsp");
+	public static final JagString TAG_NBSP = Static28.parse("nbsp");
 
 	@OriginalMember(owner = "client!rk", name = "hb", descriptor = "Lclient!na;")
 	private static final JagString aClass100_711 = Static28.parse("<lt>");
 
 	@OriginalMember(owner = "client!rk", name = "ib", descriptor = "Lclient!na;")
-	public static final JagString aClass100_712 = Static28.parse(")4u");
+	public static final JagString TAG_U3 = Static28.parse(")4u");
 
 	@OriginalMember(owner = "client!rk", name = "kb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_713 = Static28.parse("br");
+	public static final JagString TAG_BR = Static28.parse("br");
 
 	@OriginalMember(owner = "client!rk", name = "lb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_714 = Static28.parse("shad");
+	public static final JagString TAG_SHAD2 = Static28.parse("shad");
 
 	@OriginalMember(owner = "client!rk", name = "mb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_715 = Static28.parse("img=");
+	public static final JagString TAG_IMG = Static28.parse("img=");
 
 	@OriginalMember(owner = "client!rk", name = "ob", descriptor = "Lclient!na;")
-	public static final JagString aClass100_716 = Static28.parse("copy");
+	public static final JagString TAB_COPY = Static28.parse("copy");
 
 	@OriginalMember(owner = "client!rk", name = "pb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_717 = Static28.parse(")4str");
+	public static final JagString TAG_STR3 = Static28.parse(")4str");
 
 	@OriginalMember(owner = "client!rk", name = "qb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_718 = Static28.parse("reg");
+	public static final JagString TAG_REG = Static28.parse("reg");
 
 	@OriginalMember(owner = "client!rk", name = "rb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_719 = Static28.parse("str");
+	public static final JagString TAG_STR2 = Static28.parse("str");
 
 	@OriginalMember(owner = "client!rk", name = "sb", descriptor = "Lclient!na;")
-	public static final JagString aClass100_720 = Static87.allocate(100);
+	public static final JagString buffer = Static87.allocate(100);
 
 	@OriginalMember(owner = "client!rk", name = "tb", descriptor = "I")
-	public static int anInt3627 = -1;
+	public static int strikethroughColor = -1;
 
 	@OriginalMember(owner = "client!rk", name = "ub", descriptor = "I")
-	public static int anInt3628 = -1;
+	public static int underlineColor = -1;
 
 	@OriginalMember(owner = "client!rk", name = "vb", descriptor = "I")
 	public static int anInt3629 = 0;
 
 	@OriginalMember(owner = "client!rk", name = "wb", descriptor = "I")
-	public static int anInt3630 = 0;
+	public static int color = 0;
 
 	@OriginalMember(owner = "client!rk", name = "xb", descriptor = "I")
-	public static int anInt3631 = 256;
+	public static int alphaOverride = 256;
 
 	@OriginalMember(owner = "client!rk", name = "yb", descriptor = "I")
-	public static int anInt3632 = 256;
+	public static int alpha = 256;
 
 	@OriginalMember(owner = "client!rk", name = "zb", descriptor = "I")
-	public static int anInt3633 = -1;
+	public static int shadowColor = -1;
 
 	@OriginalMember(owner = "client!rk", name = "Ab", descriptor = "[Lclient!na;")
-	public static final JagString[] aClass100Array110 = new JagString[100];
+	public static final JagString[] lines = new JagString[100];
 
 	@OriginalMember(owner = "client!rk", name = "Bb", descriptor = "I")
-	public static int anInt3634 = -1;
+	public static int shadowColorOverride = -1;
 
 	@OriginalMember(owner = "client!rk", name = "Cb", descriptor = "I")
-	public static int anInt3635 = 0;
+	public static int colorOverride = 0;
 
 	@OriginalMember(owner = "client!rk", name = "Db", descriptor = "I")
-	public static int anInt3636 = 0;
+	public static int spaceWidth = 0;
 
 	@OriginalMember(owner = "client!rk", name = "c", descriptor = "(Lclient!na;)Lclient!na;")
 	public static JagString method2862(@OriginalArg(0) JagString arg0) {
diff --git a/client/src/main/java/Static219.java b/client/src/main/java/Static219.java
index 52f1dae..6256a23 100644
--- a/client/src/main/java/Static219.java
+++ b/client/src/main/java/Static219.java
@@ -52,7 +52,7 @@ public final class Static219 {
 				local10.anInt925 = 0;
 				Static226.method3898(local10);
 			} else {
-				local10.method4658();
+				local10.unlink();
 			}
 		}
 	}
diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java
index 938a1b4..df159de 100644
--- a/client/src/main/java/Static220.java
+++ b/client/src/main/java/Static220.java
@@ -41,7 +41,7 @@ public final class Static220 {
 			Static187.method3420(Static55.level, arg1, arg0);
 			return;
 		}
-		local9.method2283(local30);
+		local9.addHead(local30);
 		@Pc(89) ObjStack local89 = null;
 		@Pc(91) ObjStack local91 = null;
 		for (local35 = (ObjStackNode) local9.method2289(); local35 != null; local35 = (ObjStackNode) local9.method2288()) {
@@ -70,14 +70,14 @@ public final class Static220 {
 	@OriginalMember(owner = "client!rm", name = "a", descriptor = "(ZIIIILclient!ak;I)Lclient!ak;")
 	public static Model method3800(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) Model arg4, @OriginalArg(6) int arg5) {
 		@Pc(4) long local4 = (long) arg2;
-		@Pc(10) Model local10 = (Model) Static110.aClass99_15.method3106(local4);
+		@Pc(10) Model local10 = (Model) Static110.aClass99_15.get(local4);
 		if (local10 == null) {
 			@Pc(22) RawModel local22 = Static77.method1686(Static267.js5Archive7, arg2);
 			if (local22 == null) {
 				return null;
 			}
 			local10 = local22.method1679(64, 768, -50, -10, -50);
-			Static110.aClass99_15.method3095(local10, local4);
+			Static110.aClass99_15.put(local10, local4);
 		}
 		@Pc(42) int local42 = arg4.method4562();
 		@Pc(45) int local45 = arg4.method4561();
diff --git a/client/src/main/java/Static223.java b/client/src/main/java/Static223.java
index cc329b2..8793fea 100644
--- a/client/src/main/java/Static223.java
+++ b/client/src/main/java/Static223.java
@@ -43,7 +43,7 @@ public final class Static223 {
 				arg2.anInt3360 = 0;
 				arg2.anInt3371 = 0;
 				arg2.anInt3420 = arg0;
-				Static152.method2836(arg2.anInt3421, local10, arg2.anInt3412, false, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, local10, arg2.xFine, false, arg2.anInt3425);
 			}
 			if (local13 == 2) {
 				arg2.anInt3371 = 0;
@@ -54,10 +54,10 @@ public final class Static223 {
 			arg2.anInt3373 = 1;
 			arg2.anInt3371 = 0;
 			arg2.anInt3420 = arg0;
-			arg2.anInt3405 = arg2.anInt3409;
+			arg2.anInt3405 = arg2.movementQueueSize;
 			arg2.anInt3425 = 0;
 			if (arg2.anInt3369 != -1) {
-				Static152.method2836(arg2.anInt3421, Static36.method941(arg2.anInt3369), arg2.anInt3412, false, arg2.anInt3425);
+				Static152.method2836(arg2.zFine, Static36.method941(arg2.anInt3369), arg2.xFine, false, arg2.anInt3425);
 			}
 		}
 	}
@@ -160,7 +160,7 @@ public final class Static223 {
 	}
 
 	@OriginalMember(owner = "client!sc", name = "a", descriptor = "(ILjava/awt/Component;)V")
-	public static void method3866(@OriginalArg(1) Component arg0) {
+	public static void stop(@OriginalArg(1) Component arg0) {
 		arg0.removeMouseListener(Static93.instance);
 		arg0.removeMouseMotionListener(Static93.instance);
 		arg0.removeFocusListener(Static93.instance);
diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java
index d95195a..3e11afd 100644
--- a/client/src/main/java/Static225.java
+++ b/client/src/main/java/Static225.java
@@ -73,7 +73,7 @@ public final class Static225 {
 	@OriginalMember(owner = "client!se", name = "a", descriptor = "(III)V")
 	public static void method3893(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(5, arg0);
-		local14.method1017();
+		local14.pushServer();
 		local14.intArg1 = arg1;
 	}
 
@@ -82,12 +82,12 @@ public final class Static225 {
 		Static186.password = arg1;
 		Static5.anInt39 = arg2;
 		Static186.username = arg0;
-		if (Static186.username.strEquals(Static186.EMPTY_FILE) || Static186.password.strEquals(Static186.EMPTY_FILE)) {
-			Static266.returnCode = 3;
+		if (Static186.username.strEquals(Static186.EMPTY) || Static186.password.strEquals(Static186.EMPTY)) {
+			Static266.reply = 3;
 		} else if (Static125.worldId == -1) {
 			Static20.anInt673 = 0;
 			Static196.anInt4587 = 0;
-			Static266.returnCode = -3;
+			Static266.reply = -3;
 			Static219.anInt4937 = 1;
 			@Pc(43) Buffer local43 = new Buffer(128);
 			local43.p1(10);
diff --git a/client/src/main/java/Static226.java b/client/src/main/java/Static226.java
index 85f2015..040ee64 100644
--- a/client/src/main/java/Static226.java
+++ b/client/src/main/java/Static226.java
@@ -60,11 +60,11 @@ public final class Static226 {
 
 	@OriginalMember(owner = "client!sf", name = "b", descriptor = "(B)V")
 	public static void method3901() {
-		@Pc(16) int local16 = Static280.aClass3_Sub2_Sub9_43.method2858(LocalizedText.CHOOSE_OPTION);
+		@Pc(16) int local16 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION);
 		@Pc(18) int local18;
 		@Pc(27) int local27;
 		for (local18 = 0; local18 < Static231.anInt5204; local18++) {
-			local27 = Static280.aClass3_Sub2_Sub9_43.method2858(Static269.method2228(local18));
+			local27 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local18));
 			if (local27 > local16) {
 				local16 = local27;
 			}
diff --git a/client/src/main/java/Static227.java b/client/src/main/java/Static227.java
index d28f8ea..14b14b0 100644
--- a/client/src/main/java/Static227.java
+++ b/client/src/main/java/Static227.java
@@ -18,7 +18,7 @@ public final class Static227 {
 	public static final int[] anIntArray446 = new int[25];
 
 	@OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;")
-	public static final JagString aClass100_966 = Static28.parse("settings");
+	public static final JagString SETTINGS = Static28.parse("settings");
 
 	@OriginalMember(owner = "client!sg", name = "q", descriptor = "[I")
 	public static final int[] keyCodes = new int[128];
diff --git a/client/src/main/java/Static229.java b/client/src/main/java/Static229.java
index b5e46a4..86ce1a1 100644
--- a/client/src/main/java/Static229.java
+++ b/client/src/main/java/Static229.java
@@ -46,7 +46,7 @@ public final class Static229 {
 	@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 = Static238.method4143(12, arg1);
-		local16.method1017();
+		local16.pushServer();
 		local16.intArg1 = arg0;
 	}
 }
diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java
index 624c184..8a281cb 100644
--- a/client/src/main/java/Static230.java
+++ b/client/src/main/java/Static230.java
@@ -36,7 +36,7 @@ public final class Static230 {
 	}
 
 	@OriginalMember(owner = "client!sj", name = "a", descriptor = "(Z)V")
-	public static void method3948() {
+	public static void loop() {
 		try {
 			if (Static14.anInt441 == 1) {
 				@Pc(16) int local16 = Static172.aClass3_Sub3_Sub4_2.method4440();
@@ -149,13 +149,13 @@ public final class Static230 {
 
 	@OriginalMember(owner = "client!sj", name = "a", descriptor = "(ILclient!na;)V")
 	public static void method3954(@OriginalArg(1) JagString arg0) {
-		Static47.aClass100_991 = arg0;
+		Static47.settings = arg0;
 		if (GameShell.signLink.applet == null) {
 			return;
 		}
 		try {
-			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(GameShell.signLink.applet);
-			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(GameShell.signLink.applet);
+			@Pc(17) JagString local17 = Static272.aClass100_989.fromParameters(GameShell.signLink.applet);
+			@Pc(23) JagString local23 = Static246.aClass100_1029.fromParameters(GameShell.signLink.applet);
 			@Pc(48) JagString local48 = Static34.concatenate(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 });
 			if (arg0.length() == 0) {
 				local48 = Static34.concatenate(new JagString[] { local48, Static245.aClass100_1018 });
diff --git a/client/src/main/java/Static232.java b/client/src/main/java/Static232.java
index 709c202..a43130a 100644
--- a/client/src/main/java/Static232.java
+++ b/client/src/main/java/Static232.java
@@ -82,7 +82,7 @@ public final class Static232 {
 			Static129.method2502(local285.anInt4307, local285.anInt4314, 9, local11);
 			Static241.aClass3_Sub2_Sub1_Sub1Array13[local285.anInt4308].method1423(local285.anInt4307 - 7, local285.anInt4314 + -7);
 		}
-		Static172.aClass69_97.method2278();
+		Static172.aClass69_97.clear();
 	}
 
 	@OriginalMember(owner = "client!sm", name = "a", descriptor = "(II)V")
diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java
index 50fa6fa..ebc06b2 100644
--- a/client/src/main/java/Static233.java
+++ b/client/src/main/java/Static233.java
@@ -35,7 +35,7 @@ public final class Static233 {
 	public static final long[] aLongArray9 = new long[100];
 
 	@OriginalMember(owner = "client!t", name = "x", descriptor = "Z")
-	public static boolean aBoolean254 = false;
+	public static boolean javaScript = false;
 
 	@OriginalMember(owner = "client!t", name = "y", descriptor = "I")
 	public static int loadingScreenState = 0;
@@ -92,7 +92,7 @@ public final class Static233 {
 			local21 = Static156.locationMapFilesBuffer;
 		}
 		for (@Pc(29) int local29 = 0; local29 < local19; local29++) {
-			Static107.method2261();
+			Static107.loop();
 			for (@Pc(36) int local36 = 0; local36 < 13; local36++) {
 				for (@Pc(43) int local43 = 0; local43 < 13; local43++) {
 					@Pc(56) int local56 = Static187.anIntArrayArrayArray18[local29][local36][local43];
@@ -260,7 +260,7 @@ public final class Static233 {
 			}
 			arg0.pCrc32(local25);
 			arg0.p1len(arg0.offset - local25);
-			local18.method4658();
+			local18.unlink();
 		}
 	}
 }
diff --git a/client/src/main/java/Static234.java b/client/src/main/java/Static234.java
index 7106d5d..3933611 100644
--- a/client/src/main/java/Static234.java
+++ b/client/src/main/java/Static234.java
@@ -20,7 +20,7 @@ public final class Static234 {
 	public static void method4014() {
 		for (@Pc(3) int local3 = 0; local3 < Static116.anInt2951; local3++) {
 			@Pc(10) int local10 = Static44.anIntArray106[local3];
-			@Pc(14) Npc local14 = Static175.aClass8_Sub4_Sub2Array1[local10];
+			@Pc(14) Npc local14 = Static175.npcs[local10];
 			@Pc(18) int local18 = Static57.aClass3_Sub15_Sub1_3.g1();
 			if ((local18 & 0x8) != 0) {
 				local18 += Static57.aClass3_Sub15_Sub1_3.g1() << 8;
@@ -78,20 +78,20 @@ public final class Static234 {
 						if (local227 != -1) {
 							@Pc(236) SeqType local236 = Static36.method941(local227);
 							if (local236 != null && local236.anIntArray473 != null) {
-								Static152.method2836(local14.anInt3421, local236, local14.anInt3412, false, 0);
+								Static152.method2836(local14.zFine, local236, local14.xFine, false, 0);
 							}
 						}
 					}
 				}
 			}
 			if ((local18 & 0x1) != 0) {
-				if (local14.aClass96_1.method2935()) {
+				if (local14.type.method2935()) {
 					Static91.method1877(local14);
 				}
 				local14.method2698(Static214.method4363(Static57.aClass3_Sub15_Sub1_3.g2le()));
-				local14.method2692(local14.aClass96_1.anInt3713);
-				local14.anInt3365 = local14.aClass96_1.anInt3737;
-				if (local14.aClass96_1.method2935()) {
+				local14.method2692(local14.type.anInt3713);
+				local14.anInt3365 = local14.type.anInt3737;
+				if (local14.type.method2935()) {
 					Static122.method2411(local14.movementQueueZ[0], null, 0, local14, local14.movementQueueX[0], Static55.level, null);
 				}
 			}
@@ -145,7 +145,7 @@ public final class Static234 {
 		Static119.aClass153_44 = arg1;
 		Static241.aClass3_Sub2_Sub1_Sub1Array13 = arg0;
 		Static258.aBooleanArray130 = new boolean[Static241.aClass3_Sub2_Sub1_Sub1Array13.length];
-		Static228.aClass69_120.method2278();
+		Static228.aClass69_120.clear();
 		@Pc(25) int local25 = Static119.aClass153_44.getGroupId(Static54.aClass100_374);
 		@Pc(30) int[] local30 = Static119.aClass153_44.method4503(local25);
 		for (@Pc(32) int local32 = 0; local32 < local30.length; local32++) {
@@ -163,7 +163,7 @@ public final class Static234 {
 	}
 
 	@OriginalMember(owner = "client!ta", name = "a", descriptor = "(Z)V")
-	public static void method4020() {
+	public static void resetTimer() {
 		GameShell.timer.method3394();
 		@Pc(10) int local10;
 		for (local10 = 0; local10 < 32; local10++) {
diff --git a/client/src/main/java/Static238.java b/client/src/main/java/Static238.java
index 1582b30..6802172 100644
--- a/client/src/main/java/Static238.java
+++ b/client/src/main/java/Static238.java
@@ -23,7 +23,7 @@ public final class Static238 {
 		@Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.get((long) arg1 | (long) arg0 << 32);
 		if (local13 == null) {
 			local13 = new DelayedStateChange(arg0, arg1);
-			Static36.aClass133_3.method3862(local13, local13.uid);
+			Static36.aClass133_3.put(local13, local13.key);
 		}
 		return local13;
 	}
diff --git a/client/src/main/java/Static241.java b/client/src/main/java/Static241.java
index ea72113..349e103 100644
--- a/client/src/main/java/Static241.java
+++ b/client/src/main/java/Static241.java
@@ -46,7 +46,7 @@ public final class Static241 {
 	@OriginalMember(owner = "client!th", name = "a", descriptor = "(ZIIII)V")
 	public static void setWindowMode(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		Static97.aLong89 = 0L;
-		@Pc(4) int local4 = Static144.method2736();
+		@Pc(4) int local4 = Static144.getWindowMode();
 		if (arg1 == 3 || local4 == 3) {
 			arg0 = true;
 		}
diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java
index cd51ef1..10e0dd0 100644
--- a/client/src/main/java/Static243.java
+++ b/client/src/main/java/Static243.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static243 {
 
 	@OriginalMember(owner = "client!tk", name = "j", descriptor = "Lclient!ve;")
-	public static Js5 aClass153_97;
+	public static Js5 spritesArchive;
 
 	@OriginalMember(owner = "client!tk", name = "o", descriptor = "Lclient!ok;")
 	public static IndexedSprite logo;
@@ -21,11 +21,11 @@ public final class Static243 {
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
 	public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
-		@Pc(23) long local23 = (long) ((arg1.anInt5892 + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
+		@Pc(23) long local23 = (long) ((arg1.texture + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
 		@Pc(38) GlTile local38 = (GlTile) arg0.get(local23);
 		if (local38 == null) {
-			local38 = new GlTile(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889);
-			arg0.method3862(local38, local23);
+			local38 = new GlTile(arg1.texture, (float) arg1.anInt5885, true, false, arg1.anInt5889);
+			arg0.put(local38, local23);
 		}
 		return local38;
 	}
@@ -78,11 +78,11 @@ public final class Static243 {
 			Static115.aClass3_Sub15Array1[local3506] = null;
 		}
 		for (local3506 = 0; local3506 < 32768; local3506++) {
-			Static175.aClass8_Sub4_Sub2Array1[local3506] = null;
+			Static175.npcs[local3506] = null;
 		}
 		Static173.self = Static159.players[2047] = new Player();
-		Static217.aClass69_116.method2278();
-		Static99.aClass69_64.method2278();
+		Static217.aClass69_116.clear();
+		Static99.aClass69_64.clear();
 		if (Static159.aClass69ArrayArrayArray1 != null) {
 			for (local3506 = 0; local3506 < 4; local3506++) {
 				for (@Pc(3663) int local3663 = 0; local3663 < 104; local3663++) {
@@ -113,7 +113,7 @@ public final class Static243 {
 		if (Static154.topLevelInterface != -1) {
 			Static109.method2275(Static154.topLevelInterface);
 		}
-		for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.method3859(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
+		for (@Pc(3755) Class3_Sub31 local3755 = (Class3_Sub31) Static119.aClass133_9.head(); local3755 != null; local3755 = (Class3_Sub31) Static119.aClass133_9.next()) {
 			Static132.method2605(true, local3755);
 		}
 		Static154.topLevelInterface = -1;
diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java
index c371114..26a08d6 100644
--- a/client/src/main/java/Static245.java
+++ b/client/src/main/java/Static245.java
@@ -19,7 +19,7 @@ public final class Static245 {
 	@OriginalMember(owner = "client!tm", name = "a", descriptor = "(II)V")
 	public static void method4224(@OriginalArg(0) int arg0) {
 		@Pc(16) DelayedStateChange local16 = Static238.method4143(6, arg0);
-		local16.method1007();
+		local16.pushClient();
 	}
 
 	@OriginalMember(owner = "client!tm", name = "b", descriptor = "(II)Z")
diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java
index a014d14..ab0327f 100644
--- a/client/src/main/java/Static246.java
+++ b/client/src/main/java/Static246.java
@@ -16,7 +16,7 @@ public final class Static246 {
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(BLclient!ve;Lclient!ve;)V")
 	public static void init(@OriginalArg(1) Js5 arg0, @OriginalArg(2) Js5 arg1) {
 		Static153.aClass153_57 = arg0;
-		Static243.aClass153_97 = arg1;
+		Static243.spritesArchive = arg1;
 	}
 
 	@OriginalMember(owner = "client!u", name = "a", descriptor = "(Z)V")
@@ -24,11 +24,11 @@ public final class Static246 {
 		for (@Pc(9) SpotAnimNode local9 = (SpotAnimNode) Static99.aClass69_64.method2289(); local9 != null; local9 = (SpotAnimNode) Static99.aClass69_64.method2288()) {
 			@Pc(15) SpotAnim local15 = local9.aClass8_Sub2_1;
 			if (local15.anInt606 != Static55.level || local15.aBoolean41) {
-				local9.method4658();
+				local9.unlink();
 			} else if (local15.anInt590 <= Static83.loop) {
 				local15.method558(Static178.anInt4247);
 				if (local15.aBoolean41) {
-					local9.method4658();
+					local9.unlink();
 				} else {
 					Static43.method1141(local15.anInt606, local15.anInt604, local15.anInt598, local15.anInt599, 60, local15, 0, -1L, false);
 				}
@@ -42,7 +42,7 @@ public final class Static246 {
 			return;
 		}
 		if (arg0.anIntArray357 != null) {
-			arg0 = arg0.method2932();
+			arg0 = arg0.getMultiNpc();
 		}
 		if (arg0 == null || !arg0.aBoolean183) {
 			return;
diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java
index b1e9b38..dfb5ef2 100644
--- a/client/src/main/java/Static247.java
+++ b/client/src/main/java/Static247.java
@@ -158,7 +158,7 @@ public final class Static247 {
 															Static120.method2388(var22.anInt3049, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21);
 														}
 													}
-													var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.aLong107, local24, null);
+													var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
 												}
 												for (local65 = 0; local65 < local153.anInt662; local65++) {
 													var25 = local153.aClass31Array1[local65];
@@ -248,13 +248,13 @@ public final class Static247 {
 													if (GlRenderer.enabled) {
 														Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
-													local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.aLong107, local24, null);
+													local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.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, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
-													local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.aLong107, local24, null);
+													local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
 												}
 											}
 											if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.method4549())) {
@@ -265,7 +265,7 @@ public final class Static247 {
 													if (GlRenderer.enabled) {
 														Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 													}
-													local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static162.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.aLong52, local24, null);
+													local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static162.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.key, local24, null);
 												} else if (local619.anInt1395 == 256) {
 													local894 = local619.anInt1390 - Static149.anInt3555;
 													local899 = local619.anInt1391 - Static162.anInt3947;
@@ -286,12 +286,12 @@ public final class Static247 {
 														if (GlRenderer.enabled) {
 															Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
-														local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.aLong52, local24, null);
+														local619.aClass8_3.method4546(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, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
-														local619.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.aLong52, local24, null);
+														local619.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.key, local24, null);
 													}
 												}
 												if (GlRenderer.enabled) {
@@ -370,10 +370,10 @@ public final class Static247 {
 												if (!Static260.method3850(local27, local18, local21, var22.anInt3049)) {
 													if (GlRenderer.enabled) {
 														label882: {
-															if ((var22.aLong107 & 0xFC000L) == 16384L) {
+															if ((var22.key & 0xFC000L) == 16384L) {
 																local65 = var22.anInt3048 - Static149.anInt3555;
 																local115 = var22.anInt3044 - Static217.anInt4903;
-																local1332 = (int) (var22.aLong107 >> 20 & 0x3L);
+																local1332 = (int) (var22.key >> 20 & 0x3L);
 																if (local1332 == 0) {
 																	local65 -= 64;
 																	local115 += 64;
@@ -407,7 +407,7 @@ public final class Static247 {
 															Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 														}
 													}
-													var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.aLong107, local24, null);
+													var22.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var22.anInt3048 - Static149.anInt3555, var22.anInt3051 - Static162.anInt3947, var22.anInt3044 - Static217.anInt4903, var22.key, local24, null);
 												}
 												local8.anInt663 = 0;
 											}
@@ -579,7 +579,7 @@ public final class Static247 {
 						if (GlRenderer.enabled) {
 							Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 						}
-						local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static162.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.aLong52, local24, null);
+						local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static162.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.key, local24, null);
 					} else if (local2109.anInt1395 == 256) {
 						local65 = local2109.anInt1390 - Static149.anInt3555;
 						local115 = local2109.anInt1391 - Static162.anInt3947;
@@ -599,12 +599,12 @@ public final class Static247 {
 							if (GlRenderer.enabled) {
 								Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 							}
-							local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.aLong52, local24, null);
+							local2109.aClass8_3.method4546(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, Static162.anInt3947, Static217.anInt4903, local24, local18, local21);
 							}
-							local2109.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.aLong52, local24, null);
+							local2109.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.key, local24, null);
 						}
 					}
 				}
@@ -614,13 +614,13 @@ public final class Static247 {
 						if (GlRenderer.enabled) {
 							Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21);
 						}
-						local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.aLong107, local24, null);
+						local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.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, Static162.anInt3947, Static217.anInt4903, local27, local18, local21);
 						}
-						local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.aLong107, local24, null);
+						local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.key, local24, null);
 					}
 				}
 			}
@@ -684,7 +684,7 @@ public final class Static247 {
 
 	@OriginalMember(owner = "client!ub", name = "a", descriptor = "(II)Lclient!eh;")
 	public static VarpType method4248(@OriginalArg(1) int arg0) {
-		@Pc(10) VarpType local10 = (VarpType) Static232.aClass99_30.method3106((long) arg0);
+		@Pc(10) VarpType local10 = (VarpType) Static232.aClass99_30.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -693,7 +693,7 @@ public final class Static247 {
 		if (local20 != null) {
 			local10.method1323(new Buffer(local20));
 		}
-		Static232.aClass99_30.method3095(local10, (long) arg0);
+		Static232.aClass99_30.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java
index 3e4f816..fe3f711 100644
--- a/client/src/main/java/Static249.java
+++ b/client/src/main/java/Static249.java
@@ -19,7 +19,7 @@ public final class Static249 {
 	public static final JagString aClass100_1039 = Static28.parse(" x ");
 
 	@OriginalMember(owner = "client!ud", name = "S", descriptor = "Z")
-	public static boolean aBoolean282 = false;
+	public static boolean advertSuppressed = false;
 
 	@OriginalMember(owner = "client!ud", name = "T", descriptor = "[I")
 	public static final int[] anIntArray478 = new int[32];
diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java
index ce9a155..106c3ec 100644
--- a/client/src/main/java/Static25.java
+++ b/client/src/main/java/Static25.java
@@ -18,7 +18,7 @@ public final class Static25 {
 	public static boolean aBoolean57 = false;
 
 	@OriginalMember(owner = "client!c", name = "a", descriptor = "(Ljava/awt/Frame;ZLsignlink!ll;)V")
-	public static void method714(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
+	public static void exitFullScreen(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
 		while (true) {
 			@Pc(16) PrivilegedRequest local16 = arg1.exitFullScreen(arg0);
 			while (local16.status == 0) {
@@ -41,6 +41,6 @@ public final class Static25 {
 	@OriginalMember(owner = "client!c", name = "d", descriptor = "(II)V")
 	public static void method716() {
 		Static79.aClass99_11.method3102(5);
-		Static7.aClass99_5.method3102(5);
+		Static7.sprites.method3102(5);
 	}
 }
diff --git a/client/src/main/java/Static250.java b/client/src/main/java/Static250.java
index 7494833..4cbf393 100644
--- a/client/src/main/java/Static250.java
+++ b/client/src/main/java/Static250.java
@@ -35,8 +35,8 @@ public final class Static250 {
 
 	@OriginalMember(owner = "client!uf", name = "a", descriptor = "(B)V")
 	public static void method4273() {
-		@Pc(14) int playerX = Static173.self.anInt3412 + Static132.anInt3291;
-		@Pc(20) int playerZ = Static173.self.anInt3421 + Static206.anInt4774;
+		@Pc(14) int playerX = Static173.self.xFine + Static132.anInt3291;
+		@Pc(20) int playerZ = Static173.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;
diff --git a/client/src/main/java/Static251.java b/client/src/main/java/Static251.java
index a1ec8c3..9cbceb5 100644
--- a/client/src/main/java/Static251.java
+++ b/client/src/main/java/Static251.java
@@ -42,14 +42,14 @@ public final class Static251 {
 					Static79.method1698(local10.anInt929, local10.anInt928, local10.anInt918, local10.anInt922, local10.anInt916, local10.anInt926, local10.anInt927);
 					local10.anInt925 = -1;
 					if (local10.anInt921 == local10.anInt929 && local10.anInt921 == -1) {
-						local10.method4658();
+						local10.unlink();
 					} else if (local10.anInt929 == local10.anInt921 && local10.anInt922 == local10.anInt923 && local10.anInt920 == local10.anInt926) {
-						local10.method4658();
+						local10.unlink();
 					}
 				}
 			} else if (local10.anInt921 < 0 || Static113.method3557(local10.anInt921, local10.anInt920)) {
 				Static79.method1698(local10.anInt921, local10.anInt928, local10.anInt918, local10.anInt923, local10.anInt916, local10.anInt920, local10.anInt927);
-				local10.method4658();
+				local10.unlink();
 			}
 		}
 	}
@@ -60,7 +60,7 @@ public final class Static251 {
 	}
 
 	@OriginalMember(owner = "client!ug", name = "a", descriptor = "(I)V")
-	public static void method4277() {
+	public static void quit() {
 		if (Static93.instance != null) {
 			@Pc(5) Mouse local5 = Static93.instance;
 			synchronized (Static93.instance) {
@@ -79,6 +79,6 @@ public final class Static251 {
 	@OriginalMember(owner = "client!ug", name = "a", descriptor = "(IB)V")
 	public static void method4279(@OriginalArg(0) int arg0) {
 		@Pc(14) DelayedStateChange local14 = Static238.method4143(9, arg0);
-		local14.method1007();
+		local14.pushClient();
 	}
 }
diff --git a/client/src/main/java/Static252.java b/client/src/main/java/Static252.java
index 9f77ae8..5fe038c 100644
--- a/client/src/main/java/Static252.java
+++ b/client/src/main/java/Static252.java
@@ -48,13 +48,13 @@ public final class Static252 {
 			}
 			return;
 		}
-		if ((Static12.tileSettings[Static55.level][Static173.self.anInt3412 >> 7][Static173.self.anInt3421 >> 7] & 0x4) != 0) {
-			Static254.method4348(false, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
+		if ((Static12.tileSettings[Static55.level][Static173.self.xFine >> 7][Static173.self.zFine >> 7] & 0x4) != 0) {
+			Static254.method4348(false, Static173.self.xFine >> 7, Static173.self.zFine >> 7, Static130.aClass3_Sub5ArrayArrayArray1, 0);
 		}
 		if (Static240.cameraPitch >= 310) {
 			return;
 		}
-		@Pc(135) int local135 = Static173.self.anInt3421 >> 7;
+		@Pc(135) int local135 = Static173.self.zFine >> 7;
 		local40 = Static134.renderZ >> 7;
 		@Pc(146) int local146;
 		if (local40 < local135) {
@@ -63,7 +63,7 @@ public final class Static252 {
 			local146 = local40 - local135;
 		}
 		local33 = Static138.renderX >> 7;
-		@Pc(162) int local162 = Static173.self.anInt3412 >> 7;
+		@Pc(162) int local162 = Static173.self.xFine >> 7;
 		@Pc(174) int local174;
 		if (local162 > local33) {
 			local174 = local162 - local33;
diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java
index 52c9c52..1b1a7ad 100644
--- a/client/src/main/java/Static253.java
+++ b/client/src/main/java/Static253.java
@@ -54,7 +54,7 @@ public final class Static253 {
 			if (Static176.aBooleanArray95[4] && Static276.anIntArray564[4] + 128 > local59) {
 				local59 = Static276.anIntArray564[4] + 128;
 			}
-			Static18.method555(Static81.cameraX, arg0, Static207.method3685(Static55.level, Static173.self.anInt3412, Static173.self.anInt3421) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
+			Static18.method555(Static81.cameraX, arg0, Static207.method3685(Static55.level, Static173.self.xFine, Static173.self.zFine) - 50, 600 - -(local59 * 3), local57, Static111.cameraZ, local59);
 		}
 		local57 = Static5.anInt40;
 		local59 = Static138.renderX;
@@ -116,7 +116,7 @@ public final class Static253 {
 			@Pc(361) int local361 = Static148.screenUpperY;
 			Static34.anInt1053 = (local361 - local344) * (Static60.anInt1892 - arg4) / arg0 + local344;
 		}
-		Static107.method2261();
+		Static107.loop();
 		@Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1;
 		if (GlRenderer.enabled) {
 			GlRenderer.method4173();
@@ -131,18 +131,18 @@ public final class Static253 {
 			GlRenderer.clearColorAndDepthBuffers(local171);
 			Static143.method2731(Static240.cameraPitch, Static134.renderZ, Static5.anInt40, Static138.renderX, Static184.cameraYaw);
 			GlRenderer.anInt5323 = Static83.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, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7);
+			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.xFine >> 7, Static173.self.zFine >> 7);
 			Static263.aBoolean299 = true;
 			Static120.method2390();
 			Static143.method2731(0, 0, 0, 0, 0);
-			Static107.method2261();
+			Static107.loop();
 			Static223.method3858();
 			Static142.method2726(arg4, arg3, arg2, Static223.anInt5029, arg0, Static223.anInt5029);
 			Static233.method4000(arg3, arg2, arg0, Static223.anInt5029, Static223.anInt5029, arg4);
 		} else {
 			Static129.method2495(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, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7);
-			Static107.method2261();
+			Static156.method2954(Static138.renderX, Static5.anInt40, Static134.renderZ, Static240.cameraPitch, Static184.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.xFine >> 7, Static173.self.zFine >> 7);
+			Static107.loop();
 			Static223.method3858();
 			Static142.method2726(arg4, arg3, arg2, 256, arg0, 256);
 			Static233.method4000(arg3, arg2, arg0, 256, 256, arg4);
@@ -184,7 +184,7 @@ public final class Static253 {
 		@Pc(24) byte[] local24 = Static84.aClass153_35.getFile(Static97.method1959(arg0), Static103.method2236(arg0));
 		local10 = new EnumType();
 		if (local24 != null) {
-			local10.method3094(new Buffer(local24));
+			local10.decode(new Buffer(local24));
 		}
 		Static149.aClass54_10.put(local10, (long) arg0);
 		return local10;
diff --git a/client/src/main/java/Static256.java b/client/src/main/java/Static256.java
index cf5dd08..73de23b 100644
--- a/client/src/main/java/Static256.java
+++ b/client/src/main/java/Static256.java
@@ -10,8 +10,8 @@ public final class Static256 {
 	@OriginalMember(owner = "client!um", name = "a", descriptor = "(Z)V")
 	public static void method4392() {
 		Static11.anInt384 = 0;
-		@Pc(17) int local17 = Static225.originX + (Static173.self.anInt3412 >> 7);
-		@Pc(25) int local25 = (Static173.self.anInt3421 >> 7) + Static142.originZ;
+		@Pc(17) int local17 = Static225.originX + (Static173.self.xFine >> 7);
+		@Pc(25) int local25 = (Static173.self.zFine >> 7) + Static142.originZ;
 		if (local17 >= 3053 && local17 <= 3156 && local25 >= 3056 && local25 <= 3136) {
 			Static11.anInt384 = 1;
 		}
@@ -94,7 +94,7 @@ public final class Static256 {
 
 	@OriginalMember(owner = "client!um", name = "a", descriptor = "(BI)Lclient!wl;")
 	public static FloType method4395(@OriginalArg(1) int arg0) {
-		@Pc(6) FloType local6 = (FloType) Static233.aClass99_31.method3106((long) arg0);
+		@Pc(6) FloType local6 = (FloType) Static233.aClass99_31.get((long) arg0);
 		if (local6 != null) {
 			return local6;
 		}
@@ -103,7 +103,7 @@ public final class Static256 {
 		if (local30 != null) {
 			local6.method4669(new Buffer(local30), arg0);
 		}
-		Static233.aClass99_31.method3095(local6, (long) arg0);
+		Static233.aClass99_31.put(local6, (long) arg0);
 		return local6;
 	}
 }
diff --git a/client/src/main/java/Static257.java b/client/src/main/java/Static257.java
index d767550..da47b6e 100644
--- a/client/src/main/java/Static257.java
+++ b/client/src/main/java/Static257.java
@@ -24,9 +24,9 @@ public final class Static257 {
 		@Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
 		if (local7 == null) {
 			return false;
-		} else if (local7.aClass77_1 != null && local7.aClass77_1.aLong107 == arg3) {
+		} else if (local7.aClass77_1 != null && local7.aClass77_1.key == arg3) {
 			return true;
-		} else if (local7.aClass24_1 != null && local7.aClass24_1.aLong52 == arg3) {
+		} 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;
diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java
index 4b91a14..edbcbf6 100644
--- a/client/src/main/java/Static258.java
+++ b/client/src/main/java/Static258.java
@@ -8,7 +8,7 @@ public final class Static258 {
 	public static boolean[] aBooleanArray130;
 
 	@OriginalMember(owner = "client!va", name = "O", descriptor = "I")
-	public static int anInt5637;
+	public static int threadPriority;
 
 	@OriginalMember(owner = "client!va", name = "b", descriptor = "(II)V")
 	public static void method4415() {
@@ -21,7 +21,7 @@ public final class Static258 {
 	@OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V")
 	public static void method4418(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
 		if (arg2.anInt530 == 1) {
-			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 8, arg2.aClass100_89, arg2.id);
+			Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 8, arg2.aClass100_89, arg2.id);
 		}
 		@Pc(47) JagString local47;
 		if (arg2.anInt530 == 2 && !Static241.aBoolean302) {
@@ -31,16 +31,16 @@ public final class Static258 {
 			}
 		}
 		if (arg2.anInt530 == 3) {
-			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 28, LocalizedText.CLOSE, arg2.id);
+			Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 28, LocalizedText.CLOSE, arg2.id);
 		}
 		if (arg2.anInt530 == 4) {
-			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 59, arg2.aClass100_89, arg2.id);
+			Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 59, arg2.aClass100_89, arg2.id);
 		}
 		if (arg2.anInt530 == 5) {
-			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, 0, (short) 51, arg2.aClass100_89, arg2.id);
+			Static98.method1966(-1, 0L, Static186.EMPTY, 0, (short) 51, arg2.aClass100_89, arg2.id);
 		}
 		if (arg2.anInt530 == 6 && Static39.aClass13_10 == null) {
-			Static98.method1966(-1, 0L, Static186.EMPTY_FILE, -1, (short) 41, arg2.aClass100_89, arg2.id);
+			Static98.method1966(-1, 0L, Static186.EMPTY, -1, (short) 41, arg2.aClass100_89, arg2.id);
 		}
 		@Pc(173) int local173;
 		@Pc(171) int local171;
@@ -164,7 +164,7 @@ public final class Static258 {
 				}
 			}
 			if (Static36.method940(arg2).method506()) {
-				Static98.method1966(-1, 0L, Static186.EMPTY_FILE, arg2.createdComponentId, (short) 41, LocalizedText.CONTINUE, arg2.id);
+				Static98.method1966(-1, 0L, Static186.EMPTY, arg2.createdComponentId, (short) 41, LocalizedText.CONTINUE, arg2.id);
 			}
 		} else if (Static36.method940(arg2).method508() && (Static274.anInt4999 & 0x20) != 0) {
 			Static98.method1966(Static246.anInt5393, 0L, Static34.concatenate(new JagString[] { Static78.aClass100_466, Static201.aClass100_408, arg2.aClass100_88 }), arg2.createdComponentId, (short) 12, Static102.aClass100_545, arg2.id);
diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java
index 172e8d3..3c4726f 100644
--- a/client/src/main/java/Static26.java
+++ b/client/src/main/java/Static26.java
@@ -74,7 +74,7 @@ public final class Static26 {
 	@OriginalMember(owner = "client!ca", name = "a", descriptor = "(Z)V")
 	public static void method741() {
 		Static79.aClass99_11.method3103();
-		Static7.aClass99_5.method3103();
+		Static7.sprites.method3103();
 	}
 
 	@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)V")
@@ -91,7 +91,7 @@ public final class Static26 {
 			if (local32 != null) {
 				@Pc(45) int local45 = (Static238.regionBitPacked[local25] >> 8) * 64 - Static225.originX;
 				@Pc(56) int local56 = (Static238.regionBitPacked[local25] & 0xFF) * 64 - Static142.originZ;
-				Static107.method2261();
+				Static107.loop();
 				Static124.method2437(local45, arg0, local32, local56, Static148.collisionMaps);
 			}
 		}
diff --git a/client/src/main/java/Static260.java b/client/src/main/java/Static260.java
index bed4c33..a185f6c 100644
--- a/client/src/main/java/Static260.java
+++ b/client/src/main/java/Static260.java
@@ -178,32 +178,32 @@ public final class Static260 {
 	public static void clearAmbientSounds(@OriginalArg(1) boolean arg0) {
 		@Pc(14) AreaSound local14;
 		for (local14 = (AreaSound) Static3.aClass69_135.method2289(); local14 != null; local14 = (AreaSound) Static3.aClass69_135.method2288()) {
-			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
-				local14.aClass3_Sub3_Sub1_1 = null;
+			if (local14.primaryStream != null) {
+				Static204.soundStream.removeSubStream(local14.primaryStream);
+				local14.primaryStream = null;
 			}
-			if (local14.aClass3_Sub3_Sub1_2 != null) {
-				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_2);
-				local14.aClass3_Sub3_Sub1_2 = null;
+			if (local14.secondaryStream != null) {
+				Static204.soundStream.removeSubStream(local14.secondaryStream);
+				local14.secondaryStream = null;
 			}
-			local14.method4658();
+			local14.unlink();
 		}
 		if (!arg0) {
 			return;
 		}
 		for (local14 = (AreaSound) Static152.aClass69_87.method2289(); local14 != null; local14 = (AreaSound) Static152.aClass69_87.method2288()) {
-			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
-				local14.aClass3_Sub3_Sub1_1 = null;
+			if (local14.primaryStream != null) {
+				Static204.soundStream.removeSubStream(local14.primaryStream);
+				local14.primaryStream = null;
 			}
-			local14.method4658();
+			local14.unlink();
 		}
-		for (local14 = (AreaSound) Static93.aClass133_7.method3859(); local14 != null; local14 = (AreaSound) Static93.aClass133_7.method3861()) {
-			if (local14.aClass3_Sub3_Sub1_1 != null) {
-				Static204.soundStream.method1347(local14.aClass3_Sub3_Sub1_1);
-				local14.aClass3_Sub3_Sub1_1 = null;
+		for (local14 = (AreaSound) Static93.aClass133_7.head(); local14 != null; local14 = (AreaSound) Static93.aClass133_7.next()) {
+			if (local14.primaryStream != null) {
+				Static204.soundStream.removeSubStream(local14.primaryStream);
+				local14.primaryStream = null;
 			}
-			local14.method4658();
+			local14.unlink();
 		}
 	}
 }
diff --git a/client/src/main/java/Static261.java b/client/src/main/java/Static261.java
index 8da856d..d14c080 100644
--- a/client/src/main/java/Static261.java
+++ b/client/src/main/java/Static261.java
@@ -16,7 +16,7 @@ public final class Static261 {
 	@OriginalMember(owner = "client!ve", name = "a", descriptor = "(BIIII)V")
 	public static void method4505(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(8, arg1);
-		local8.method1017();
+		local8.pushServer();
 		local8.intArg2 = arg0;
 		local8.intArg1 = arg3;
 		local8.intArg3 = arg2;
diff --git a/client/src/main/java/Static262.java b/client/src/main/java/Static262.java
index 7d71fd0..9650c8b 100644
--- a/client/src/main/java/Static262.java
+++ b/client/src/main/java/Static262.java
@@ -31,7 +31,7 @@ public final class Static262 {
 			return;
 		}
 		@Pc(8) Wall local8 = new Wall();
-		local8.aLong107 = arg8;
+		local8.key = arg8;
 		local8.anInt3048 = arg1 * 128 + 64;
 		local8.anInt3044 = arg2 * 128 + 64;
 		local8.anInt3051 = arg3;
diff --git a/client/src/main/java/Static263.java b/client/src/main/java/Static263.java
index 7a77b5d..7e13a41 100644
--- a/client/src/main/java/Static263.java
+++ b/client/src/main/java/Static263.java
@@ -118,22 +118,22 @@ public final class Static263 {
 		} else {
 			Static104.method2247(arg1);
 		}
-		if (arg1.anInt3412 < 128 || arg1.anInt3421 < 128 || arg1.anInt3412 >= 13184 || arg1.anInt3421 >= 13184) {
+		if (arg1.xFine < 128 || arg1.zFine < 128 || arg1.xFine >= 13184 || arg1.zFine >= 13184) {
 			arg1.anInt3369 = -1;
 			arg1.anInt3432 = -1;
 			arg1.anInt3395 = 0;
 			arg1.anInt3386 = 0;
-			arg1.anInt3412 = arg1.movementQueueX[0] * 128 + arg1.method2693() * 64;
-			arg1.anInt3421 = arg1.movementQueueZ[0] * 128 + arg1.method2693() * 64;
+			arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
+			arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
 			arg1.method2689();
 		}
-		if (arg1 == Static173.self && (arg1.anInt3412 < 1536 || arg1.anInt3421 < 1536 || arg1.anInt3412 >= 11776 || arg1.anInt3421 >= 11776)) {
+		if (arg1 == Static173.self && (arg1.xFine < 1536 || arg1.zFine < 1536 || arg1.xFine >= 11776 || arg1.zFine >= 11776)) {
 			arg1.anInt3432 = -1;
 			arg1.anInt3395 = 0;
 			arg1.anInt3386 = 0;
 			arg1.anInt3369 = -1;
-			arg1.anInt3412 = arg1.movementQueueX[0] * 128 + arg1.method2693() * 64;
-			arg1.anInt3421 = arg1.movementQueueZ[0] * 128 + arg1.method2693() * 64;
+			arg1.xFine = arg1.movementQueueX[0] * 128 + arg1.getSize() * 64;
+			arg1.zFine = arg1.movementQueueZ[0] * 128 + arg1.getSize() * 64;
 			arg1.method2689();
 		}
 		Static37.method949(arg1);
diff --git a/client/src/main/java/Static265.java b/client/src/main/java/Static265.java
index 8bc8660..240f0c3 100644
--- a/client/src/main/java/Static265.java
+++ b/client/src/main/java/Static265.java
@@ -16,7 +16,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 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2];
-		return local7 == null || local7.aClass77_1 == null ? 0L : local7.aClass77_1.aLong107;
+		return local7 == null || local7.aClass77_1 == null ? 0L : local7.aClass77_1.key;
 	}
 
 	@OriginalMember(owner = "client!vj", name = "a", descriptor = "(IIILclient!ve;)[Lclient!mm;")
diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java
index f6ade92..b1f07e8 100644
--- a/client/src/main/java/Static266.java
+++ b/client/src/main/java/Static266.java
@@ -14,7 +14,7 @@ public final class Static266 {
 	public static final int[] anIntArray471 = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178 };
 
 	@OriginalMember(owner = "client!vk", name = "b", descriptor = "I")
-	public static int returnCode = -2;
+	public static int reply = -2;
 
 	@OriginalMember(owner = "client!vk", name = "d", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1010 = Static28.parse("null");
diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java
index a4f9589..c9906ab 100644
--- a/client/src/main/java/Static267.java
+++ b/client/src/main/java/Static267.java
@@ -45,7 +45,7 @@ public final class Static267 {
 
 	@OriginalMember(owner = "client!vl", name = "a", descriptor = "(I)Z")
 	public static boolean isShowingVideoAd() {
-		if (Static150.aBoolean175) {
+		if (Static150.objectTag) {
 			try {
 				return !((Boolean) Static119.aClass100_588.method3157(GameShell.signLink.applet));
 			} catch (@Pc(21) Throwable local21) {
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index f1430c2..ba815e9 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -272,7 +272,7 @@ public final class Static269 {
 				Static129.method2495(local50 - 150, local61 + 2, Static41.anInt1309 * 3, 30, 9179409);
 				Static129.method2495(Static41.anInt1309 * 3 + local50 - 150, local61 - -2, 300 - Static41.anInt1309 * 3, 30, 0);
 			}
-			Static280.aClass3_Sub2_Sub9_43.method2875(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1);
+			Static280.aClass3_Sub2_Sub9_43.renderCenter(LocalizedText.LOADINGDOTDOTDOT, local50, local61 + 20, 16777215, -1);
 			return;
 		}
 		Static37.anInt1176 = (int) ((float) (arg2 * 2) / Static83.aFloat3);
@@ -311,7 +311,7 @@ public final class Static269 {
 		}
 		@Pc(405) int local405 = arg1 + arg2 - 8;
 		@Pc(412) int local412 = arg0 + arg3 - 5;
-		Static215.aClass3_Sub2_Sub9_32.method2864(Static34.concatenate(new JagString[] { Static115.aClass100_579, Static123.parseInt(GameShell.framesPerSecond) }), local412, local405, 16776960, -1);
+		Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static115.aClass100_579, Static123.parseInt(GameShell.framesPerSecond) }), local412, local405, 16776960, -1);
 		@Pc(434) Runtime local434 = Runtime.getRuntime();
 		@Pc(443) int local443 = (int) ((local434.totalMemory() - local434.freeMemory()) / 1024L);
 		@Pc(445) int local445 = 16776960;
@@ -319,7 +319,7 @@ public final class Static269 {
 		if (local443 > 65536) {
 			local445 = 16711680;
 		}
-		Static215.aClass3_Sub2_Sub9_32.method2864(Static34.concatenate(new JagString[] { Static203.aClass100_894, Static123.parseInt(local443), Static19.aClass100_112 }), local412, local446, local445, -1);
+		Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static203.aClass100_894, Static123.parseInt(local443), Static19.aClass100_112 }), local412, local446, local445, -1);
 		local405 = local446 - 15;
 	}
 
diff --git a/client/src/main/java/Static270.java b/client/src/main/java/Static270.java
index b5e60cd..caa6d37 100644
--- a/client/src/main/java/Static270.java
+++ b/client/src/main/java/Static270.java
@@ -136,8 +136,8 @@ public final class Static270 {
 	@OriginalMember(owner = "client!wb", name = "a", descriptor = "(Lclient!ba;IILclient!ba;Z)I")
 	public static int method4595(@OriginalArg(0) World arg0, @OriginalArg(1) int arg1, @OriginalArg(3) World arg2, @OriginalArg(4) boolean arg3) {
 		if (arg1 == 1) {
-			@Pc(11) int local11 = arg0.anInt379;
-			@Pc(14) int local14 = arg2.anInt379;
+			@Pc(11) int local11 = arg0.players;
+			@Pc(14) int local14 = arg2.players;
 			if (!arg3) {
 				if (local14 == -1) {
 					local14 = 2001;
@@ -164,13 +164,13 @@ public final class Static270 {
 				return arg0.aClass100_69.method3126(arg2.aClass100_69);
 			}
 		} else if (arg1 == 4) {
-			return arg0.method441() ? (arg2.method441() ? 0 : 1) : arg2.method441() ? -1 : 0;
+			return arg0.isLootShare() ? (arg2.isLootShare() ? 0 : 1) : arg2.isLootShare() ? -1 : 0;
 		} else if (arg1 == 5) {
-			return arg0.method442() ? (arg2.method442() ? 0 : 1) : (arg2.method442() ? -1 : 0);
+			return arg0.isQuickChat() ? (arg2.isQuickChat() ? 0 : 1) : (arg2.isQuickChat() ? -1 : 0);
 		} else if (arg1 == 6) {
-			return arg0.method439() ? (arg2.method439() ? 0 : 1) : (arg2.method439() ? -1 : 0);
+			return arg0.isPvp() ? (arg2.isPvp() ? 0 : 1) : (arg2.isPvp() ? -1 : 0);
 		} else if (arg1 == 7) {
-			return arg0.method437() ? (arg2.method437() ? 0 : 1) : (arg2.method437() ? -1 : 0);
+			return arg0.isMembers() ? (arg2.isMembers() ? 0 : 1) : (arg2.isMembers() ? -1 : 0);
 		} else {
 			return arg0.anInt382 - arg2.anInt382;
 		}
diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java
index fed731d..696b6ff 100644
--- a/client/src/main/java/Static271.java
+++ b/client/src/main/java/Static271.java
@@ -13,20 +13,17 @@ public final class Static271 {
 	@OriginalMember(owner = "client!wc", name = "h", descriptor = "[[I")
 	public static final int[][] anIntArrayArray46 = new int[][] { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, { 12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3 }, { 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 }, { 3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12 } };
 
-	@OriginalMember(owner = "client!wc", name = "i", descriptor = "[B")
-	public static final byte[] aByteArray79 = new byte[520];
-
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
 	public static void method4597(@OriginalArg(0) Player arg0) {
 		@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37());
 		if (local10 == null) {
 			return;
 		}
-		if (local10.aClass3_Sub3_Sub1_1 != null) {
-			Static204.soundStream.method1347(local10.aClass3_Sub3_Sub1_1);
-			local10.aClass3_Sub3_Sub1_1 = null;
+		if (local10.primaryStream != null) {
+			Static204.soundStream.removeSubStream(local10.primaryStream);
+			local10.primaryStream = null;
 		}
-		local10.method4658();
+		local10.unlink();
 	}
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
@@ -44,12 +41,12 @@ public final class Static271 {
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(ZI)V")
 	public static void method4600(@OriginalArg(1) int arg0) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(4, arg0);
-		local8.method1007();
+		local8.pushClient();
 	}
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(II)Lclient!pb;")
 	public static LocType method4601(@OriginalArg(1) int arg0) {
-		@Pc(15) LocType local15 = (LocType) Static179.aClass99_25.method3106((long) arg0);
+		@Pc(15) LocType local15 = (LocType) Static179.aClass99_25.get((long) arg0);
 		if (local15 != null) {
 			return local15;
 		}
@@ -67,7 +64,7 @@ public final class Static271 {
 			local15.anInt4435 = 0;
 			local15.aBoolean207 = false;
 		}
-		Static179.aClass99_25.method3095(local15, (long) arg0);
+		Static179.aClass99_25.put(local15, (long) arg0);
 		return local15;
 	}
 }
diff --git a/client/src/main/java/Static273.java b/client/src/main/java/Static273.java
index a2db8d4..c9874e4 100644
--- a/client/src/main/java/Static273.java
+++ b/client/src/main/java/Static273.java
@@ -122,10 +122,10 @@ public final class Static273 {
 					local41 = Static155.getVarbit(local124);
 				}
 				if (local46 == 18) {
-					local41 = (Static173.self.anInt3412 >> 7) + Static225.originX;
+					local41 = (Static173.self.xFine >> 7) + Static225.originX;
 				}
 				if (local46 == 19) {
-					local41 = (Static173.self.anInt3421 >> 7) + Static142.originZ;
+					local41 = (Static173.self.zFine >> 7) + Static142.originZ;
 				}
 				if (local46 == 20) {
 					local41 = local33[local39++];
@@ -166,9 +166,9 @@ public final class Static273 {
 
 	@OriginalMember(owner = "client!we", name = "b", descriptor = "(BI)V")
 	public static void method3214(@OriginalArg(1) int arg0) {
-		for (@Pc(11) Node local11 = Static210.aClass133_21.method3859(); local11 != null; local11 = Static210.aClass133_21.method3861()) {
-			if ((local11.uid >> 48 & 0xFFFFL) == (long) arg0) {
-				local11.method4658();
+		for (@Pc(11) Node local11 = Static210.aClass133_21.head(); local11 != null; local11 = Static210.aClass133_21.next()) {
+			if ((local11.key >> 48 & 0xFFFFL) == (long) arg0) {
+				local11.unlink();
 			}
 		}
 	}
diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java
index b52fc22..0c8733c 100644
--- a/client/src/main/java/Static276.java
+++ b/client/src/main/java/Static276.java
@@ -76,7 +76,7 @@ public final class Static276 {
 			}
 		}
 		if (!local13) {
-			Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 }));
+			Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.UNABLETOFIND, local7 }));
 		}
 	}
 
diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java
index 4546fac..6ebceaa 100644
--- a/client/src/main/java/Static278.java
+++ b/client/src/main/java/Static278.java
@@ -23,14 +23,14 @@ public final class Static278 {
 				@Pc(14) int local14 = Static57.aClass3_Sub15_Sub1_3.method2238(15);
 				if (local14 != 32767) {
 					@Pc(19) boolean local19 = false;
-					if (Static175.aClass8_Sub4_Sub2Array1[local14] == null) {
+					if (Static175.npcs[local14] == null) {
 						local19 = true;
-						Static175.aClass8_Sub4_Sub2Array1[local14] = new Npc();
+						Static175.npcs[local14] = new Npc();
 					}
-					@Pc(37) Npc local37 = Static175.aClass8_Sub4_Sub2Array1[local14];
+					@Pc(37) Npc local37 = Static175.npcs[local14];
 					Static33.anIntArray79[Static272.anInt5214++] = local14;
 					local37.anInt3430 = Static83.loop;
-					if (local37.aClass96_1 != null && local37.aClass96_1.method2935()) {
+					if (local37.type != null && local37.type.method2935()) {
 						Static91.method1877(local37);
 					}
 					@Pc(66) int local66 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
@@ -51,14 +51,14 @@ public final class Static278 {
 					if (local124 > 15) {
 						local124 -= 32;
 					}
-					local37.method2692(local37.aClass96_1.anInt3713);
-					local37.anInt3365 = local37.aClass96_1.anInt3737;
-					local37.anInt3376 = local37.aClass96_1.anInt3733;
+					local37.method2692(local37.type.anInt3713);
+					local37.anInt3365 = local37.type.anInt3737;
+					local37.anInt3376 = local37.type.anInt3733;
 					if (local37.anInt3376 == 0) {
 						local37.anInt3381 = 0;
 					}
-					local37.method2683(local37.method2693(), Static173.self.movementQueueX[0] + local124, local105 + Static173.self.movementQueueZ[0], local66 == 1);
-					if (local37.aClass96_1.method2935()) {
+					local37.method2683(local37.getSize(), Static173.self.movementQueueX[0] + local124, local105 + Static173.self.movementQueueZ[0], local66 == 1);
+					if (local37.type.method2935()) {
 						Static122.method2411(local37.movementQueueZ[0], null, 0, local37, local37.movementQueueX[0], Static55.level, null);
 					}
 					continue;
@@ -226,7 +226,7 @@ public final class Static278 {
 			Static115.aClass3_Sub15Array1[local19] = null;
 		}
 		for (local19 = 0; local19 < 32768; local19++) {
-			Static175.aClass8_Sub4_Sub2Array1[local19] = null;
+			Static175.npcs[local19] = null;
 		}
 		for (local19 = 0; local19 < 4; local19++) {
 			for (@Pc(115) int local115 = 0; local115 < 104; local115++) {
diff --git a/client/src/main/java/Static279.java b/client/src/main/java/Static279.java
index 2787223..2b57d4e 100644
--- a/client/src/main/java/Static279.java
+++ b/client/src/main/java/Static279.java
@@ -8,7 +8,7 @@ public final class Static279 {
 	public static int[] anIntArray568;
 
 	@OriginalMember(owner = "client!wk", name = "w", descriptor = "I")
-	public static int anInt5880;
+	public static int country;
 
 	@OriginalMember(owner = "client!wk", name = "t", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable aClass99_38 = new SoftLruHashTable(64);
diff --git a/client/src/main/java/Static280.java b/client/src/main/java/Static280.java
index 17dc29a..d99806c 100644
--- a/client/src/main/java/Static280.java
+++ b/client/src/main/java/Static280.java
@@ -27,12 +27,12 @@ public final class Static280 {
 		if (Static83.loop == arg0.anInt3386 || arg0.anInt3369 == -1 || arg0.anInt3420 != 0 || arg0.anInt3360 + 1 > Static36.method941(arg0.anInt3369).anIntArray474[arg0.anInt3425]) {
 			@Pc(35) int local35 = arg0.anInt3386 - arg0.anInt3395;
 			@Pc(41) int local41 = Static83.loop - arg0.anInt3395;
-			@Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.method2693() * 64;
-			@Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.method2693() * 64;
-			@Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.method2693() * 64;
-			@Pc(86) int local86 = arg0.anInt3392 * 128 + arg0.method2693() * 64;
-			arg0.anInt3412 = (local41 * local75 + local52 * (local35 - local41)) / local35;
-			arg0.anInt3421 = (local86 * local41 + local64 * (local35 - local41)) / local35;
+			@Pc(52) int local52 = arg0.anInt3380 * 128 + arg0.getSize() * 64;
+			@Pc(64) int local64 = arg0.anInt3428 * 128 + arg0.getSize() * 64;
+			@Pc(75) int local75 = arg0.anInt3416 * 128 + arg0.getSize() * 64;
+			@Pc(86) int local86 = arg0.anInt3392 * 128 + arg0.getSize() * 64;
+			arg0.xFine = (local41 * local75 + local52 * (local35 - local41)) / local35;
+			arg0.zFine = (local86 * local41 + local64 * (local35 - local41)) / local35;
 		}
 		arg0.anInt3417 = 0;
 		if (arg0.anInt3431 == 0) {
@@ -53,7 +53,7 @@ public final class Static280 {
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIII)V")
 	public static void method4666(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
 		@Pc(18) DelayedStateChange local18 = Static238.method4143(11, arg1);
-		local18.method1017();
+		local18.pushServer();
 		local18.intArg3 = arg2;
 		local18.intArg1 = arg0;
 	}
@@ -551,7 +551,7 @@ public final class Static280 {
 		@Pc(33) HashTableIterator local33 = new HashTableIterator(Static119.aClass133_9);
 		for (@Pc(38) Class3_Sub31 local38 = (Class3_Sub31) local33.method2701(); local38 != null; local38 = (Class3_Sub31) local33.method2700()) {
 			if (local28 == local38.anInt5878) {
-				return Static5.getComponent((int) local38.uid);
+				return Static5.getComponent((int) local38.key);
 			}
 		}
 		return null;
@@ -678,7 +678,7 @@ public final class Static280 {
 		@Pc(12) Inv local12 = (Inv) Static20.objectContainerCache.get((long) arg3);
 		if (local12 == null) {
 			local12 = new Inv();
-			Static20.objectContainerCache.method3862(local12, (long) arg3);
+			Static20.objectContainerCache.put(local12, (long) arg3);
 		}
 		if (arg1 >= local12.objectIds.length) {
 			@Pc(39) int[] local39 = new int[arg1 + 1];
@@ -736,6 +736,6 @@ public final class Static280 {
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(II)V")
 	public static void method4675(@OriginalArg(1) int arg0) {
 		@Pc(17) DelayedStateChange local17 = Static238.method4143(11, arg0);
-		local17.method1007();
+		local17.pushClient();
 	}
 }
diff --git a/client/src/main/java/Static289.java b/client/src/main/java/Static289.java
index fd80704..320a795 100644
--- a/client/src/main/java/Static289.java
+++ b/client/src/main/java/Static289.java
@@ -279,7 +279,7 @@ public final class Static289 {
 	}
 
 	@OriginalMember(owner = "client!kg", name = "a", descriptor = "([III)V")
-	public static void method2618(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
+	public static void clear(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		@Pc(5) int local5 = arg2 - 7;
 		while (arg1 < local5) {
 			arg0[arg1++] = 0;
diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java
index e777738..445f98f 100644
--- a/client/src/main/java/Static3.java
+++ b/client/src/main/java/Static3.java
@@ -30,7 +30,7 @@ public final class Static3 {
 	}
 
 	@OriginalMember(owner = "client!ab", name = "a", descriptor = "(II)V")
-	public static void method4659(@OriginalArg(1) int arg0) {
+	public static void setLanguage(@OriginalArg(1) int arg0) {
 		if (arg0 == 0) {
 			return;
 		}
diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java
index e54b160..42b89b3 100644
--- a/client/src/main/java/Static30.java
+++ b/client/src/main/java/Static30.java
@@ -35,9 +35,9 @@ public final class Static30 {
 		Static139.aClass3_Sub2_Sub1Array6 = Static131.method2580(Static78.anInt2147, arg0);
 		Static241.aClass36Array16 = Static146.method2749(arg0, Static124.anInt3083);
 		Static159.aClass36Array12 = Static146.method2749(arg0, Static224.anInt5057);
-		Static114.aClass3_Sub2_Sub9_42.method2873(Static159.aClass36Array12, null);
-		Static215.aClass3_Sub2_Sub9_32.method2873(Static159.aClass36Array12, null);
-		Static280.aClass3_Sub2_Sub9_43.method2873(Static159.aClass36Array12, null);
+		Static114.aClass3_Sub2_Sub9_42.setNameIcons(Static159.aClass36Array12, null);
+		Static215.aClass3_Sub2_Sub9_32.setNameIcons(Static159.aClass36Array12, null);
+		Static280.aClass3_Sub2_Sub9_43.setNameIcons(Static159.aClass36Array12, null);
 		if (GlRenderer.enabled) {
 			Static242.aClass36_Sub1Array2 = method837(Static84.anInt2257, arg0);
 			for (@Pc(101) int local101 = 0; local101 < Static242.aClass36_Sub1Array2.length; local101++) {
diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java
index d00c681..1cd2e52 100644
--- a/client/src/main/java/Static31.java
+++ b/client/src/main/java/Static31.java
@@ -1,7 +1,6 @@
-import java.awt.Component;
 import java.io.IOException;
 import java.net.Socket;
-import org.openrs2.deob.annotation.OriginalArg;
+
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
@@ -17,7 +16,7 @@ public final class Static31 {
 	public static final JagString aClass100_193 = Static28.parse(":");
 
 	@OriginalMember(owner = "client!ch", name = "y", descriptor = "[Z")
-	public static final boolean[] aBooleanArray29 = new boolean[100];
+	public static final boolean[] rectangleRedraw = new boolean[100];
 
 	@OriginalMember(owner = "client!ch", name = "z", descriptor = "[I")
 	public static final int[] anIntArray76 = new int[5];
@@ -36,7 +35,7 @@ public final class Static31 {
 	}
 
 	@OriginalMember(owner = "client!ch", name = "b", descriptor = "(B)V")
-	public static void method848() {
+	public static void loopAuto() {
 		if (Static219.anInt4937 == 0) {
 			return;
 		}
@@ -47,7 +46,7 @@ public final class Static31 {
 					Static124.socket = null;
 				}
 				if (Static196.anInt4587 >= 1) {
-					Static266.returnCode = -5;
+					Static266.reply = -5;
 					Static219.anInt4937 = 0;
 					return;
 				}
@@ -89,7 +88,7 @@ public final class Static31 {
 					Static147.soundChannel.method3571();
 				}
 				if (local126 != 101) {
-					Static266.returnCode = local126;
+					Static266.reply = local126;
 					Static219.anInt4937 = 0;
 					Static124.socket.close();
 					Static124.socket = null;
@@ -105,7 +104,7 @@ public final class Static31 {
 				Static176.hopWorld(local126);
 				if (Static125.worldId == -1) {
 					Static219.anInt4937 = 0;
-					Static266.returnCode = 6;
+					Static266.reply = 6;
 					Static124.socket.close();
 					Static124.socket = null;
 					return;
@@ -131,7 +130,7 @@ public final class Static31 {
 				Static20.anInt673 = 0;
 				Static196.anInt4587++;
 			} else {
-				Static266.returnCode = -4;
+				Static266.reply = -4;
 				Static219.anInt4937 = 0;
 			}
 		}
diff --git a/client/src/main/java/Static32.java b/client/src/main/java/Static32.java
index e9fb3b2..6051ae8 100644
--- a/client/src/main/java/Static32.java
+++ b/client/src/main/java/Static32.java
@@ -38,7 +38,7 @@ public final class Static32 {
 									local76.anInt5399 = 0;
 									local76.anInt5408 = local28;
 									local76.anInt5404 = 0;
-									Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.self, 0);
+									Static152.method2836(arg2.zFine, local68, arg2.xFine, arg2 == Static173.self, 0);
 								} else if (local71 == 2) {
 									local76.anInt5400 = 0;
 								}
@@ -54,7 +54,7 @@ public final class Static32 {
 							local76.anInt5408 = local28;
 							local76.anInt5399 = 0;
 							local76.anInt5400 = 0;
-							Static152.method2836(arg2.anInt3421, local68, arg2.anInt3412, arg2 == Static173.self, 0);
+							Static152.method2836(arg2.zFine, local68, arg2.xFine, arg2 == Static173.self, 0);
 						}
 					}
 				}
diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java
index 5f95aa8..4b0f01b 100644
--- a/client/src/main/java/Static33.java
+++ b/client/src/main/java/Static33.java
@@ -39,7 +39,7 @@ public final class Static33 {
 			local49 = arg1.anInt4403;
 			local52 = arg1.anInt4397;
 		}
-		@Pc(66) int local66 = local42.anInt4279;
+		@Pc(66) int local66 = local42.innerWidth;
 		@Pc(69) int local69 = local42.anInt4276;
 		if (local10.aBoolean2) {
 			local69 = local52 * 4;
@@ -106,10 +106,10 @@ public final class Static33 {
 					local225 = local23[local114][local203] & 0xFF;
 					if (local225 > 0) {
 						@Pc(236) FluType local236 = Static199.method3593(local225 - 1);
-						local183[local203] += local236.anInt4154;
-						local180[local203] += local236.anInt4149;
-						local186[local203] += local236.anInt4158;
-						local189[local203] += local236.anInt4161;
+						local183[local203] += local236.weightedHue;
+						local180[local203] += local236.saturation;
+						local186[local203] += local236.lightness;
+						local189[local203] += local236.chroma;
 						local272 = local192[local203]++;
 					}
 				}
@@ -118,10 +118,10 @@ public final class Static33 {
 					local293 = local23[local225][local203] & 0xFF;
 					if (local293 > 0) {
 						@Pc(302) FluType local302 = Static199.method3593(local293 - 1);
-						local183[local203] -= local302.anInt4154;
-						local180[local203] -= local302.anInt4149;
-						local186[local203] -= local302.anInt4158;
-						local189[local203] -= local302.anInt4161;
+						local183[local203] -= local302.weightedHue;
+						local180[local203] -= local302.saturation;
+						local186[local203] -= local302.lightness;
+						local189[local203] -= local302.chroma;
 						local272 = local192[local203]--;
 					}
 				}
diff --git a/client/src/main/java/Static34.java b/client/src/main/java/Static34.java
index fca1f5b..11e91c2 100644
--- a/client/src/main/java/Static34.java
+++ b/client/src/main/java/Static34.java
@@ -87,7 +87,7 @@ public final class Static34 {
 
 	@OriginalMember(owner = "client!ck", name = "a", descriptor = "(BI)Lclient!eg;")
 	public static SpotAnimType method877(@OriginalArg(1) int arg0) {
-		@Pc(10) SpotAnimType local10 = (SpotAnimType) Static279.aClass99_38.method3106((long) arg0);
+		@Pc(10) SpotAnimType local10 = (SpotAnimType) Static279.aClass99_38.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -97,7 +97,7 @@ public final class Static34 {
 		if (local26 != null) {
 			local10.method1316(new Buffer(local26));
 		}
-		Static279.aClass99_38.method3095(local10, (long) arg0);
+		Static279.aClass99_38.put(local10, (long) arg0);
 		return local10;
 	}
 
@@ -115,12 +115,12 @@ public final class Static34 {
 					arg0.anInt3396 = 1;
 					arg0.anInt3407++;
 					arg0.anInt3388++;
-					Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.self, arg0.anInt3407);
+					Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3407);
 				}
 				if (arg0.anInt3407 >= local18.anIntArray473.length) {
 					arg0.anInt3407 = 0;
 					arg0.anInt3396 = 0;
-					Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.self == arg0, arg0.anInt3407);
+					Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3407);
 				}
 				arg0.anInt3388 = arg0.anInt3407 + 1;
 				if (arg0.anInt3388 >= local18.anIntArray473.length) {
@@ -140,13 +140,13 @@ public final class Static34 {
 				} else {
 					if (arg0.anInt3399 < 0) {
 						arg0.anInt3399 = 0;
-						Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.self == arg0, 0);
+						Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, 0);
 					}
 					arg0.anInt3361++;
 					if (arg0.anInt3399 < local165.anIntArray473.length && local165.anIntArray474[arg0.anInt3399] < arg0.anInt3361) {
 						arg0.anInt3399++;
 						arg0.anInt3361 = 1;
-						Static152.method2836(arg0.anInt3421, local165, arg0.anInt3412, Static173.self == arg0, arg0.anInt3399);
+						Static152.method2836(arg0.zFine, local165, arg0.xFine, Static173.self == arg0, arg0.anInt3399);
 					}
 					if (arg0.anInt3399 >= local165.anIntArray473.length) {
 						arg0.anInt3432 = -1;
@@ -174,7 +174,7 @@ public final class Static34 {
 				if (arg0.anInt3425 < local18.anIntArray473.length && arg0.anInt3360 > local18.anIntArray474[arg0.anInt3425]) {
 					arg0.anInt3360 = 1;
 					arg0.anInt3425++;
-					Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, arg0 == Static173.self, arg0.anInt3425);
+					Static152.method2836(arg0.zFine, local18, arg0.xFine, arg0 == Static173.self, arg0.anInt3425);
 				}
 				if (local18.anIntArray473.length <= arg0.anInt3425) {
 					arg0.anInt3425 -= local18.anInt5362;
@@ -182,7 +182,7 @@ public final class Static34 {
 					if (arg0.anInt3371 >= local18.anInt5357) {
 						arg0.anInt3369 = -1;
 					} else if (arg0.anInt3425 >= 0 && local18.anIntArray473.length > arg0.anInt3425) {
-						Static152.method2836(arg0.anInt3421, local18, arg0.anInt3412, Static173.self == arg0, arg0.anInt3425);
+						Static152.method2836(arg0.zFine, local18, arg0.xFine, Static173.self == arg0, arg0.anInt3425);
 					} else {
 						arg0.anInt3369 = -1;
 					}
@@ -216,7 +216,7 @@ public final class Static34 {
 						if (local545.anInt5399 < local570.anIntArray473.length && local545.anInt5404 > local570.anIntArray474[local545.anInt5399]) {
 							local545.anInt5399++;
 							local545.anInt5404 = 1;
-							Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, arg0 == Static173.self, local545.anInt5399);
+							Static152.method2836(arg0.zFine, local570, arg0.xFine, arg0 == Static173.self, local545.anInt5399);
 						}
 						if (local570.anIntArray473.length <= local545.anInt5399) {
 							local545.anInt5400++;
@@ -224,7 +224,7 @@ public final class Static34 {
 							if (local570.anInt5357 <= local545.anInt5400) {
 								arg0.aClass147Array3[local156] = null;
 							} else if (local545.anInt5399 >= 0 && local545.anInt5399 < local570.anIntArray473.length) {
-								Static152.method2836(arg0.anInt3421, local570, arg0.anInt3412, Static173.self == arg0, local545.anInt5399);
+								Static152.method2836(arg0.zFine, local570, arg0.xFine, Static173.self == arg0, local545.anInt5399);
 							} else {
 								arg0.aClass147Array3[local156] = null;
 							}
diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java
index f7436d9..751ae82 100644
--- a/client/src/main/java/Static36.java
+++ b/client/src/main/java/Static36.java
@@ -39,7 +39,7 @@ public final class Static36 {
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(IB)Lclient!tk;")
 	public static SeqType method941(@OriginalArg(0) int arg0) {
-		@Pc(17) SeqType local17 = (SeqType) Static142.aClass99_23.method3106((long) arg0);
+		@Pc(17) SeqType local17 = (SeqType) Static142.aClass99_23.get((long) arg0);
 		if (local17 != null) {
 			return local17;
 		}
@@ -50,7 +50,7 @@ public final class Static36 {
 			local17.method4213(new Buffer(local32));
 		}
 		local17.method4218();
-		Static142.aClass99_23.method3095(local17, (long) arg0);
+		Static142.aClass99_23.put(local17, (long) arg0);
 		return local17;
 	}
 
@@ -95,7 +95,7 @@ public final class Static36 {
 						if (local9.noClickThrough && Static215.anInt4873 >= local61 && Static223.anInt5032 >= local63 && Static215.anInt4873 < local65 && Static223.anInt5032 < local67) {
 							for (@Pc(164) HookRequest local164 = (HookRequest) Static185.lowPriorityRequests.method2289(); local164 != null; local164 = (HookRequest) Static185.lowPriorityRequests.method2288()) {
 								if (local164.aBoolean158) {
-									local164.method4658();
+									local164.unlink();
 									local164.source.aBoolean19 = false;
 								}
 							}
@@ -129,7 +129,7 @@ public final class Static36 {
 									if (local9.anIntArray49 == null || Static83.loop >= local9.anIntArray49[local243]) {
 										@Pc(279) byte local279 = local9.aByteArray7[local243];
 										if (local279 == 0 || ((local279 & 0x2) == 0 || Keyboard.pressedKeys[Keyboard.KEY_ALT]) && ((local279 & 0x1) == 0 || Keyboard.pressedKeys[Keyboard.KEY_CTRL]) && ((local279 & 0x4) == 0 || Keyboard.pressedKeys[Keyboard.KEY_SHIFT])) {
-											Static263.method4512(Static186.EMPTY_FILE, -1, local243 + 1, local9.id);
+											Static263.method4512(Static186.EMPTY, -1, local243 + 1, local9.id);
 											local322 = local9.anIntArray46[local243];
 											if (local9.anIntArray49 == null) {
 												local9.anIntArray49 = new int[local9.aByteArray8.length];
diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java
index 6a65826..b644845 100644
--- a/client/src/main/java/Static37.java
+++ b/client/src/main/java/Static37.java
@@ -22,10 +22,10 @@ public final class Static37 {
 		@Pc(43) int local43;
 		@Pc(36) int local36;
 		if (arg0.anInt3370 != -1 && arg0.anInt3370 < 32768) {
-			@Pc(26) Npc local26 = Static175.aClass8_Sub4_Sub2Array1[arg0.anInt3370];
+			@Pc(26) Npc local26 = Static175.npcs[arg0.anInt3370];
 			if (local26 != null) {
-				local36 = arg0.anInt3421 - local26.anInt3421;
-				local43 = arg0.anInt3412 - local26.anInt3412;
+				local36 = arg0.zFine - local26.zFine;
+				local43 = arg0.xFine - local26.xFine;
 				if (local43 != 0 || local36 != 0) {
 					arg0.anInt3400 = (int) (Math.atan2((double) local43, (double) local36) * 325.949D) & 0x7FF;
 				}
@@ -40,16 +40,16 @@ public final class Static37 {
 			}
 			@Pc(83) Player local83 = Static159.players[local70];
 			if (local83 != null) {
-				local94 = arg0.anInt3421 - local83.anInt3421;
-				local36 = arg0.anInt3412 - local83.anInt3412;
+				local94 = arg0.zFine - local83.zFine;
+				local36 = arg0.xFine - local83.xFine;
 				if (local36 != 0 || local94 != 0) {
 					arg0.anInt3400 = (int) (Math.atan2((double) local36, (double) local94) * 325.949D) & 0x7FF;
 				}
 			}
 		}
-		if ((arg0.anInt3382 != 0 || arg0.anInt3363 != 0) && (arg0.anInt3409 == 0 || arg0.anInt3417 > 0)) {
-			local70 = arg0.anInt3412 - (arg0.anInt3382 - Static225.originX - Static225.originX) * 64;
-			local43 = arg0.anInt3421 - (arg0.anInt3363 - Static142.originZ - Static142.originZ) * 64;
+		if ((arg0.anInt3382 != 0 || arg0.anInt3363 != 0) && (arg0.movementQueueSize == 0 || arg0.anInt3417 > 0)) {
+			local70 = arg0.xFine - (arg0.anInt3382 - Static225.originX - Static225.originX) * 64;
+			local43 = arg0.zFine - (arg0.anInt3363 - Static142.originZ - Static142.originZ) * 64;
 			if (local70 != 0 || local43 != 0) {
 				arg0.anInt3400 = (int) (Math.atan2((double) local70, (double) local43) * 325.949D) & 0x7FF;
 			}
@@ -70,9 +70,9 @@ public final class Static37 {
 					arg0.anInt3381 = arg0.anInt3400;
 					local226 = false;
 				}
-				if (local13.anInt1037 == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
+				if (local13.idleAnimationId == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
 					if (local13.anInt1036 == -1) {
-						arg0.anInt3366 = local13.anInt1051;
+						arg0.anInt3366 = local13.walkAnimation;
 					} else {
 						arg0.anInt3366 = local13.anInt1036;
 					}
@@ -84,9 +84,9 @@ public final class Static37 {
 					local226 = false;
 					arg0.anInt3381 = arg0.anInt3400;
 				}
-				if (local13.anInt1037 == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
+				if (local13.idleAnimationId == arg0.anInt3366 && (arg0.anInt3385 > 25 || local226)) {
 					if (local13.anInt1067 == -1) {
-						arg0.anInt3366 = local13.anInt1051;
+						arg0.anInt3366 = local13.walkAnimation;
 					} else {
 						arg0.anInt3366 = local13.anInt1067;
 					}
@@ -94,9 +94,9 @@ public final class Static37 {
 			}
 			arg0.anInt3381 &= 0x7FF;
 		} else {
-			if (local13.anInt1037 == arg0.anInt3366 && arg0.anInt3385 > 25) {
+			if (local13.idleAnimationId == arg0.anInt3366 && arg0.anInt3385 > 25) {
 				if (local13.anInt1067 == -1) {
-					arg0.anInt3366 = local13.anInt1051;
+					arg0.anInt3366 = local13.walkAnimation;
 				} else {
 					arg0.anInt3366 = local13.anInt1067;
 				}
diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java
index 869695d..c9c07ad 100644
--- a/client/src/main/java/Static38.java
+++ b/client/src/main/java/Static38.java
@@ -68,7 +68,7 @@ public final class Static38 {
 					local82 = Static203.aClass134_1.anIntArray444[local11];
 				}
 				if (local84 != null) {
-					@Pc(211) int local211 = Static114.aClass3_Sub2_Sub9_42.method2867(Static203.aClass134_1.aClass100Array153[local11], null, Static45.aClass100Array53);
+					@Pc(211) int local211 = Static114.aClass3_Sub2_Sub9_42.splitParagraph(Static203.aClass134_1.aClass100Array153[local11], null, Static45.aClass100Array53);
 					local80 -= local84.method1503() * (local211 - 1) / 2;
 					local80 += local84.method1511() / 2;
 					for (@Pc(231) int local231 = 0; local231 < local211; local231++) {
@@ -76,7 +76,7 @@ public final class Static38 {
 						if (local211 - 1 > local231) {
 							local242.method3133(local242.length() - 4);
 						}
-						local84.method1508(local242, local59, local80, local82);
+						local84.renderStringCenter(local242, local59, local80, local82);
 						local80 += local84.method1503();
 					}
 				}
@@ -138,15 +138,15 @@ 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.method3859() : (LongNode) Static199.aClass133_20.method3861(); local28 != null; local28 = (LongNode) Static199.aClass133_20.method3861()) {
+		for (@Pc(28) LongNode local28 = arg0 ? (LongNode) Static199.aClass133_20.head() : (LongNode) Static199.aClass133_20.next(); local28 != null; local28 = (LongNode) Static199.aClass133_20.next()) {
 			if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) {
 				if ((local28.aLong55 & 0x4000000000000000L) != 0L) {
-					@Pc(58) int local58 = (int) local28.uid;
+					@Pc(58) int local58 = (int) local28.key;
 					Static7.varps[local58] = Static106.anIntArray257[local58];
-					local28.method4658();
+					local28.unlink();
 					return local58;
 				}
-				local28.method4658();
+				local28.unlink();
 			}
 		}
 		return -1;
@@ -155,7 +155,7 @@ public final class Static38 {
 	@OriginalMember(owner = "client!cn", name = "b", descriptor = "(ZI)V")
 	public static void method964(@OriginalArg(0) boolean arg0) {
 		@Pc(3) int local3 = Static267.anInt5774;
-		if (Static115.anInt2939 == Static173.self.anInt3412 >> 7 && Static173.self.anInt3421 >> 7 == Static84.anInt2255) {
+		if (Static115.anInt2939 == Static173.self.xFine >> 7 && Static173.self.zFine >> 7 == Static84.anInt2255) {
 			Static115.anInt2939 = 0;
 		}
 		if (arg0) {
@@ -176,27 +176,27 @@ public final class Static38 {
 				local39 = Static159.players[Static105.anIntArray256[local28]];
 			}
 			if (local39 != null && local39.method2682()) {
-				@Pc(55) int local55 = local39.method2693();
+				@Pc(55) int local55 = local39.getSize();
 				@Pc(77) int local77;
 				if (local55 == 1) {
-					if ((local39.anInt3412 & 0x7F) == 64 && (local39.anInt3421 & 0x7F) == 64) {
-						local77 = local39.anInt3412 >> 7;
-						local82 = local39.anInt3421 >> 7;
+					if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
+						local77 = local39.xFine >> 7;
+						local82 = local39.zFine >> 7;
 						if (local77 >= 0 && local77 < 104 && local82 >= 0 && local82 < 104) {
 							local106 = Static31.anIntArrayArray6[local77][local82]++;
 						}
 					}
-				} else if (((local55 & 0x1) != 0 || (local39.anInt3412 & 0x7F) == 0 && (local39.anInt3421 & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.anInt3412 & 0x7F) == 64 && (local39.anInt3421 & 0x7F) == 64)) {
-					local77 = local39.anInt3412 - local55 * 64 >> 7;
-					local82 = local39.anInt3421 - local55 * 64 >> 7;
-					local182 = local39.method2693() + local77;
+				} else if (((local55 & 0x1) != 0 || (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0) && ((local55 & 0x1) != 1 || (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64)) {
+					local77 = local39.xFine - local55 * 64 >> 7;
+					local82 = local39.zFine - local55 * 64 >> 7;
+					local182 = local39.getSize() + local77;
 					if (local182 > 104) {
 						local182 = 104;
 					}
 					if (local77 < 0) {
 						local77 = 0;
 					}
-					local200 = local82 + local39.method2693();
+					local200 = local82 + local39.getSize();
 					if (local82 < 0) {
 						local82 = 0;
 					}
@@ -222,14 +222,14 @@ public final class Static38 {
 			}
 			if (local39 != null && local39.method2682()) {
 				local39.aBoolean98 = false;
-				if ((Static15.manyIdleAnimations && Static267.anInt5774 > 200 || Static267.anInt5774 > 50) && !arg0 && local39.anInt3366 == local39.method2681().anInt1037) {
+				if ((Static15.manyIdleAnimations && Static267.anInt5774 > 200 || Static267.anInt5774 > 50) && !arg0 && local39.anInt3366 == local39.method2681().idleAnimationId) {
 					local39.aBoolean98 = true;
 				}
-				local82 = local39.method2693();
+				local82 = local39.getSize();
 				if (local82 == 1) {
-					if ((local39.anInt3412 & 0x7F) == 64 && (local39.anInt3421 & 0x7F) == 64) {
-						local182 = local39.anInt3412 >> 7;
-						local200 = local39.anInt3421 >> 7;
+					if ((local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 64) {
+						local182 = local39.xFine >> 7;
+						local200 = local39.zFine >> 7;
 						if (local182 < 0 || local182 >= 104 || local200 < 0 || local200 >= 104) {
 							continue;
 						}
@@ -238,10 +238,10 @@ public final class Static38 {
 							continue;
 						}
 					}
-				} else if ((local82 & 0x1) == 0 && (local39.anInt3412 & 0x7F) == 0 && (local39.anInt3421 & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.anInt3412 & 0x7F) == 64 && (local39.anInt3421 & 0x7F) == 0) {
-					local182 = local39.anInt3412 - local82 * 64 >> 7;
+				} else if ((local82 & 0x1) == 0 && (local39.xFine & 0x7F) == 0 && (local39.zFine & 0x7F) == 0 || (local82 & 0x1) == 1 && (local39.xFine & 0x7F) == 64 && (local39.zFine & 0x7F) == 0) {
+					local182 = local39.xFine - local82 * 64 >> 7;
 					local214 = local82 + local182;
-					local200 = local39.anInt3421 - local82 * 64 >> 7;
+					local200 = local39.zFine - local82 * 64 >> 7;
 					if (local214 > 104) {
 						local214 = 104;
 					}
@@ -280,12 +280,12 @@ public final class Static38 {
 					}
 				}
 				if (local39.attachment == null || Static83.loop < local39.anInt3390 || local39.anInt3375 <= Static83.loop) {
-					local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421);
-					Static43.method1141(Static55.level, local39.anInt3412, local39.anInt3421, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
+					local39.anInt3424 = Static207.method3685(Static55.level, local39.xFine, local39.zFine);
+					Static43.method1141(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, (local82 - 1) * 64 + 60, local39, local39.anInt3381, local272, local39.aBoolean171);
 				} else {
 					local39.aBoolean98 = false;
-					local39.anInt3424 = Static207.method3685(Static55.level, local39.anInt3412, local39.anInt3421);
-					Static184.method3387(Static55.level, local39.anInt3412, local39.anInt3421, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410);
+					local39.anInt3424 = Static207.method3685(Static55.level, local39.xFine, local39.zFine);
+					Static184.method3387(Static55.level, local39.xFine, local39.zFine, local39.anInt3424, local39, local39.anInt3381, local272, local39.anInt3384, local39.anInt3374, local39.anInt3411, local39.anInt3410);
 				}
 			}
 		}
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index 02c6e0b..7dfa153 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -49,7 +49,7 @@ public final class Static4 {
 	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(BI)V")
 	public static void method24(@OriginalArg(1) int arg0) {
 		@Pc(16) DelayedStateChange local16 = Static238.method4143(1, arg0);
-		local16.method1007();
+		local16.pushClient();
 	}
 
 	@OriginalMember(owner = "client!ac", name = "a", descriptor = "(Lclient!na;I)I")
@@ -181,20 +181,20 @@ public final class Static4 {
 					}
 				}
 				if (!local262 && Static11.anInt384 == 0) {
-					Static103.method2231(local156, 10, Static186.EMPTY_FILE);
+					Static103.method2231(local156, 10, Static186.EMPTY);
 				}
 			} else if (local245.method3130(Static141.aClass100_664)) {
 				local156 = local245.substring(local245.indexOf(Static141.aClass100_664), 0);
-				Static103.method2231(Static186.EMPTY_FILE, 11, local156);
+				Static103.method2231(Static186.EMPTY, 11, local156);
 			} else if (local245.method3130(Static138.aClass100_654)) {
 				local156 = local245.substring(local245.indexOf(Static138.aClass100_654), 0);
 				if (Static11.anInt384 == 0) {
-					Static103.method2231(Static186.EMPTY_FILE, 12, local156);
+					Static103.method2231(Static186.EMPTY, 12, local156);
 				}
 			} else if (local245.method3130(Static244.aClass100_1014)) {
 				local156 = local245.substring(local245.indexOf(Static244.aClass100_1014), 0);
 				if (Static11.anInt384 == 0) {
-					Static103.method2231(Static186.EMPTY_FILE, 13, local156);
+					Static103.method2231(Static186.EMPTY, 13, local156);
 				}
 			} else if (local245.method3130(Static56.aClass100_379)) {
 				local262 = false;
@@ -207,7 +207,7 @@ public final class Static4 {
 					}
 				}
 				if (!local262 && Static11.anInt384 == 0) {
-					Static103.method2231(local156, 14, Static186.EMPTY_FILE);
+					Static103.method2231(local156, 14, Static186.EMPTY);
 				}
 			} else if (local245.method3130(Static112.aClass100_574)) {
 				local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0);
@@ -220,7 +220,7 @@ public final class Static4 {
 					}
 				}
 				if (!local262 && Static11.anInt384 == 0) {
-					Static103.method2231(local156, 15, Static186.EMPTY_FILE);
+					Static103.method2231(local156, 15, Static186.EMPTY);
 				}
 			} else if (local245.method3130(Static217.aClass100_916)) {
 				local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0);
@@ -233,7 +233,7 @@ public final class Static4 {
 					}
 				}
 				if (!local262 && Static11.anInt384 == 0) {
-					Static103.method2231(local156, 16, Static186.EMPTY_FILE);
+					Static103.method2231(local156, 16, Static186.EMPTY);
 				}
 			} else if (local245.method3130(Static164.aClass100_770)) {
 				local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0);
@@ -250,7 +250,7 @@ public final class Static4 {
 					Static103.method2231(local156, 21, local506);
 				}
 			} else {
-				Static103.method2231(Static186.EMPTY_FILE, 0, local245);
+				Static103.method2231(Static186.EMPTY, 0, local245);
 			}
 			Static164.anInt3985 = -1;
 			return true;
@@ -368,12 +368,12 @@ public final class Static4 {
 				@Pc(1158) Class3_Sub22[] local1158 = new Class3_Sub22[100];
 				for (local1160 = 0; local1160 < Static214.anInt5577; local1160++) {
 					local1158[local1160] = new Class3_Sub22();
-					local1158[local1160].uid = Static57.aClass3_Sub15_Sub1_3.g8();
-					local1158[local1160].aClass100_636 = Static79.decode37(local1158[local1160].uid);
+					local1158[local1160].key = Static57.aClass3_Sub15_Sub1_3.g8();
+					local1158[local1160].aClass100_636 = Static79.decode37(local1158[local1160].key);
 					local1158[local1160].anInt3340 = Static57.aClass3_Sub15_Sub1_3.g2();
 					local1158[local1160].aByte9 = Static57.aClass3_Sub15_Sub1_3.g1s();
 					local1158[local1160].aClass100_635 = Static57.aClass3_Sub15_Sub1_3.gjstr();
-					if (Static101.aLong98 == local1158[local1160].uid) {
+					if (Static101.aLong98 == local1158[local1160].key) {
 						Static160.aByte14 = local1158[local1160].aByte9;
 					}
 				}
@@ -541,13 +541,13 @@ public final class Static4 {
 								local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904);
 								if (local1804 != null) {
 									local1814 = new ServerActiveProperties(local1804.anInt546, local133);
-									local1804.method4658();
+									local1804.unlink();
 								} else if (local277 == -1) {
 									local1814 = new ServerActiveProperties(Static5.getComponent(local786).aClass3_Sub4_1.anInt546, local133);
 								} else {
 									local1814 = new ServerActiveProperties(0, local133);
 								}
-								Static210.aClass133_21.method3862(local1814, local904);
+								Static210.aClass133_21.put(local1814, local904);
 							}
 						}
 						Static164.anInt3985 = -1;
@@ -563,7 +563,7 @@ public final class Static4 {
 							@Pc(1994) SeqType local1994;
 							if (local864 >> 29 != 0) {
 								local1146 = local864 & 0xFFFF;
-								@Pc(1894) Npc local1894 = Static175.aClass8_Sub4_Sub2Array1[local1146];
+								@Pc(1894) Npc local1894 = Static175.npcs[local1146];
 								if (local1894 != null) {
 									if (local171 == 65535) {
 										local171 = -1;
@@ -587,7 +587,7 @@ public final class Static4 {
 											if (local1986 != -1) {
 												local1994 = Static36.method941(local1986);
 												if (local1994 != null && local1994.anIntArray473 != null) {
-													Static152.method2836(local1894.anInt3421, local1994, local1894.anInt3412, false, 0);
+													Static152.method2836(local1894.zFine, local1994, local1894.xFine, false, 0);
 												}
 											}
 										}
@@ -627,7 +627,7 @@ public final class Static4 {
 											if (local1986 != -1) {
 												local1994 = Static36.method941(local1986);
 												if (local1994 != null && local1994.anIntArray473 != null) {
-													Static152.method2836(local2033.anInt3421, local1994, local2033.anInt3412, local2033 == Static173.self, 0);
+													Static152.method2836(local2033.zFine, local1994, local2033.xFine, local2033 == Static173.self, 0);
 												}
 											}
 										}
@@ -783,7 +783,7 @@ public final class Static4 {
 								local884 &= Long.MAX_VALUE;
 								local262 = false;
 							}
-							local506 = Static186.EMPTY_FILE;
+							local506 = Static186.EMPTY;
 							if (local864 > 0) {
 								local506 = Static57.aClass3_Sub15_Sub1_3.gjstr();
 							}
@@ -793,10 +793,10 @@ public final class Static4 {
 									if (local864 != Static104.anIntArray255[local1986]) {
 										Static104.anIntArray255[local1986] = local864;
 										if (local864 > 0) {
-											Static103.method2231(Static186.EMPTY_FILE, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN}));
+											Static103.method2231(Static186.EMPTY, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGIN}));
 										}
 										if (local864 == 0) {
-											Static103.method2231(Static186.EMPTY_FILE, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT}));
+											Static103.method2231(Static186.EMPTY, 5, Static34.concatenate(new JagString[] { local2834, LocalizedText.FRIENDLOGOUT}));
 										}
 									}
 									Static214.aClass100Array170[local1986] = local506;
@@ -934,8 +934,8 @@ public final class Static4 {
 										Static132.method2605(local3449 == null || local3456.anInt5878 != local3449.anInt5878, local3456);
 									}
 									if (local3449 != null) {
-										local3449.method4658();
-										Static119.aClass133_9.method3862(local3449, (long) local864);
+										local3449.unlink();
+										Static119.aClass133_9.put(local3449, (long) local864);
 									}
 									@Pc(3490) Component local3490 = Static5.getComponent(local133);
 									if (local3490 != null) {
@@ -1017,7 +1017,7 @@ public final class Static4 {
 								local133 = Static57.aClass3_Sub15_Sub1_3.g2le();
 								local786 = Static57.aClass3_Sub15_Sub1_3.g1ssub();
 								local864 = Static57.aClass3_Sub15_Sub1_3.g2();
-								@Pc(3766) Npc local3766 = Static175.aClass8_Sub4_Sub2Array1[local133];
+								@Pc(3766) Npc local3766 = Static175.npcs[local133];
 								if (local3766 != null) {
 									Static223.method3855(local786, local864, local3766);
 								}
@@ -1042,7 +1042,7 @@ public final class Static4 {
 								@Pc(3848) byte[] local3848 = new byte[Static223.anInt5028];
 								Static57.aClass3_Sub15_Sub1_3.method2237(local3848, Static223.anInt5028);
 								local156 = Static10.decodeString(local3848, Static223.anInt5028, 0);
-								if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || Static178.aBoolean203)) {
+								if (GameShell.frame == null && (SignLink.anInt5928 == 3 || !SignLink.osName.startsWith("win") || Static178.haveIe6)) {
 									Static169.openUrl(local156, true);
 								} else {
 									Static175.url = local156;
@@ -1088,9 +1088,9 @@ public final class Static4 {
 										Static159.players[local133].anInt3369 = -1;
 									}
 								}
-								for (local133 = 0; local133 < Static175.aClass8_Sub4_Sub2Array1.length; local133++) {
-									if (Static175.aClass8_Sub4_Sub2Array1[local133] != null) {
-										Static175.aClass8_Sub4_Sub2Array1[local133].anInt3369 = -1;
+								for (local133 = 0; local133 < Static175.npcs.length; local133++) {
+									if (Static175.npcs[local133] != null) {
+										Static175.npcs[local133].anInt3369 = -1;
 									}
 								}
 								Static164.anInt3985 = -1;
@@ -1403,13 +1403,13 @@ public final class Static4 {
 											local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904);
 											if (local1804 != null) {
 												local1814 = new ServerActiveProperties(local1146, local1804.anInt540);
-												local1804.method4658();
+												local1804.unlink();
 											} else if (local277 == -1) {
 												local1814 = new ServerActiveProperties(local1146, Static5.getComponent(local864).aClass3_Sub4_1.anInt540);
 											} else {
 												local1814 = new ServerActiveProperties(local1146, -1);
 											}
-											Static210.aClass133_21.method3862(local1814, local904);
+											Static210.aClass133_21.put(local1814, local904);
 										}
 									}
 									Static164.anInt3985 = -1;
@@ -1433,7 +1433,7 @@ public final class Static4 {
 											return true;
 										}
 										local884 &= Long.MAX_VALUE;
-										for (local277 = 0; Static214.anInt5577 > local277 && (local884 != Static199.aClass3_Sub22Array1[local277].uid || local864 != Static199.aClass3_Sub22Array1[local277].anInt3340); local277++) {
+										for (local277 = 0; Static214.anInt5577 > local277 && (local884 != Static199.aClass3_Sub22Array1[local277].key || local864 != Static199.aClass3_Sub22Array1[local277].anInt3340); local277++) {
 										}
 										if (local277 < Static214.anInt5577) {
 											while (Static214.anInt5577 - 1 > local277) {
@@ -1446,8 +1446,8 @@ public final class Static4 {
 									} else {
 										local506 = Static57.aClass3_Sub15_Sub1_3.gjstr();
 										@Pc(5347) Class3_Sub22 local5347 = new Class3_Sub22();
-										local5347.uid = local884;
-										local5347.aClass100_636 = Static79.decode37(local5347.uid);
+										local5347.key = local884;
+										local5347.aClass100_636 = Static79.decode37(local5347.key);
 										local5347.aByte9 = local5325;
 										local5347.aClass100_635 = local506;
 										local5347.anInt3340 = local864;
diff --git a/client/src/main/java/Static40.java b/client/src/main/java/Static40.java
index 7ce2d57..3f2dc1f 100644
--- a/client/src/main/java/Static40.java
+++ b/client/src/main/java/Static40.java
@@ -81,7 +81,7 @@ public final class Static40 {
 
 	@OriginalMember(owner = "client!da", name = "c", descriptor = "(II)Lclient!aa;")
 	public static MsiType method1013(@OriginalArg(0) int arg0) {
-		@Pc(10) MsiType local10 = (MsiType) Static231.aClass99_29.method3106((long) arg0);
+		@Pc(10) MsiType local10 = (MsiType) Static231.aClass99_29.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -90,7 +90,7 @@ public final class Static40 {
 		if (local20 != null) {
 			local10.method6(new Buffer(local20), arg0);
 		}
-		Static231.aClass99_29.method3095(local10, (long) arg0);
+		Static231.aClass99_29.put(local10, (long) arg0);
 		return local10;
 	}
 
@@ -129,7 +129,7 @@ public final class Static40 {
 		local8.p4((int) (Math.random() * 9.9999999E7D));
 		local8.pjstr(password);
 		local8.p4((int) (Math.random() * 9.9999999E7D));
-		local8.p2(Static204.anInt4760);
+		local8.p2(Static204.affiliate);
 		local8.p1(arg0);
 		local8.p1(arg2);
 		local8.p4((int) (Math.random() * 9.9999999E7D));
diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java
index c2c2e37..c0513ec 100644
--- a/client/src/main/java/Static41.java
+++ b/client/src/main/java/Static41.java
@@ -34,7 +34,7 @@ public final class Static41 {
 	@OriginalMember(owner = "client!dc", name = "a", descriptor = "(IZLclient!tk;IIIIILclient!ak;IIIIB)Lclient!ak;")
 	public static Model method1043(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) Model arg8, @OriginalArg(9) int arg9, @OriginalArg(10) int arg10, @OriginalArg(11) int arg11, @OriginalArg(12) int arg12) {
 		@Pc(23) long local23 = ((long) arg4 << 48) + (long) (arg7 + (arg0 << 16) + (arg12 << 24)) + ((long) arg6 << 32);
-		@Pc(33) Model local33 = (Model) Static45.aClass99_6.method3106(local23);
+		@Pc(33) Model local33 = (Model) Static45.aClass99_6.get(local23);
 		@Pc(109) int local109;
 		@Pc(115) int local115;
 		@Pc(126) int local126;
@@ -82,7 +82,7 @@ public final class Static41 {
 				}
 			}
 			local33 = local103.method1679(64, 768, -50, -10, -50);
-			Static45.aClass99_6.method3095(local33, local23);
+			Static45.aClass99_6.put(local33, local23);
 		}
 		@Pc(367) int local367 = arg7 * 64 - 1;
 		@Pc(376) int local376 = -local367;
@@ -130,7 +130,7 @@ public final class Static41 {
 			local33.method4559((local115 - local384) / 2, 128, (local130 - local126) / 2);
 			local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
 		} else {
-			local33 = local33.method4560(!local386.method901(arg10), !local386.method903(arg10), true);
+			local33 = local33.method4560(!local386.isAlphaTransformed(arg10), !local386.isColorTransformed(arg10), true);
 			local33.method4559((local115 - local384) / 2, 128, (local130 - local126) / 2);
 			local33.method4575((local384 + local115) / 2, 0, (local126 + local130) / 2);
 			local33.method4555(local386, arg10);
diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java
index 58204fb..5ee5806 100644
--- a/client/src/main/java/Static43.java
+++ b/client/src/main/java/Static43.java
@@ -101,7 +101,7 @@ public final class Static43 {
 				local100 = local148.aClass8_4;
 			}
 			if (local74.anInt4435 != 0 && local74.anInt4397 + arg1 < 104 && local74.anInt4397 + arg0 < 104 && arg1 + local74.anInt4403 < 104 && arg0 + local74.anInt4403 < 104) {
-				arg5.method3056(arg1, local74.anInt4397, local74.aBoolean207, local92, local74.anInt4403, arg0);
+				arg5.unflagScenery(arg1, local74.anInt4397, local74.aBoolean207, local92, local74.anInt4403, arg0);
 			}
 		} else if (arg3 == 3) {
 			@Pc(211) GroundDecor local211 = Static267.method4526(arg2, arg1, arg0);
diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java
index 4d61ec9..e056315 100644
--- a/client/src/main/java/Static44.java
+++ b/client/src/main/java/Static44.java
@@ -40,9 +40,9 @@ public final class Static44 {
 				Static159.players[local35].anInt3370 = -1;
 			}
 		}
-		for (local35 = 0; local35 < Static175.aClass8_Sub4_Sub2Array1.length; local35++) {
-			if (Static175.aClass8_Sub4_Sub2Array1[local35] != null) {
-				Static175.aClass8_Sub4_Sub2Array1[local35].anInt3370 = -1;
+		for (local35 = 0; local35 < Static175.npcs.length; local35++) {
+			if (Static175.npcs[local35] != null) {
+				Static175.npcs[local35].anInt3370 = -1;
 			}
 		}
 		Static102.method2073();
@@ -68,7 +68,7 @@ public final class Static44 {
 		@Pc(9) Class3_Sub31 local9 = new Class3_Sub31();
 		local9.anInt5879 = arg2;
 		local9.anInt5878 = arg0;
-		Static119.aClass133_9.method3862(local9, (long) arg1);
+		Static119.aClass133_9.put(local9, (long) arg1);
 		Static81.method1753(arg0);
 		@Pc(28) Component local28 = Static5.getComponent(arg1);
 		if (local28 != null) {
@@ -90,9 +90,9 @@ public final class Static44 {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
 		} else {
 			Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436);
-			local53 = Static280.aClass3_Sub2_Sub9_43.method2858(LocalizedText.CHOOSE_OPTION);
+			local53 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(LocalizedText.CHOOSE_OPTION);
 			for (@Pc(95) int local95 = 0; local95 < Static231.anInt5204; local95++) {
-				@Pc(104) int local104 = Static280.aClass3_Sub2_Sub9_43.method2858(Static269.method2228(local95));
+				@Pc(104) int local104 = Static280.aClass3_Sub2_Sub9_43.getStringWidth(Static269.method2228(local95));
 				if (local104 > local53) {
 					local53 = local104;
 				}
diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java
index 8abedc7..be4fcc6 100644
--- a/client/src/main/java/Static45.java
+++ b/client/src/main/java/Static45.java
@@ -137,10 +137,10 @@ public final class Static45 {
 						local194 = Static253.aByteArrayArrayArray16[local152][local178][local173] & 0xFF;
 						if (local194 > 0) {
 							@Pc(693) FluType local693 = Static199.method3593(local194 - 1);
-							Static221.anIntArray376[local173] += local693.anInt4154;
-							Static139.anIntArray325[local173] += local693.anInt4149;
-							Static279.anIntArray568[local173] += local693.anInt4158;
-							Static251.anIntArray479[local173] += local693.anInt4161;
+							Static221.anIntArray376[local173] += local693.weightedHue;
+							Static139.anIntArray325[local173] += local693.saturation;
+							Static279.anIntArray568[local173] += local693.lightness;
+							Static251.anIntArray479[local173] += local693.chroma;
 							local729 = Static128.anIntArray293[local173]++;
 						}
 					}
@@ -149,10 +149,10 @@ public final class Static45 {
 						local200 = Static253.aByteArrayArrayArray16[local152][local194][local173] & 0xFF;
 						if (local200 > 0) {
 							@Pc(758) FluType local758 = Static199.method3593(local200 - 1);
-							Static221.anIntArray376[local173] -= local758.anInt4154;
-							Static139.anIntArray325[local173] -= local758.anInt4149;
-							Static279.anIntArray568[local173] -= local758.anInt4158;
-							Static251.anIntArray479[local173] -= local758.anInt4161;
+							Static221.anIntArray376[local173] -= local758.weightedHue;
+							Static139.anIntArray325[local173] -= local758.saturation;
+							Static279.anIntArray568[local173] -= local758.lightness;
+							Static251.anIntArray479[local173] -= local758.chroma;
 							local729 = Static128.anIntArray293[local173]--;
 						}
 					}
@@ -241,7 +241,7 @@ public final class Static45 {
 												@Pc(1834) int local1834 = Static240.aByteArrayArrayArray14[local152][local322][local1794] & 0xFF;
 												if (local1834 != 0) {
 													@Pc(1842) FloType local1842 = Static256.method4395(local1834 - 1);
-													if (local1842.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1842.anInt5892) == 4) {
+													if (local1842.texture != -1 && Rasteriser.textureProvider.method3237(local1842.texture) == 4) {
 														Static62.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24);
 														continue label771;
 													}
@@ -258,7 +258,7 @@ public final class Static45 {
 								@Pc(1353) int local1353;
 								@Pc(1288) int local1288;
 								if (GlRenderer.enabled && !underwater && Static62.anIntArrayArray11 != null && local152 == 0) {
-									if (local1248.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1248.anInt5892) == 4) {
+									if (local1248.texture != -1 && Rasteriser.textureProvider.method3237(local1248.texture) == 4) {
 										Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889;
 									} else {
 										label737: for (local1288 = local168 - 1; local1288 <= local168 + 1; local1288++) {
@@ -267,7 +267,7 @@ public final class Static45 {
 													local1353 = Static240.aByteArrayArrayArray14[local152][local1288][local1301] & 0xFF;
 													if (local1353 != 0) {
 														@Pc(1366) FloType local1366 = Static256.method4395(local1353 - 1);
-														if (local1366.anInt5892 != -1 && Rasteriser.textureProvider.method3237(local1366.anInt5892) == 4) {
+														if (local1366.texture != -1 && Rasteriser.textureProvider.method3237(local1366.texture) == 4) {
 															Static62.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24);
 															break label737;
 														}
@@ -277,7 +277,7 @@ public final class Static45 {
 										}
 									}
 								}
-								local1288 = local1248.anInt5892;
+								local1288 = local1248.texture;
 								if (local1288 >= 0 && !Rasteriser.textureProvider.method3236(local1288)) {
 									local1288 = -1;
 								}
diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java
index 2e4cbd9..10fba95 100644
--- a/client/src/main/java/Static47.java
+++ b/client/src/main/java/Static47.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static47 {
 
 	@OriginalMember(owner = "client!dk", name = "h", descriptor = "Lclient!na;")
-	public static JagString aClass100_991 = null;
+	public static JagString settings = null;
 
 	@OriginalMember(owner = "client!dk", name = "j", descriptor = "[Lclient!en;")
 	public static final BufferedFile[] cacheIndexes = new BufferedFile[28];
diff --git a/client/src/main/java/Static49.java b/client/src/main/java/Static49.java
index 50c61da..944ac0d 100644
--- a/client/src/main/java/Static49.java
+++ b/client/src/main/java/Static49.java
@@ -91,7 +91,7 @@ public final class Static49 {
 		Static272.anInt5214 = 0;
 		for (local22 = 0; local22 < local13; local22++) {
 			@Pc(61) int local61 = Static33.anIntArray79[local22];
-			@Pc(65) Npc local65 = Static175.aClass8_Sub4_Sub2Array1[local61];
+			@Pc(65) Npc local65 = Static175.npcs[local61];
 			@Pc(70) int local70 = Static57.aClass3_Sub15_Sub1_3.method2238(1);
 			if (local70 == 0) {
 				Static33.anIntArray79[Static272.anInt5214++] = local61;
@@ -176,7 +176,7 @@ public final class Static49 {
 		@Pc(24) JagString local24 = Static13.method471();
 		if (arg0 == null) {
 			@Pc(40) int local40 = Static280.aClass3_Sub2_Sub9_43.method2859(local24, arg2 + 4, arg1 - -15, Static39.aRandom1, Static60.gregorianDateSeed);
-			Static133.method4012(arg2 + 4, Static280.aClass3_Sub2_Sub9_43.method2858(local24) + local40, arg1, 15);
+			Static133.method4012(arg2 + 4, Static280.aClass3_Sub2_Sub9_43.getStringWidth(local24) + local40, arg1, 15);
 			return;
 		}
 		@Pc(59) Font local59 = arg0.method491(Static159.aClass36Array12);
@@ -191,7 +191,7 @@ public final class Static49 {
 	public static void method1208() {
 		Static224.aBoolean247 = false;
 		Static231.anInt5202 = 0;
-		Static266.returnCode = -3;
+		Static266.reply = -3;
 		Static92.anInt2430 = 0;
 		Static184.loginStep = 1;
 		Static276.anInt5816 = 0;
diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java
index 8ee24a3..f48c2ea 100644
--- a/client/src/main/java/Static54.java
+++ b/client/src/main/java/Static54.java
@@ -19,7 +19,7 @@ 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) {
-		Static107.method2261();
+		Static107.loop();
 		if (GlRenderer.enabled) {
 			Static46.method1187(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459);
 		} else {
@@ -27,8 +27,8 @@ public final class Static54 {
 		}
 		if (Static270.anInt5795 != 2 && Static270.anInt5795 != 5 && Static89.aClass3_Sub2_Sub1_5 != null) {
 			@Pc(48) int local48 = Static59.anInt1814 + Camera.getYaw() & 0x7FF;
-			@Pc(57) int local57 = Static173.self.anInt3412 / 32 + 48;
-			@Pc(67) int local67 = 464 - Static173.self.anInt3421 / 32;
+			@Pc(57) int local57 = Static173.self.xFine / 32 + 48;
+			@Pc(67) int local67 = 464 - Static173.self.zFine / 32;
 			if (GlRenderer.enabled) {
 				((GlSprite) Static89.aClass3_Sub2_Sub1_5).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false));
 			} else {
@@ -45,12 +45,12 @@ public final class Static54 {
 			if (Static235.mapFunctionGroup != null) {
 				for (@Pc(117) int local117 = 0; local117 < Static235.mapFunctionGroup.anInt5074; local117++) {
 					if (Static235.mapFunctionGroup.method3892(local117)) {
-						local146 = (Static235.mapFunctionGroup.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32;
+						local146 = (Static235.mapFunctionGroup.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.xFine / 32;
 						local150 = MathUtils.anIntArray223[local48];
 						local154 = MathUtils.anIntArray225[local48];
 						@Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42;
 						@Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256);
-						local181 = (Static235.mapFunctionGroup.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.anInt3421 / 32;
+						local181 = (Static235.mapFunctionGroup.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32;
 						@Pc(189) int local189 = local154 * 256 / (Static273.anInt4130 + 256);
 						local200 = local181 * local189 - local146 * local164 >> 16;
 						if (Static235.mapFunctionGroup.method3894(local117) == 1) {
@@ -72,7 +72,7 @@ public final class Static54 {
 							} else {
 								Static129.method2486(arg3.anIntArray37, arg3.anIntArray45);
 							}
-							local156.method2869(Static235.mapFunctionGroup.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
+							local156.renderParagraphAlpha(Static235.mapFunctionGroup.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0);
 							if (GlRenderer.enabled) {
 								Static46.method1173();
 							} else {
@@ -83,11 +83,11 @@ public final class Static54 {
 				}
 			}
 			for (local146 = 0; local146 < Static251.anInt5454; local146++) {
-				local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.self.anInt3412 / 32;
-				local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.self.anInt3421 / 32;
+				local181 = Static145.anIntArray331[local146] * 4 + 2 - Static173.self.xFine / 32;
+				local150 = Static93.anIntArray219[local146] * 4 + 2 - Static173.self.zFine / 32;
 				@Pc(382) LocType local382 = Static271.method4601(Static199.anIntArray417[local146]);
 				if (local382.anIntArray380 != null) {
-					local382 = local382.method3417();
+					local382 = local382.getMultiLoc();
 					if (local382 == null || local382.anInt4400 == -1) {
 						continue;
 					}
@@ -98,22 +98,22 @@ public final class Static54 {
 				for (local181 = 0; local181 < 104; local181++) {
 					@Pc(439) LinkedList local439 = Static159.aClass69ArrayArrayArray1[Static55.level][local146][local181];
 					if (local439 != null) {
-						local154 = local146 * 4 + 2 - Static173.self.anInt3412 / 32;
-						local231 = local181 * 4 + 2 - Static173.self.anInt3421 / 32;
+						local154 = local146 * 4 + 2 - Static173.self.xFine / 32;
+						local231 = local181 * 4 + 2 - Static173.self.zFine / 32;
 						Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[0], local231, local154, arg1, arg2);
 					}
 				}
 			}
 			for (local146 = 0; local146 < Static272.anInt5214; local146++) {
-				@Pc(498) Npc local498 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local146]];
+				@Pc(498) Npc local498 = Static175.npcs[Static33.anIntArray79[local146]];
 				if (local498 != null && local498.method2682()) {
-					@Pc(507) NpcType local507 = local498.aClass96_1;
+					@Pc(507) NpcType local507 = local498.type;
 					if (local507 != null && local507.anIntArray357 != null) {
-						local507 = local507.method2932();
+						local507 = local507.getMultiNpc();
 					}
 					if (local507 != null && local507.aBoolean184 && local507.aBoolean183) {
-						local154 = local498.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-						local231 = local498.anInt3421 / 32 - Static173.self.anInt3421 / 32;
+						local154 = local498.xFine / 32 - Static173.self.xFine / 32;
+						local231 = local498.zFine / 32 - Static173.self.zFine / 32;
 						if (local507.anInt3739 == -1) {
 							Static60.method1446(arg3, Static139.aClass3_Sub2_Sub1Array6[1], local231, local154, arg1, arg2);
 						} else {
@@ -125,8 +125,8 @@ public final class Static54 {
 			for (local146 = 0; local146 < Static267.anInt5774; local146++) {
 				@Pc(591) Player local591 = Static159.players[Static105.anIntArray256[local146]];
 				if (local591 != null && local591.method2682()) {
-					local154 = local591.anInt3421 / 32 - Static173.self.anInt3421 / 32;
-					local150 = local591.anInt3412 / 32 - Static173.self.anInt3412 / 32;
+					local154 = local591.zFine / 32 - Static173.self.zFine / 32;
+					local150 = local591.xFine / 32 - Static173.self.xFine / 32;
 					@Pc(624) long local624 = local591.aClass100_364.encode37();
 					@Pc(626) boolean local626 = false;
 					for (local239 = 0; local239 < Static9.anInt178; local239++) {
@@ -137,7 +137,7 @@ public final class Static54 {
 					}
 					@Pc(660) boolean local660 = false;
 					for (local271 = 0; local271 < Static214.anInt5577; local271++) {
-						if (local624 == Static199.aClass3_Sub22Array1[local271].uid) {
+						if (local624 == Static199.aClass3_Sub22Array1[local271].key) {
 							local660 = true;
 							break;
 						}
@@ -161,32 +161,32 @@ public final class Static54 {
 			for (local181 = 0; local181 < local756.length; local181++) {
 				@Pc(770) Class102 local770 = local756[local181];
 				if (local770 != null && local770.anInt4058 != 0 && Static83.loop % 20 < 10) {
-					if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.aClass8_Sub4_Sub2Array1.length) {
-						@Pc(804) Npc local804 = Static175.aClass8_Sub4_Sub2Array1[local770.anInt4057];
+					if (local770.anInt4058 == 1 && local770.anInt4057 >= 0 && local770.anInt4057 < Static175.npcs.length) {
+						@Pc(804) Npc local804 = Static175.npcs[local770.anInt4057];
 						if (local804 != null) {
-							local231 = local804.anInt3412 / 32 - Static173.self.anInt3412 / 32;
-							local200 = local804.anInt3421 / 32 - Static173.self.anInt3421 / 32;
+							local231 = local804.xFine / 32 - Static173.self.xFine / 32;
+							local200 = local804.zFine / 32 - Static173.self.zFine / 32;
 							Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
 						}
 					}
 					if (local770.anInt4058 == 2) {
-						local154 = (local770.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.anInt3412 / 32;
-						local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - Static173.self.anInt3421 / 32;
+						local154 = (local770.anInt4053 - Static225.originX) * 4 + 2 - Static173.self.xFine / 32;
+						local231 = (-Static142.originZ + local770.anInt4046) * 4 + 2 - Static173.self.zFine / 32;
 						Static97.method1960(local770.anInt4048, arg1, arg2, local154, local231, arg3);
 					}
 					if (local770.anInt4058 == 10 && local770.anInt4057 >= 0 && Static159.players.length > local770.anInt4057) {
 						@Pc(905) Player local905 = Static159.players[local770.anInt4057];
 						if (local905 != null) {
-							local200 = local905.anInt3421 / 32 - Static173.self.anInt3421 / 32;
-							local231 = local905.anInt3412 / 32 - Static173.self.anInt3412 / 32;
+							local200 = local905.zFine / 32 - Static173.self.zFine / 32;
+							local231 = local905.xFine / 32 - Static173.self.xFine / 32;
 							Static97.method1960(local770.anInt4048, arg1, arg2, local231, local200, arg3);
 						}
 					}
 				}
 			}
 			if (Static115.anInt2939 != 0) {
-				local146 = Static115.anInt2939 * 4 + 2 - Static173.self.anInt3412 / 32;
-				local181 = Static84.anInt2255 * 4 + 2 - Static173.self.anInt3421 / 32;
+				local146 = Static115.anInt2939 * 4 + 2 - Static173.self.xFine / 32;
+				local181 = Static84.anInt2255 * 4 + 2 - Static173.self.zFine / 32;
 				Static60.method1446(arg3, Static84.aClass3_Sub2_Sub1_4, local181, local146, arg1, arg2);
 			}
 			if (GlRenderer.enabled) {
@@ -202,7 +202,7 @@ public final class Static54 {
 		} else {
 			Static129.method2504(arg2, arg1, arg3.anIntArray37, arg3.anIntArray45);
 		}
-		Static31.aBooleanArray29[arg0] = true;
+		Static31.rectangleRedraw[arg0] = true;
 	}
 
 	@OriginalMember(owner = "client!ed", name = "a", descriptor = "(ZIIII)V")
@@ -291,11 +291,11 @@ public final class Static54 {
 						@Pc(125) int local125 = (Static26.anIntArray68[local5] & 0xFF) * 128;
 						@Pc(133) int local133 = Static26.anIntArray68[local5] >> 8 & 0xFF;
 						@Pc(141) int local141 = Static26.anIntArray68[local5] >> 16 & 0xFF;
-						@Pc(151) int local151 = local133 * 128 + 64 - Static173.self.anInt3421;
+						@Pc(151) int local151 = local133 * 128 + 64 - Static173.self.zFine;
 						if (local151 < 0) {
 							local151 = -local151;
 						}
-						@Pc(167) int local167 = local141 * 128 + 64 - Static173.self.anInt3412;
+						@Pc(167) int local167 = local141 * 128 + 64 - Static173.self.xFine;
 						if (local167 < 0) {
 							local167 = -local167;
 						}
diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java
index aa7250b..f12978b 100644
--- a/client/src/main/java/Static59.java
+++ b/client/src/main/java/Static59.java
@@ -2,8 +2,6 @@ import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
-import java.awt.event.KeyEvent;
-
 public final class Static59 {
 
 	@OriginalMember(owner = "client!ej", name = "X", descriptor = "I")
@@ -46,7 +44,7 @@ public final class Static59 {
 	@OriginalMember(owner = "client!ej", name = "i", descriptor = "(I)V")
 	public static void method1373() {
 		Static6.outboundBuffer.p1isaac(243);
-		Static6.outboundBuffer.p1(Static144.method2736());
+		Static6.outboundBuffer.p1(Static144.getWindowMode());
 		Static6.outboundBuffer.p2(GameShell.canvasWidth);
 		Static6.outboundBuffer.p2(GameShell.canvasHeight);
 		Static6.outboundBuffer.p1(Static186.antiAliasingMode);
diff --git a/client/src/main/java/Static6.java b/client/src/main/java/Static6.java
index cdd5dce..d49a73e 100644
--- a/client/src/main/java/Static6.java
+++ b/client/src/main/java/Static6.java
@@ -17,7 +17,7 @@ public final class Static6 {
 	public static final AnimFrameset[] aClass3_Sub2_Sub7Array1 = new AnimFrameset[14];
 
 	@OriginalMember(owner = "client!ag", name = "h", descriptor = "(I)V")
-	public static void method82() {
+	public static void quit() {
 		if (Keyboard.instance != null) {
 			@Pc(4) Keyboard local4 = Keyboard.instance;
 			synchronized (Keyboard.instance) {
diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java
index afe36bc..e136154 100644
--- a/client/src/main/java/Static60.java
+++ b/client/src/main/java/Static60.java
@@ -14,7 +14,7 @@ public final class Static60 {
 	public static int anInt1892;
 
 	@OriginalMember(owner = "client!em", name = "x", descriptor = "Lclient!cj;")
-	public static AudioThread aClass19_1;
+	public static AudioThread thread;
 
 	@OriginalMember(owner = "client!em", name = "D", descriptor = "I")
 	public static int gregorianDateSeed;
diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java
index ea41310..6c80393 100644
--- a/client/src/main/java/Static63.java
+++ b/client/src/main/java/Static63.java
@@ -39,7 +39,7 @@ public final class Static63 {
 	public static synchronized void method1485(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (arg2 == contextId) {
 			@Pc(8) IntNode local8 = new IntNode(arg1);
-			local8.uid = arg0;
+			local8.key = arg0;
 			aClass69_50.method2282(local8);
 		}
 	}
@@ -48,7 +48,7 @@ public final class Static63 {
 	public static synchronized void deleteList(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
 		if (arg1 == contextId) {
 			@Pc(7) IntNode local7 = new IntNode();
-			local7.uid = arg0;
+			local7.key = arg0;
 			aClass69_51.method2282(local7);
 		}
 	}
@@ -56,10 +56,10 @@ public final class Static63 {
 	@OriginalMember(owner = "client!fa", name = "b", descriptor = "()V")
 	public static synchronized void clear() {
 		contextId++;
-		aClass69_48.method2278();
-		aClass69_49.method2278();
-		aClass69_50.method2278();
-		aClass69_51.method2278();
+		aClass69_48.clear();
+		aClass69_49.clear();
+		aClass69_50.clear();
+		aClass69_51.clear();
 		anInt1945 = 0;
 		onCard2d = 0;
 		onCardTexture = 0;
@@ -69,7 +69,7 @@ public final class Static63 {
 	public static synchronized void method1489(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (arg2 == contextId) {
 			@Pc(8) IntNode local8 = new IntNode(arg1);
-			local8.uid = arg0;
+			local8.key = arg0;
 			aClass69_48.method2282(local8);
 		}
 	}
@@ -103,28 +103,28 @@ public final class Static63 {
 										}
 										return;
 									}
-									@Pc(126) int local126 = (int) local8.uid;
+									@Pc(126) int local126 = (int) local8.key;
 									local1.glDeleteLists(local126, 1);
 								}
 							}
-							anIntArray151[local3++] = (int) local8.uid;
-							onCardTexture -= local8.anInt3141;
+							anIntArray151[local3++] = (int) local8.key;
+							onCardTexture -= local8.value;
 							if (local3 == 1000) {
 								local1.glDeleteTextures(local3, anIntArray151, 0);
 								local3 = 0;
 							}
 						}
 					}
-					anIntArray151[local3++] = (int) local8.uid;
-					onCard2d -= local8.anInt3141;
+					anIntArray151[local3++] = (int) local8.key;
+					onCard2d -= local8.value;
 					if (local3 == 1000) {
 						local1.glDeleteTextures(local3, anIntArray151, 0);
 						local3 = 0;
 					}
 				}
 			}
-			anIntArray151[local3++] = (int) local8.uid;
-			anInt1945 -= local8.anInt3141;
+			anIntArray151[local3++] = (int) local8.key;
+			anInt1945 -= local8.value;
 			if (local3 == 1000) {
 				local1.glDeleteBuffers(local3, anIntArray151, 0);
 				local3 = 0;
@@ -136,7 +136,7 @@ public final class Static63 {
 	public static synchronized void deleteTexture2d(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
 		if (arg2 == contextId) {
 			@Pc(8) IntNode local8 = new IntNode(arg1);
-			local8.uid = arg0;
+			local8.key = arg0;
 			aClass69_49.method2282(local8);
 		}
 	}
diff --git a/client/src/main/java/Static64.java b/client/src/main/java/Static64.java
index 148dfbb..c72fc8e 100644
--- a/client/src/main/java/Static64.java
+++ b/client/src/main/java/Static64.java
@@ -37,7 +37,7 @@ public final class Static64 {
 		for (local23 = 0; local23 < Static240.anInt5335; local23++) {
 			@Pc(30) int local30 = Static52.anIntArray136[local23];
 			if (Static83.loop != Static159.players[local30].anInt3430) {
-				if (Static159.players[local30].anInt1664 > 0) {
+				if (Static159.players[local30].soundRadius > 0) {
 					Static271.method4597(Static159.players[local30]);
 				}
 				Static159.players[local30] = null;
@@ -59,31 +59,31 @@ public final class Static64 {
 			return;
 		}
 		if (Static9.anInt178 >= 100 && !Static202.aBoolean233 || Static9.anInt178 >= 200) {
-			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.FRIENDLISTFULL);
+			Static103.method2231(Static186.EMPTY, 0, LocalizedText.FRIENDLISTFULL);
 			return;
 		}
 		@Pc(35) JagString local35 = Static79.decode37(arg0).method3125();
 		@Pc(42) int local42;
 		for (local42 = 0; local42 < Static9.anInt178; local42++) {
 			if (Static92.aLongArray3[local42] == arg0) {
-				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE}));
+				Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { local35, LocalizedText.FRIENDLISTDUPE}));
 				return;
 			}
 		}
 		for (local42 = 0; local42 < Static35.anInt1093; local42++) {
 			if (arg0 == Static190.aLongArray6[local42]) {
-				Static103.method2231(Static186.EMPTY_FILE, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE}));
+				Static103.method2231(Static186.EMPTY, 0, Static34.concatenate(new JagString[] { LocalizedText.REMOVESOCIAL1, local35, LocalizedText.REMOVEIGNORE}));
 				return;
 			}
 		}
 		if (local35.strEquals(Static173.self.aClass100_364)) {
-			Static103.method2231(Static186.EMPTY_FILE, 0, LocalizedText.FRIENDCANTADDSELF);
+			Static103.method2231(Static186.EMPTY, 0, LocalizedText.FRIENDCANTADDSELF);
 			return;
 		}
 		Static122.aClass100Array92[Static9.anInt178] = local35;
 		Static92.aLongArray3[Static9.anInt178] = arg0;
 		Static104.anIntArray255[Static9.anInt178] = 0;
-		Static214.aClass100Array170[Static9.anInt178] = Static186.EMPTY_FILE;
+		Static214.aClass100Array170[Static9.anInt178] = Static186.EMPTY;
 		Static106.anIntArray258[Static9.anInt178] = 0;
 		Static3.aBooleanArray135[Static9.anInt178] = false;
 		Static9.anInt178++;
diff --git a/client/src/main/java/Static66.java b/client/src/main/java/Static66.java
index 731e8e1..96a4da6 100644
--- a/client/src/main/java/Static66.java
+++ b/client/src/main/java/Static66.java
@@ -3,5 +3,5 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static66 {
 
 	@OriginalMember(owner = "client!fd", name = "e", descriptor = "I")
-	public static final int anInt1956 = WorldMapFont.aString2.length();
+	public static final int ALPHABET_SIZE = WorldMapFont.ALPHABET.length();
 }
diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java
index 1ed31d9..357d061 100644
--- a/client/src/main/java/Static69.java
+++ b/client/src/main/java/Static69.java
@@ -168,7 +168,7 @@ public final class Static69 {
 				local22 = -1;
 			}
 			if (Static196.aClass10_Sub1Array2[local18] != null) {
-				Static196.aClass10_Sub1Array2[local18].anInt379 = local22;
+				Static196.aClass10_Sub1Array2[local18].players = local22;
 			}
 		}
 	}
diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java
index bd771d2..4111b4c 100644
--- a/client/src/main/java/Static7.java
+++ b/client/src/main/java/Static7.java
@@ -12,7 +12,7 @@ public final class Static7 {
 	public static int anInt986;
 
 	@OriginalMember(owner = "client!ah", name = "i", descriptor = "Lclient!n;")
-	public static final SoftLruHashTable aClass99_5 = new SoftLruHashTable(2);
+	public static final SoftLruHashTable sprites = new SoftLruHashTable(2);
 
 	@OriginalMember(owner = "client!ah", name = "j", descriptor = "[I")
 	public static final int[] varps = new int[2500];
@@ -28,7 +28,7 @@ public final class Static7 {
 
 	@OriginalMember(owner = "client!ah", name = "a", descriptor = "(BZ)V")
 	public static void ping(@OriginalArg(1) boolean arg0) {
-		Static107.method2261();
+		Static107.loop();
 		if (Static244.gameState != 30 && Static244.gameState != 25) {
 			return;
 		}
@@ -46,7 +46,7 @@ public final class Static7 {
 				Static224.aBoolean247 = true;
 			}
 		}
-		Static107.method2261();
+		Static107.loop();
 	}
 
 	@OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java
index 1f84cc1..216f064 100644
--- a/client/src/main/java/Static70.java
+++ b/client/src/main/java/Static70.java
@@ -29,7 +29,7 @@ public final class Static70 {
 	public static JagString method1548(@OriginalArg(1) int arg0) {
 		@Pc(9) JagString local9 = Static123.parseInt(arg0);
 		for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) {
-			local9 = Static34.concatenate(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.method3136(local21) });
+			local9 = Static34.concatenate(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.substring(local21) });
 		}
 		if (local9.length() > 9) {
 			return Static34.concatenate(new JagString[] { Static250.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 });
@@ -45,7 +45,7 @@ public final class Static70 {
 		for (@Pc(11) int local11 = 0; local11 < Static98.anInt2510; local11++) {
 			@Pc(18) FloType local18 = Static256.method4395(local11);
 			if (local18 != null) {
-				@Pc(24) int local24 = local18.anInt5892;
+				@Pc(24) int local24 = local18.texture;
 				if (local24 >= 0 && !Rasteriser.textureProvider.method3236(local24)) {
 					local24 = -1;
 				}
diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java
index b0c378d..0ee9665 100644
--- a/client/src/main/java/Static71.java
+++ b/client/src/main/java/Static71.java
@@ -21,7 +21,7 @@ public final class Static71 {
 
 	@OriginalMember(owner = "client!fk", name = "a", descriptor = "(IB)Lclient!h;")
 	public static ObjType method1439(@OriginalArg(0) int arg0) {
-		@Pc(6) ObjType local6 = (ObjType) Static27.aClass99_4.method3106((long) arg0);
+		@Pc(6) ObjType local6 = (ObjType) Static27.aClass99_4.get((long) arg0);
 		if (local6 != null) {
 			return local6;
 		}
@@ -45,7 +45,7 @@ public final class Static71 {
 			local6.aBoolean132 = false;
 			local6.aClass100Array72 = Static269.aClass100Array87;
 		}
-		Static27.aClass99_4.method3095(local6, (long) arg0);
+		Static27.aClass99_4.put(local6, (long) arg0);
 		return local6;
 	}
 
@@ -76,7 +76,7 @@ public final class Static71 {
 			}
 			@Pc(31) Player local31 = Static159.players[local21];
 			if (local31 != null) {
-				Static263.method4514(local31.method2693(), local31);
+				Static263.method4514(local31.getSize(), local31);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static72.java b/client/src/main/java/Static72.java
index bb21894..b6a1299 100644
--- a/client/src/main/java/Static72.java
+++ b/client/src/main/java/Static72.java
@@ -30,13 +30,13 @@ public final class Static72 {
 
 	@OriginalMember(owner = "client!fl", name = "b", descriptor = "(II)Lclient!cl;")
 	public static AnimFrameset method1566(@OriginalArg(0) int arg0) {
-		@Pc(19) AnimFrameset local19 = (AnimFrameset) Static267.aClass99_37.method3106((long) arg0);
+		@Pc(19) AnimFrameset local19 = (AnimFrameset) Static267.aClass99_37.get((long) arg0);
 		if (local19 != null) {
 			return local19;
 		}
 		local19 = Static87.method1803(Static225.aClass153_92, Static5.aClass153_1, arg0);
 		if (local19 != null) {
-			Static267.aClass99_37.method3095(local19, (long) arg0);
+			Static267.aClass99_37.put(local19, (long) arg0);
 		}
 		return local19;
 	}
diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java
index 19d8278..169ccf3 100644
--- a/client/src/main/java/Static73.java
+++ b/client/src/main/java/Static73.java
@@ -31,7 +31,7 @@ public final class Static73 {
 			if (Static154.topLevelInterface != -1) {
 				Static109.method2275(Static154.topLevelInterface);
 			}
-			for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.method3859(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.method3861()) {
+			for (@Pc(18) Class3_Sub31 local18 = (Class3_Sub31) Static119.aClass133_9.head(); local18 != null; local18 = (Class3_Sub31) Static119.aClass133_9.next()) {
 				Static132.method2605(true, local18);
 			}
 			Static154.topLevelInterface = -1;
@@ -45,8 +45,8 @@ public final class Static73 {
 		Static35.anInt1092 = -1;
 		Static81.method1750(Static270.anInt5794);
 		Static173.self = new Player();
-		Static173.self.anInt3421 = 3000;
-		Static173.self.anInt3412 = 3000;
+		Static173.self.zFine = 3000;
+		Static173.self.xFine = 3000;
 		if (!GlRenderer.enabled) {
 			Static145.method2743(Static209.js5Archive8);
 			Static196.setGameState(10);
diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java
index 74448e2..f1e8ec0 100644
--- a/client/src/main/java/Static75.java
+++ b/client/src/main/java/Static75.java
@@ -400,7 +400,7 @@ public final class Static75 {
 								local1184 = local39 - 1;
 								local1188 = local1184 & 0x7FF;
 								local1194 = local1184 >> 11 & 0xF;
-								local1198 = Static175.aClass8_Sub4_Sub2Array1[local1188];
+								local1198 = Static175.npcs[local1188];
 							} else {
 								local1184 = -local39 - 1;
 								local1194 = local1184 >> 11 & 0xF;
@@ -413,10 +413,10 @@ public final class Static75 {
 							}
 							if (local1198 != null) {
 								@Pc(1232) BasType local1232 = local1198.method2681();
-								if (local1232.anIntArrayArray7 != null && local1232.anIntArrayArray7[local1194] != null) {
-									local1188 = local1232.anIntArrayArray7[local1194][0];
-									local224 -= local1232.anIntArrayArray7[local1194][1];
-									@Pc(1264) int local1264 = local1232.anIntArrayArray7[local1194][2];
+								if (local1232.modelRotateTranslate != null && local1232.modelRotateTranslate[local1194] != null) {
+									local1188 = local1232.modelRotateTranslate[local1194][0];
+									local224 -= local1232.modelRotateTranslate[local1194][1];
+									@Pc(1264) int local1264 = local1232.modelRotateTranslate[local1194][2];
 									@Pc(1269) int local1269 = MathUtils.anIntArray223[local1198.anInt3381];
 									@Pc(1274) int local1274 = MathUtils.anIntArray225[local1198.anInt3381];
 									@Pc(1284) int local1284 = local1188 * local1274 + local1264 * local1269 >> 16;
@@ -463,7 +463,7 @@ public final class Static75 {
 						if (local1565 != null) {
 							for (@Pc(1572) ObjStackNode local1572 = (ObjStackNode) local1565.method2289(); local1572 != null; local1572 = (ObjStackNode) local1565.method2288()) {
 								if (local1572.aClass8_Sub7_1.anInt5555 == (local27 & 0x7FFF)) {
-									local1572.method4658();
+									local1572.unlink();
 									break;
 								}
 							}
diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java
index ec324e1..0890631 100644
--- a/client/src/main/java/Static78.java
+++ b/client/src/main/java/Static78.java
@@ -164,7 +164,7 @@ public final class Static78 {
 			Static114.drawTextOnScreen(true, Static34.concatenate(new JagString[] { LocalizedText.LOADING, Static18.COMPLETE_PERCENT}));
 		}
 
-		Static107.method2261();
+		Static107.loop();
 		Static217.method3768();
 		@Pc(420) boolean hasUnderWaterMap = false;
 		@Pc(427) int i;
@@ -202,7 +202,7 @@ public final class Static78 {
 		if (GlRenderer.enabled) {
 			Static75.setDefaultChunksAtmosphere();
 		}
-		Static107.method2261();
+		Static107.loop();
 		System.gc();
 		Static7.ping(true);
 		Static196.method3535(false);
@@ -281,7 +281,7 @@ public final class Static78 {
 			}
 		}
 		Static269.method2218();
-		Static107.method2261();
+		Static107.loop();
 		Static219.method3796();
 		Static217.method3768();
 		Static231.aBoolean252 = false;
@@ -312,7 +312,7 @@ public final class Static78 {
 			}
 		}
 		Static141.method2720();
-		Static107.method2261();
-		Static234.method4020();
+		Static107.loop();
+		Static234.resetTimer();
 	}
 }
diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java
index 8677a69..7d693b2 100644
--- a/client/src/main/java/Static80.java
+++ b/client/src/main/java/Static80.java
@@ -30,7 +30,7 @@ public final class Static80 {
 	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 method3613(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
+	public static SoftwareSprite loadSoftwareAlphaSprite(@OriginalArg(0) Js5 arg0, @OriginalArg(2) int arg1) {
 		return Static234.method4016(arg0, 0, arg1) ? Static102.method2071() : null;
 	}
 
@@ -122,7 +122,7 @@ public final class Static80 {
 	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lclient!na;II)V")
 	public static void method3617(@OriginalArg(0) JagString arg0, @OriginalArg(2) int arg1) {
 		@Pc(6) DelayedStateChange local6 = Static238.method4143(3, arg1);
-		local6.method1017();
+		local6.pushServer();
 		local6.stringArg = arg0;
 	}
 }
diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java
index 89c06f4..cc9ceab 100644
--- a/client/src/main/java/Static81.java
+++ b/client/src/main/java/Static81.java
@@ -37,11 +37,11 @@ public final class Static81 {
 		}
 		if (arg0 != -1) {
 			@Pc(24) CursorType local24 = Static202.method3660(arg0);
-			@Pc(28) SoftwareSprite local28 = local24.method2246();
+			@Pc(28) SoftwareSprite local28 = local24.getSprite();
 			if (local28 == null) {
 				arg0 = -1;
 			} else {
-				GameShell.signLink.setCursor(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.anInt2852, local24.anInt2850), local28.anInt1866);
+				GameShell.signLink.setCursor(local28.method301(), local28.anInt1860, GameShell.canvas, new Point(local24.hotSpotX, local24.hotSpotY), local28.anInt1866);
 				Static115.anInt2941 = arg0;
 			}
 		}
@@ -58,7 +58,7 @@ public final class Static81 {
 
 	@OriginalMember(owner = "client!gg", name = "d", descriptor = "(II)Lclient!dm;")
 	public static IdkType method1752(@OriginalArg(0) int arg0) {
-		@Pc(10) IdkType local10 = (IdkType) Static67.aClass99_20.method3106((long) arg0);
+		@Pc(10) IdkType local10 = (IdkType) Static67.aClass99_20.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -67,7 +67,7 @@ public final class Static81 {
 		if (local21 != null) {
 			local10.method1209(new Buffer(local21));
 		}
-		Static67.aClass99_20.method3095(local10, (long) arg0);
+		Static67.aClass99_20.put(local10, (long) arg0);
 		return local10;
 	}
 
@@ -287,8 +287,8 @@ public final class Static81 {
 		@Pc(782) int modelId;
 		// DelayedStateChange
 		for (@Pc(709) DelayedStateChange change = Static127.poll(); change != null; change = Static127.poll()) {
-			samples = change.method1011();
-			i = change.method1012();
+			samples = change.getType();
+			i = change.getId();
 			if (samples == 1) {
 				Static155.varcs[i] = change.intArg1;
 				Static138.updatedVarcs[Static4.updatedVarcsWriterIndex++ & 0x1F] = i;
diff --git a/client/src/main/java/Static84.java b/client/src/main/java/Static84.java
index 6971e88..028e715 100644
--- a/client/src/main/java/Static84.java
+++ b/client/src/main/java/Static84.java
@@ -120,13 +120,13 @@ public final class Static84 {
 			arg2.anInt3395 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop;
 			arg2.anInt3386 = Static57.aClass3_Sub15_Sub1_3.g2le() + Static83.loop;
 			arg2.anInt3431 = Static57.aClass3_Sub15_Sub1_3.p1neg();
-			arg2.anInt3409 = 1;
+			arg2.movementQueueSize = 1;
 			arg2.anInt3405 = 0;
 		}
 		if ((arg0 & 0x20) != 0) {
 			arg2.aClass100_640 = Static57.aClass3_Sub15_Sub1_3.gjstr();
 			if (arg2.aClass100_640.charAt(0) == 126) {
-				arg2.aClass100_640 = arg2.aClass100_640.method3136(1);
+				arg2.aClass100_640 = arg2.aClass100_640.substring(1);
 				Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640);
 			} else if (arg2 == Static173.self) {
 				Static103.method2231(arg2.method1264(), 2, arg2.aClass100_640);
@@ -181,7 +181,7 @@ public final class Static84 {
 					if (local24 != -1) {
 						@Pc(663) SeqType local663 = Static36.method941(local24);
 						if (local663 != null && local663.anIntArray473 != null) {
-							Static152.method2836(arg2.anInt3421, local663, arg2.anInt3412, arg2 == Static173.self, 0);
+							Static152.method2836(arg2.zFine, local663, arg2.xFine, arg2 == Static173.self, 0);
 						}
 					}
 				}
diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java
index df8ee41..de6b1aa 100644
--- a/client/src/main/java/Static86.java
+++ b/client/src/main/java/Static86.java
@@ -39,19 +39,19 @@ public final class Static86 {
 		@Pc(19) int local19;
 		for (local19 = 0; local19 < Static240.anInt5335; local19++) {
 			@Pc(30) int local30 = Static52.anIntArray136[local19];
-			if (Static175.aClass8_Sub4_Sub2Array1[local30].anInt3430 != Static83.loop) {
-				if (Static175.aClass8_Sub4_Sub2Array1[local30].aClass96_1.method2935()) {
-					Static91.method1877(Static175.aClass8_Sub4_Sub2Array1[local30]);
+			if (Static175.npcs[local30].anInt3430 != Static83.loop) {
+				if (Static175.npcs[local30].type.method2935()) {
+					Static91.method1877(Static175.npcs[local30]);
 				}
-				Static175.aClass8_Sub4_Sub2Array1[local30].method2698(null);
-				Static175.aClass8_Sub4_Sub2Array1[local30] = null;
+				Static175.npcs[local30].method2698(null);
+				Static175.npcs[local30] = null;
 			}
 		}
 		if (Static223.anInt5028 != Static57.aClass3_Sub15_Sub1_3.offset) {
 			throw new RuntimeException("gnp1 pos:" + Static57.aClass3_Sub15_Sub1_3.offset + " psize:" + Static223.anInt5028);
 		}
 		for (local19 = 0; local19 < Static272.anInt5214; local19++) {
-			if (Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local19]] == null) {
+			if (Static175.npcs[Static33.anIntArray79[local19]] == null) {
 				throw new RuntimeException("gnp2 pos:" + local19 + " size:" + Static272.anInt5214);
 			}
 		}
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 764962e..d56fa77 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -14,11 +14,11 @@ public final class Static87 {
 	public static final SoftLruHashTable aClass99_12 = new SoftLruHashTable(20);
 
 	@OriginalMember(owner = "client!gn", name = "v", descriptor = "Lclient!na;")
-	public static final JagString aClass100_494 = Static28.parse("null");
+	public static final JagString NULL = Static28.parse("null");
 
 	@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Z)Z")
 	public static boolean showVideoAd() {
-		if (Static150.aBoolean175) {
+		if (Static150.objectTag) {
 			try {
 				Static9.aClass100_35.method3157(GameShell.signLink.applet);
 				return true;
@@ -83,7 +83,7 @@ public final class Static87 {
 			local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ;
 			local53 = local9[local20];
 			if (local53 != null) {
-				Static107.method2261();
+				Static107.loop();
 				Static269.method2203(Static148.collisionMaps, arg0, Static80.anInt4701 * 8 - 48, local49, local38, (Static52.anInt1695 - 6) * 8, local53);
 			}
 		}
@@ -92,7 +92,7 @@ public final class Static87 {
 			local49 = (Static238.regionBitPacked[local20] & 0xFF) * 64 - Static142.originZ;
 			local53 = local9[local20];
 			if (local53 == null && Static52.anInt1695 < 800) {
-				Static107.method2261();
+				Static107.loop();
 				for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
 					Static23.method645(local130, local49, local38, 64, 64);
 				}
@@ -244,8 +244,8 @@ public final class Static87 {
 								local518 = (Static273.anInt4130 + 256) * local518 >> 8;
 								local545 = local518 * local276 - local514 * local270 >> 11;
 								local556 = local276 * local514 + local270 * local518 >> 11;
-								local563 = Static173.self.anInt3412 + local556 >> 7;
-								local571 = Static173.self.anInt3421 - local545 >> 7;
+								local563 = Static173.self.xFine + local556 >> 7;
+								local571 = Static173.self.zFine - local545 >> 7;
 								if (Static241.aBoolean302 && (Static274.anInt4999 & 0x40) != 0) {
 									@Pc(583) Component local583 = Static201.method1418(Static98.anInt2512, Static15.anInt506);
 									if (local583 == null) {
@@ -256,9 +256,9 @@ public final class Static87 {
 									continue;
 								}
 								if (Static266.game == 1) {
-									Static98.method1966(-1, 1L, Static186.EMPTY_FILE, local563, (short) 36, LocalizedText.FACEHERE, local571);
+									Static98.method1966(-1, 1L, Static186.EMPTY, local563, (short) 36, LocalizedText.FACEHERE, local571);
 								}
-								Static98.method1966(-1, 1L, Static186.EMPTY_FILE, local563, (short) 60, Static195.aClass100_859, local571);
+								Static98.method1966(-1, 1L, Static186.EMPTY, local563, (short) 60, Static195.aClass100_859, local571);
 								continue;
 							}
 							if (local30.anInt453 == 1339) {
@@ -275,7 +275,7 @@ public final class Static87 {
 							if (local30.anInt453 == 1400) {
 								Static269.method2225(local123, local114, local30.anInt459, local30.anInt445);
 								Static186.aBooleanArray100[local57] = true;
-								Static31.aBooleanArray29[local57] = true;
+								Static31.rectangleRedraw[local57] = true;
 								if (GlRenderer.enabled) {
 									Static46.method1187(arg0, arg6, arg4, arg7);
 								} else {
@@ -286,7 +286,7 @@ public final class Static87 {
 							if (local30.anInt453 == 1401) {
 								Static1.method4(local123, local30.anInt459, local30.anInt445, local114);
 								Static186.aBooleanArray100[local57] = true;
-								Static31.aBooleanArray29[local57] = true;
+								Static31.rectangleRedraw[local57] = true;
 								if (GlRenderer.enabled) {
 									Static46.method1187(arg0, arg6, arg4, arg7);
 								} else {
@@ -298,7 +298,7 @@ public final class Static87 {
 								if (!GlRenderer.enabled) {
 									Static221.method3392(local123, local114);
 									Static186.aBooleanArray100[local57] = true;
-									Static31.aBooleanArray29[local57] = true;
+									Static31.rectangleRedraw[local57] = true;
 								}
 								continue;
 							}
@@ -308,7 +308,7 @@ public final class Static87 {
 								}
 								local270 = local30.anInt445 + local123;
 								local276 = local114 + 15;
-								Static215.aClass3_Sub2_Sub9_32.method2864(Static34.concatenate(new JagString[] { Static101.aClass100_539, Static123.parseInt(GameShell.framesPerSecond) }), local270, local276, 16776960, -1);
+								Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static101.aClass100_539, Static123.parseInt(GameShell.framesPerSecond) }), local270, local276, 16776960, -1);
 								local276 += 15;
 								@Pc(795) Runtime local795 = Runtime.getRuntime();
 								local503 = (int) ((local795.totalMemory() - local795.freeMemory()) / 1024L);
@@ -316,7 +316,7 @@ public final class Static87 {
 								if (local503 > 65536) {
 									local514 = 16711680;
 								}
-								Static215.aClass3_Sub2_Sub9_32.method2864(Static34.concatenate(new JagString[] { Static25.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1);
+								Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static25.aClass100_154, Static123.parseInt(local503), Static17.aClass100_101 }), local270, local276, local514, -1);
 								local276 += 15;
 								if (GlRenderer.enabled) {
 									local514 = 16776960;
@@ -324,7 +324,7 @@ public final class Static87 {
 									if (local518 > 65536) {
 										local514 = 16711680;
 									}
-									Static215.aClass3_Sub2_Sub9_32.method2864(Static34.concatenate(new JagString[] { Static198.aClass100_264, Static123.parseInt(local518), Static17.aClass100_101 }), local270, local276, local514, -1);
+									Static215.aClass3_Sub2_Sub9_32.renderRight(Static34.concatenate(new JagString[] { Static198.aClass100_264, Static123.parseInt(local518), Static17.aClass100_101 }), local270, local276, local514, -1);
 									local276 += 15;
 								}
 								local518 = 0;
@@ -338,10 +338,10 @@ public final class Static87 {
 								local571 = local556 * 10000 / local518;
 								local563 = local545 * 100 / local518;
 								@Pc(968) JagString local968 = Static34.concatenate(new JagString[] { Static43.aClass100_334, Static182.valueToBase10String(0, true, 2, (long) local571), Static147.aClass100_672, Static123.parseInt(local563), Static14.aClass100_80 });
-								Static114.aClass3_Sub2_Sub9_42.method2864(local968, local270, local276, 16776960, -1);
+								Static114.aClass3_Sub2_Sub9_42.renderRight(local968, local270, local276, 16776960, -1);
 								local276 += 12;
 								Static186.aBooleanArray100[local57] = true;
-								Static31.aBooleanArray29[local57] = true;
+								Static31.rectangleRedraw[local57] = true;
 								continue;
 							}
 							if (local30.anInt453 == 1406) {
@@ -356,7 +356,7 @@ public final class Static87 {
 								Static231.anInt5204 = 1;
 								Static190.anIntArray382[0] = Static35.anInt1092;
 								Static254.aClass100Array168[0] = LocalizedText.CANCEL;
-								Static233.aClass100Array160[0] = Static186.EMPTY_FILE;
+								Static233.aClass100Array160[0] = Static186.EMPTY;
 								Static39.aShortArray6[0] = 1005;
 							}
 							if (local166 <= Static155.anInt3751 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && local291 > Static60.anInt1892) {
@@ -386,7 +386,7 @@ public final class Static87 {
 									Static231.anInt5204 = 1;
 									Static190.anIntArray382[0] = Static35.anInt1092;
 									Static39.aShortArray6[0] = 1005;
-									Static233.aClass100Array160[0] = Static186.EMPTY_FILE;
+									Static233.aClass100Array160[0] = Static186.EMPTY;
 								}
 								Static6.method86(local1186.anInt5878, local166, local302, local123, local57, local291, local164, local114);
 							}
@@ -397,7 +397,7 @@ public final class Static87 {
 								Rasteriser.prepare();
 							}
 						}
-						if (Static223.aBooleanArray116[local57] || Static199.anInt4672 > 1) {
+						if (Static223.aBooleanArray116[local57] || Static199.rectDebug > 1) {
 							if (local30.type == 0 && !local30.aBoolean32 && local30.anInt491 > local30.anInt459) {
 								Static74.method1624(local30.scrollY, local30.anInt491, local30.anInt445 + local123, local114, local30.anInt459);
 							}
@@ -792,9 +792,9 @@ public final class Static87 {
 															if (local30.anInt460 == 0) {
 																local1921.method2857(local3159, local556, local545, local30.anInt474, local30.aBoolean28 ? 0 : -1);
 															} else if (local30.anInt460 == 1) {
-																local1921.method2875(local3159, local556 + 57, local545, local30.anInt474, local30.aBoolean28 ? 0 : -1);
+																local1921.renderCenter(local3159, local556 + 57, local545, local30.anInt474, local30.aBoolean28 ? 0 : -1);
 															} else {
-																local1921.method2864(local3159, local556 + 115 - 1, local545, local30.anInt474, local30.aBoolean28 ? 0 : -1);
+																local1921.renderRight(local3159, local556 + 115 - 1, local545, local30.anInt474, local30.aBoolean28 ? 0 : -1);
 															}
 														}
 														local276++;
@@ -812,13 +812,13 @@ public final class Static87 {
 													local518 = local3297.indexOf(Static269.aClass100_556);
 													if (local518 == -1) {
 														local3325 = local3297;
-														local3297 = Static186.EMPTY_FILE;
+														local3297 = Static186.EMPTY;
 													} else {
 														local3325 = local3297.substring(local518, 0);
-														local3297 = local3297.method3136(local518 + 4);
+														local3297 = local3297.substring(local518 + 4);
 													}
-													local556 = local3299.method2858(local3325);
-													local276 += local3299.anInt3626 + 1;
+													local556 = local3299.getStringWidth(local3325);
+													local276 += local3299.lineHeight + 1;
 													if (local270 < local556) {
 														local270 = local556;
 													}
@@ -844,19 +844,19 @@ public final class Static87 {
 													Static129.method2483(local518, local556, local270, local276, 0);
 												}
 												local3297 = local30.aClass100_84;
-												local545 = local556 + local3299.anInt3626 + 2;
+												local545 = local556 + local3299.lineHeight + 2;
 												local3297 = Static127.method2465(local30, local3297);
 												while (local3297.length() > 0) {
 													local563 = local3297.indexOf(Static269.aClass100_556);
 													if (local563 == -1) {
 														local3325 = local3297;
-														local3297 = Static186.EMPTY_FILE;
+														local3297 = Static186.EMPTY;
 													} else {
 														local3325 = local3297.substring(local563, 0);
-														local3297 = local3297.method3136(local563 + 4);
+														local3297 = local3297.substring(local563 + 4);
 													}
 													local3299.method2857(local3325, local518 + 3, local545, 0, -1);
-													local545 += local3299.anInt3626 + 1;
+													local545 += local3299.lineHeight + 1;
 												}
 											}
 											if (local30.type == 9) {
diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java
index 06725d0..8cf937b 100644
--- a/client/src/main/java/Static88.java
+++ b/client/src/main/java/Static88.java
@@ -315,7 +315,7 @@ public final class Static88 {
 						isp--;
 						@Pc(1002) IntNode local1002 = (IntNode) local992.get((long) Static254.intStack[isp]);
 						if (local1002 != null) {
-							pc += local1002.anInt3141;
+							pc += local1002.value;
 						}
 						continue;
 					}
@@ -1364,8 +1364,8 @@ public final class Static88 {
 									}
 									if (opcode == 3308) {
 										type = Static55.level;
-										local803 = Static225.originX + (Static173.self.anInt3412 >> 7);
-										local1052 = (Static173.self.anInt3421 >> 7) + Static142.originZ;
+										local803 = Static225.originX + (Static173.self.xFine >> 7);
+										local1052 = (Static173.self.zFine >> 7) + Static142.originZ;
 										Static254.intStack[isp++] = (type << 28) - (-(local803 << 14) - local1052);
 										continue;
 									}
@@ -1497,7 +1497,7 @@ public final class Static88 {
 										continue;
 									}
 									if (opcode == 3335) {
-										Static254.intStack[isp++] = Static141.anInt3470;
+										Static254.intStack[isp++] = Static141.language;
 										continue;
 									}
 									if (opcode == 3336) {
@@ -1513,7 +1513,7 @@ public final class Static88 {
 										continue;
 									}
 									if (opcode == 3337) {
-										Static254.intStack[isp++] = Static204.anInt4760;
+										Static254.intStack[isp++] = Static204.affiliate;
 										continue;
 									}
 								} else if (opcode < 3500) {
@@ -1523,9 +1523,9 @@ public final class Static88 {
 										type = Static254.intStack[isp];
 										local803 = Static254.intStack[isp + 1];
 										local3422 = Static253.method4330(type);
-										if (local3422.anInt3950 == 115) {
+										if (local3422.valueType == 115) {
 										}
-										Static3.stringStack[ssp++] = local3422.method3085(local803);
+										Static3.stringStack[ssp++] = local3422.getString(local803);
 										continue;
 									}
 									if (opcode == 3408) {
@@ -1535,11 +1535,11 @@ public final class Static88 {
 										local652 = Static254.intStack[isp + 3];
 										local1052 = Static254.intStack[isp + 2];
 										@Pc(3469) EnumType local3469 = Static253.method4330(local1052);
-										if (local3469.anInt3957 == type && local3469.anInt3950 == local803) {
+										if (local3469.keyType == type && local3469.valueType == local803) {
 											if (local803 == 115) {
-												Static3.stringStack[ssp++] = local3469.method3085(local652);
+												Static3.stringStack[ssp++] = local3469.getString(local652);
 											} else {
-												Static254.intStack[isp++] = local3469.method3089(local652);
+												Static254.intStack[isp++] = local3469.getInt(local652);
 											}
 											continue;
 										}
@@ -1554,10 +1554,10 @@ public final class Static88 {
 											throw new RuntimeException("C3409-2");
 										}
 										@Pc(3549) EnumType local3549 = Static253.method4330(local803);
-										if (local3549.anInt3950 != type) {
+										if (local3549.valueType != type) {
 											throw new RuntimeException("C3409-1");
 										}
-										Static254.intStack[isp++] = local3549.method3090(local1052) ? 1 : 0;
+										Static254.intStack[isp++] = local3549.containsValue(local1052) ? 1 : 0;
 										continue;
 									}
 									if (opcode == 3410) {
@@ -1569,17 +1569,17 @@ public final class Static88 {
 											throw new RuntimeException("C3410-2");
 										}
 										local3422 = Static253.method4330(type);
-										if (local3422.anInt3950 != 115) {
+										if (local3422.valueType != 115) {
 											throw new RuntimeException("C3410-1");
 										}
-										Static254.intStack[isp++] = local3422.method3086(local2522) ? 1 : 0;
+										Static254.intStack[isp++] = local3422.containsValue(local2522) ? 1 : 0;
 										continue;
 									}
 									if (opcode == 3411) {
 										isp--;
 										type = Static254.intStack[isp];
 										@Pc(3645) EnumType local3645 = Static253.method4330(type);
-										Static254.intStack[isp++] = local3645.aClass133_16.method3864();
+										Static254.intStack[isp++] = local3645.table.method3864();
 										continue;
 									}
 								} else if (opcode < 3700) {
@@ -1658,8 +1658,8 @@ public final class Static88 {
 									if (opcode == 3609) {
 										ssp--;
 										string = Static3.stringStack[ssp];
-										if (string.method3138(Static72.aClass100_446) || string.method3138(Static101.aClass100_537)) {
-											string = string.method3136(7);
+										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+											string = string.substring(7);
 										}
 										Static254.intStack[isp++] = Static98.method1965(string) ? 1 : 0;
 										continue;
@@ -1765,8 +1765,8 @@ public final class Static88 {
 									if (opcode == 3623) {
 										ssp--;
 										string = Static3.stringStack[ssp];
-										if (string.method3138(Static72.aClass100_446) || string.method3138(Static101.aClass100_537)) {
-											string = string.method3136(7);
+										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+											string = string.substring(7);
 										}
 										Static254.intStack[isp++] = Static238.method4144(string) ? 1 : 0;
 										continue;
@@ -1812,14 +1812,14 @@ public final class Static88 {
 									if (opcode == 3628) {
 										ssp--;
 										string = Static3.stringStack[ssp];
-										if (string.method3138(Static72.aClass100_446) || string.method3138(Static101.aClass100_537)) {
-											string = string.method3136(7);
+										if (string.startsWith(Static72.aClass100_446) || string.startsWith(Static101.aClass100_537)) {
+											string = string.substring(7);
 										}
 										Static254.intStack[isp++] = Static4.method25(string);
 										continue;
 									}
 									if (opcode == 3629) {
-										Static254.intStack[isp++] = Static279.anInt5880;
+										Static254.intStack[isp++] = Static279.country;
 										continue;
 									}
 								} else if (opcode < 4000) {
@@ -2216,119 +2216,119 @@ public final class Static88 {
 												if (opcode == 5008) {
 													ssp--;
 													string = Static3.stringStack[ssp];
-													if (!string.method3138(Static12.aClass100_74)) {
+													if (!string.startsWith(Static12.aClass100_74)) {
 														if (Static191.staffModLevel == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) {
 															continue;
 														}
 														local2522 = string.toLowerCase();
 														@Pc(5555) byte local5555 = 0;
-														if (local2522.method3138(LocalizedText.STABLE_CHATCOL0)) {
+														if (local2522.startsWith(LocalizedText.STABLE_CHATCOL0)) {
 															local5555 = 0;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL0.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL1)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL1.length());
+															string = string.substring(LocalizedText.STABLE_CHATCOL0.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL1)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL1.length());
 															local5555 = 1;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL2)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL2.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL2)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL2.length());
 															local5555 = 2;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL3)) {
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL3)) {
 															local5555 = 3;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL3.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL4)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL4.length());
+															string = string.substring(LocalizedText.STABLE_CHATCOL3.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL4)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL4.length());
 															local5555 = 4;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL5)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL5.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL5)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL5.length());
 															local5555 = 5;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL6)) {
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL6)) {
 															local5555 = 6;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL6.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL7)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL6.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL7)) {
 															local5555 = 7;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL7.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL8)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL8.length());
+															string = string.substring(LocalizedText.STABLE_CHATCOL7.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL8)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL8.length());
 															local5555 = 8;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL9)) {
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL9)) {
 															local5555 = 9;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL9.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL10)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL9.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL10)) {
 															local5555 = 10;
-															string = string.method3136(LocalizedText.STABLE_CHATCOL10.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATCOL11)) {
-															string = string.method3136(LocalizedText.STABLE_CHATCOL11.length());
+															string = string.substring(LocalizedText.STABLE_CHATCOL10.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATCOL11)) {
+															string = string.substring(LocalizedText.STABLE_CHATCOL11.length());
 															local5555 = 11;
-														} else if (Static141.anInt3470 != 0) {
-															if (local2522.method3138(LocalizedText.CHATCOL0)) {
+														} else if (Static141.language != 0) {
+															if (local2522.startsWith(LocalizedText.CHATCOL0)) {
 																local5555 = 0;
-																string = string.method3136(LocalizedText.CHATCOL0.length());
-															} else if (local2522.method3138(LocalizedText.CHATCOL1)) {
-																string = string.method3136(LocalizedText.CHATCOL1.length());
+																string = string.substring(LocalizedText.CHATCOL0.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL1)) {
+																string = string.substring(LocalizedText.CHATCOL1.length());
 																local5555 = 1;
-															} else if (local2522.method3138(LocalizedText.CHATCOL2)) {
-																string = string.method3136(LocalizedText.CHATCOL2.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL2)) {
+																string = string.substring(LocalizedText.CHATCOL2.length());
 																local5555 = 2;
-															} else if (local2522.method3138(LocalizedText.CHATCOL3)) {
-																string = string.method3136(LocalizedText.CHATCOL3.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL3)) {
+																string = string.substring(LocalizedText.CHATCOL3.length());
 																local5555 = 3;
-															} else if (local2522.method3138(LocalizedText.CHATCOL4)) {
-																string = string.method3136(LocalizedText.CHATCOL4.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL4)) {
+																string = string.substring(LocalizedText.CHATCOL4.length());
 																local5555 = 4;
-															} else if (local2522.method3138(LocalizedText.CHATCOL5)) {
+															} else if (local2522.startsWith(LocalizedText.CHATCOL5)) {
 																local5555 = 5;
-																string = string.method3136(LocalizedText.CHATCOL5.length());
-															} else if (local2522.method3138(LocalizedText.CHATCOL6)) {
-																string = string.method3136(LocalizedText.CHATCOL6.length());
+																string = string.substring(LocalizedText.CHATCOL5.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL6)) {
+																string = string.substring(LocalizedText.CHATCOL6.length());
 																local5555 = 6;
-															} else if (local2522.method3138(LocalizedText.CHATCOL7)) {
+															} else if (local2522.startsWith(LocalizedText.CHATCOL7)) {
 																local5555 = 7;
-																string = string.method3136(LocalizedText.CHATCOL7.length());
-															} else if (local2522.method3138(LocalizedText.CHATCOL8)) {
+																string = string.substring(LocalizedText.CHATCOL7.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL8)) {
 																local5555 = 8;
-																string = string.method3136(LocalizedText.CHATCOL8.length());
-															} else if (local2522.method3138(LocalizedText.CHATCOL9)) {
+																string = string.substring(LocalizedText.CHATCOL8.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL9)) {
 																local5555 = 9;
-																string = string.method3136(LocalizedText.CHATCOL9.length());
-															} else if (local2522.method3138(LocalizedText.CHATCOL10)) {
-																string = string.method3136(LocalizedText.CHATCOL10.length());
+																string = string.substring(LocalizedText.CHATCOL9.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL10)) {
+																string = string.substring(LocalizedText.CHATCOL10.length());
 																local5555 = 10;
-															} else if (local2522.method3138(LocalizedText.CHATCOL11)) {
-																string = string.method3136(LocalizedText.CHATCOL11.length());
+															} else if (local2522.startsWith(LocalizedText.CHATCOL11)) {
+																string = string.substring(LocalizedText.CHATCOL11.length());
 																local5555 = 11;
 															}
 														}
 														@Pc(5943) byte local5943 = 0;
 														local2522 = string.toLowerCase();
-														if (local2522.method3138(LocalizedText.STABLE_CHATEFFECT1)) {
-															string = string.method3136(LocalizedText.STABLE_CHATEFFECT1.length());
+														if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT1)) {
+															string = string.substring(LocalizedText.STABLE_CHATEFFECT1.length());
 															local5943 = 1;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATEFFECT2)) {
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT2)) {
 															local5943 = 2;
-															string = string.method3136(LocalizedText.STABLE_CHATEFFECT2.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATEFFECT3)) {
-															string = string.method3136(LocalizedText.STABLE_CHATEFFECT3.length());
+															string = string.substring(LocalizedText.STABLE_CHATEFFECT2.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT3)) {
+															string = string.substring(LocalizedText.STABLE_CHATEFFECT3.length());
 															local5943 = 3;
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATEFFECT4)) {
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECT4)) {
 															local5943 = 4;
-															string = string.method3136(LocalizedText.STABLE_CHATEFFECT4.length());
-														} else if (local2522.method3138(LocalizedText.STABLE_CHATEFFECTC5)) {
+															string = string.substring(LocalizedText.STABLE_CHATEFFECT4.length());
+														} else if (local2522.startsWith(LocalizedText.STABLE_CHATEFFECTC5)) {
 															local5943 = 5;
-															string = string.method3136(LocalizedText.STABLE_CHATEFFECTC5.length());
-														} else if (Static141.anInt3470 != 0) {
-															if (local2522.method3138(LocalizedText.CHATEFFECT1)) {
-																string = string.method3136(LocalizedText.CHATEFFECT1.length());
+															string = string.substring(LocalizedText.STABLE_CHATEFFECTC5.length());
+														} else if (Static141.language != 0) {
+															if (local2522.startsWith(LocalizedText.CHATEFFECT1)) {
+																string = string.substring(LocalizedText.CHATEFFECT1.length());
 																local5943 = 1;
-															} else if (local2522.method3138(LocalizedText.CHATEFFECT2)) {
+															} else if (local2522.startsWith(LocalizedText.CHATEFFECT2)) {
 																local5943 = 2;
-																string = string.method3136(LocalizedText.CHATEFFECT2.length());
-															} else if (local2522.method3138(LocalizedText.CHATEFFECT3)) {
+																string = string.substring(LocalizedText.CHATEFFECT2.length());
+															} else if (local2522.startsWith(LocalizedText.CHATEFFECT3)) {
 																local5943 = 3;
-																string = string.method3136(LocalizedText.CHATEFFECT3.length());
-															} else if (local2522.method3138(LocalizedText.CHATEFFECT4)) {
+																string = string.substring(LocalizedText.CHATEFFECT3.length());
+															} else if (local2522.startsWith(LocalizedText.CHATEFFECT4)) {
 																local5943 = 4;
-																string = string.method3136(LocalizedText.CHATEFFECT4.length());
-															} else if (local2522.method3138(LocalizedText.CHATEFFECT5)) {
-																string = string.method3136(LocalizedText.CHATEFFECT5.length());
+																string = string.substring(LocalizedText.CHATEFFECT4.length());
+															} else if (local2522.startsWith(LocalizedText.CHATEFFECT5)) {
+																string = string.substring(LocalizedText.CHATEFFECT5.length());
 																local5943 = 5;
 															}
 														}
@@ -2859,7 +2859,7 @@ public final class Static88 {
 														continue;
 													}
 													if (opcode == 5306) {
-														Static254.intStack[isp++] = Static144.method2736();
+														Static254.intStack[isp++] = Static144.getWindowMode();
 														continue;
 													}
 													if (opcode == 5307) {
@@ -2978,7 +2978,7 @@ public final class Static88 {
 														ssp--;
 														string = Static3.stringStack[ssp];
 														@Pc(8356) JagString local8356 = Static34.concatenate(new JagString[] { Static15.method479(), string });
-														if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !Static178.aBoolean203) {
+														if (GameShell.frame != null || local1552 && SignLink.anInt5928 != 3 && SignLink.osName.startsWith("win") && !Static178.haveIe6) {
 															Static164.newTab = local1552;
 															Static175.url = local8356;
 															Static33.openUrlRequest = GameShell.signLink.openUrl(new String(local8356.method3148(), "ISO-8859-1"));
@@ -3137,7 +3137,7 @@ public final class Static88 {
 													}
 													if (opcode == 5602) {
 														if (Static184.loginStep == 0) {
-															Static266.returnCode = -2;
+															Static266.reply = -2;
 														}
 														continue;
 													}
@@ -3170,7 +3170,7 @@ public final class Static88 {
 														continue;
 													}
 													if (opcode == 5607) {
-														Static254.intStack[isp++] = Static266.returnCode;
+														Static254.intStack[isp++] = Static266.reply;
 														continue;
 													}
 													if (opcode == 5608) {
@@ -3696,12 +3696,12 @@ public final class Static88 {
 															Static254.intStack[isp++] = 0;
 														} else {
 															Static254.intStack[isp++] = world.anInt382;
-															Static254.intStack[isp++] = world.anInt381;
+															Static254.intStack[isp++] = world.flags;
 															Static3.stringStack[ssp++] = world.aClass100_69;
 															local10247 = world.getWorldInfo();
 															Static254.intStack[isp++] = local10247.anInt1739;
 															Static3.stringStack[ssp++] = local10247.aClass100_378;
-															Static254.intStack[isp++] = world.anInt379;
+															Static254.intStack[isp++] = world.players;
 														}
 														continue;
 													}
@@ -3716,12 +3716,12 @@ public final class Static88 {
 															Static254.intStack[isp++] = 0;
 														} else {
 															Static254.intStack[isp++] = world.anInt382;
-															Static254.intStack[isp++] = world.anInt381;
+															Static254.intStack[isp++] = world.flags;
 															Static3.stringStack[ssp++] = world.aClass100_69;
 															local10247 = world.getWorldInfo();
 															Static254.intStack[isp++] = local10247.anInt1739;
 															Static3.stringStack[ssp++] = local10247.aClass100_378;
-															Static254.intStack[isp++] = world.anInt379;
+															Static254.intStack[isp++] = world.players;
 														}
 														continue;
 													}
@@ -3756,12 +3756,12 @@ public final class Static88 {
 															Static3.stringStack[ssp++] = Static72.EMPTY_STRING;
 															Static254.intStack[isp++] = 0;
 														} else {
-															Static254.intStack[isp++] = local10440.anInt381;
+															Static254.intStack[isp++] = local10440.flags;
 															Static3.stringStack[ssp++] = local10440.aClass100_69;
 															@Pc(10458) Class32 local10458 = local10440.getWorldInfo();
 															Static254.intStack[isp++] = local10458.anInt1739;
 															Static3.stringStack[ssp++] = local10458.aClass100_378;
-															Static254.intStack[isp++] = local10440.anInt379;
+															Static254.intStack[isp++] = local10440.players;
 														}
 														continue;
 													}
@@ -3880,7 +3880,7 @@ public final class Static88 {
 										isp -= 2;
 										local1052 = Static254.intStack[isp + 1];
 										local803 = Static254.intStack[isp];
-										Static254.intStack[isp++] = Static148.method2768(local1052).method2860(string, local803);
+										Static254.intStack[isp++] = Static148.method2768(local1052).getParagraphLineCount(string, local803);
 										continue;
 									}
 									if (opcode == 4109) {
@@ -4018,7 +4018,7 @@ public final class Static88 {
 										local12388 = Static254.intStack[isp] != 0;
 										isp--;
 										local803 = Static254.intStack[isp];
-										Static3.stringStack[ssp++] = Static182.valueToBase10String(Static141.anInt3470, local12388, 0, (long) local803);
+										Static3.stringStack[ssp++] = Static182.valueToBase10String(Static141.language, local12388, 0, (long) local803);
 										continue;
 									}
 								}
@@ -4121,7 +4121,7 @@ public final class Static88 {
 				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.EMPTY_STRING, 0, Static136.CS_ERROR);
 				}
-				Static89.report("CS2 - scr:" + script.uid + " op:" + op, ex);
+				Static89.report("CS2 - scr:" + script.key + " op:" + op, ex);
 			} else {
 				@Pc(14385) JagString str = Static87.allocate(30);
 				str.method3113(Static219.aClass100_928).method3113(script.name);
@@ -4135,7 +4135,7 @@ public final class Static88 {
 				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.EMPTY_STRING, 0, Static34.concatenate(new JagString[] { Static167.aClass100_780, script.name}));
 				}
-				Static89.report("CS2 - scr:" + script.uid + " op:" + op + new String(str.method3148()), ex);
+				Static89.report("CS2 - scr:" + script.key + " op:" + op + new String(str.method3148()), ex);
 			}
 		}
 	}
diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java
index 0a945e9..afaaef0 100644
--- a/client/src/main/java/Static89.java
+++ b/client/src/main/java/Static89.java
@@ -37,7 +37,7 @@ public final class Static89 {
 			local11 = 4;
 		}
 		for (@Pc(21) int local21 = 0; local21 < local11; local21++) {
-			Static107.method2261();
+			Static107.loop();
 			for (@Pc(32) int local32 = 0; local32 < 13; local32++) {
 				for (@Pc(39) int local39 = 0; local39 < 13; local39++) {
 					@Pc(52) int local52 = Static187.anIntArrayArrayArray18[local21][local32][local39];
@@ -146,7 +146,7 @@ public final class Static89 {
 	@OriginalMember(owner = "client!ha", name = "b", descriptor = "(II)V")
 	public static void method1840(@OriginalArg(1) int arg0) {
 		@Pc(8) DelayedStateChange local8 = Static238.method4143(2, arg0);
-		local8.method1007();
+		local8.pushClient();
 	}
 
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "(I)V")
@@ -164,7 +164,7 @@ public final class Static89 {
 			}
 			Static231.anInt5204 = 1;
 			Static254.aClass100Array168[0] = LocalizedText.CANCEL;
-			Static233.aClass100Array160[0] = Static186.EMPTY_FILE;
+			Static233.aClass100Array160[0] = Static186.EMPTY;
 			Static39.aShortArray6[0] = 1005;
 			Static190.anIntArray382[0] = Static35.anInt1092;
 		}
@@ -174,7 +174,7 @@ public final class Static89 {
 		@Pc(60) int local60;
 		for (local60 = 0; local60 < Static24.anInt766; local60++) {
 			if (Static186.aBooleanArray100[local60]) {
-				Static31.aBooleanArray29[local60] = true;
+				Static31.rectangleRedraw[local60] = true;
 			}
 			Static223.aBooleanArray116[local60] = Static186.aBooleanArray100[local60];
 			Static186.aBooleanArray100[local60] = false;
@@ -219,7 +219,7 @@ public final class Static89 {
 		if (Static187.anInt4422 == 1) {
 			Static187.anInt4422 = 2;
 		}
-		if (Static199.anInt4672 == 3) {
+		if (Static199.rectDebug == 3) {
 			for (@Pc(189) int local189 = 0; local189 < Static24.anInt766; local189++) {
 				if (Static223.aBooleanArray116[local189]) {
 					if (GlRenderer.enabled) {
@@ -227,7 +227,7 @@ public final class Static89 {
 					} else {
 						Static129.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128);
 					}
-				} else if (Static31.aBooleanArray29[local189]) {
+				} else if (Static31.rectangleRedraw[local189]) {
 					if (GlRenderer.enabled) {
 						Static46.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128);
 					} else {
@@ -236,7 +236,7 @@ public final class Static89 {
 				}
 			}
 		}
-		Static110.method2281(Static178.anInt4247, Static173.self.anInt3412, Static173.self.anInt3421, Static55.level);
+		Static110.method2281(Static178.anInt4247, Static173.self.xFine, Static173.self.zFine, Static55.level);
 		Static178.anInt4247 = 0;
 	}
 
diff --git a/client/src/main/java/Static90.java b/client/src/main/java/Static90.java
index 4958583..1bb8b37 100644
--- a/client/src/main/java/Static90.java
+++ b/client/src/main/java/Static90.java
@@ -31,7 +31,7 @@ public final class Static90 {
 
 	@OriginalMember(owner = "client!hb", name = "a", descriptor = "(ZI)Lclient!ck;")
 	public static BasType method1856(@OriginalArg(1) int arg0) {
-		@Pc(10) BasType local10 = (BasType) Static262.aClass99_34.method3106((long) arg0);
+		@Pc(10) BasType local10 = (BasType) Static262.aClass99_34.get((long) arg0);
 		if (local10 != null) {
 			return local10;
 		}
@@ -41,7 +41,7 @@ public final class Static90 {
 			local10.method880(new Buffer(local21));
 		}
 		local10.method878();
-		Static262.aClass99_34.method3095(local10, (long) arg0);
+		Static262.aClass99_34.put(local10, (long) arg0);
 		return local10;
 	}
 
diff --git a/client/src/main/java/Static91.java b/client/src/main/java/Static91.java
index 6f3cab2..a83c865 100644
--- a/client/src/main/java/Static91.java
+++ b/client/src/main/java/Static91.java
@@ -58,7 +58,7 @@ public final class Static91 {
 				while (local114-- > 0) {
 					@Pc(136) int local136 = local42.g4();
 					@Pc(140) int local140 = local42.g4();
-					local121.method3862(new IntNode(local140), (long) local136);
+					local121.put(new IntNode(local140), (long) local136);
 				}
 			}
 		}
@@ -86,12 +86,12 @@ public final class Static91 {
 	@OriginalMember(owner = "client!hc", name = "a", descriptor = "(Lclient!km;Z)V")
 	public static void method1877(@OriginalArg(0) Npc arg0) {
 		for (@Pc(13) AreaSound local13 = (AreaSound) Static152.aClass69_87.method2289(); local13 != null; local13 = (AreaSound) Static152.aClass69_87.method2288()) {
-			if (arg0 == local13.aClass8_Sub4_Sub2_1) {
-				if (local13.aClass3_Sub3_Sub1_1 != null) {
-					Static204.soundStream.method1347(local13.aClass3_Sub3_Sub1_1);
-					local13.aClass3_Sub3_Sub1_1 = null;
+			if (arg0 == local13.npc) {
+				if (local13.primaryStream != null) {
+					Static204.soundStream.removeSubStream(local13.primaryStream);
+					local13.primaryStream = null;
 				}
-				local13.method4658();
+				local13.unlink();
 				return;
 			}
 		}
@@ -121,7 +121,7 @@ public final class Static91 {
 			return;
 		}
 		@Pc(6) WallDecor local6 = new WallDecor();
-		local6.aLong52 = arg10;
+		local6.key = arg10;
 		local6.anInt1390 = arg1 * 128 + 64;
 		local6.anInt1393 = arg2 * 128 + 64;
 		local6.anInt1391 = arg3;
diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java
index fce1858..0480ef6 100644
--- a/client/src/main/java/Static92.java
+++ b/client/src/main/java/Static92.java
@@ -28,7 +28,7 @@ public final class Static92 {
 		if (arg4 == 0) {
 			@Pc(28) Wall local28 = Static262.method4509(arg0, arg5, arg3);
 			if (local28 != null) {
-				local38 = Integer.MAX_VALUE & (int) (local28.aLong107 >>> 32);
+				local38 = Integer.MAX_VALUE & (int) (local28.key >>> 32);
 				if (arg2 == 2) {
 					local28.aClass8_5 = new Loc(local38, 2, arg1 + 4, arg0, arg5, arg3, arg6, false, local28.aClass8_5);
 					local28.aClass8_6 = new Loc(local38, 2, arg1 + 1 & 0x3, arg0, arg5, arg3, arg6, false, local28.aClass8_6);
@@ -40,7 +40,7 @@ public final class Static92 {
 		if (arg4 == 1) {
 			@Pc(106) WallDecor local106 = Static83.method435(arg0, arg5, arg3);
 			if (local106 != null) {
-				local38 = (int) (local106.aLong52 >>> 32) & Integer.MAX_VALUE;
+				local38 = (int) (local106.key >>> 32) & Integer.MAX_VALUE;
 				if (arg2 == 4 || arg2 == 5) {
 					local106.aClass8_3 = new Loc(local38, 4, arg1, arg0, arg5, arg3, arg6, false, local106.aClass8_3);
 				} else if (arg2 == 6) {
diff --git a/client/src/main/java/Static93.java b/client/src/main/java/Static93.java
index 99095a0..ebee600 100644
--- a/client/src/main/java/Static93.java
+++ b/client/src/main/java/Static93.java
@@ -34,6 +34,6 @@ public final class Static93 {
 	@OriginalMember(owner = "client!he", name = "c", descriptor = "(II)V")
 	public static void method1906(@OriginalArg(1) int arg0) {
 		@Pc(12) DelayedStateChange local12 = Static238.method4143(7, arg0);
-		local12.method1007();
+		local12.pushClient();
 	}
 }
diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java
index be2be13..538662c 100644
--- a/client/src/main/java/Static97.java
+++ b/client/src/main/java/Static97.java
@@ -113,8 +113,8 @@ public final class Static97 {
 		for (local14 = 0; local14 < Static106.anInt2871; local14++) {
 			@Pc(77) int local77 = arg0.gSmart1or2();
 			@Pc(85) World local85 = Static196.aClass10_Sub1Array2[local77] = new World();
-			local85.anInt377 = arg0.g1();
-			local85.anInt381 = arg0.g4();
+			local85.country = arg0.g1();
+			local85.flags = arg0.g4();
 			local85.anInt382 = local77 + Static19.anInt636;
 			local85.aClass100_69 = arg0.gjstr2();
 			local85.aClass100_71 = arg0.gjstr2();
diff --git a/client/src/main/java/StringNode.java b/client/src/main/java/StringNode.java
index b75c4d9..2935c9a 100644
--- a/client/src/main/java/StringNode.java
+++ b/client/src/main/java/StringNode.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class StringNode extends Node {
 
 	@OriginalMember(owner = "client!sj", name = "A", descriptor = "Lclient!na;")
-	public JagString aClass100_980;
+	public JagString value;
 
 	@OriginalMember(owner = "client!sj", name = "<init>", descriptor = "()V")
 	public StringNode() {
@@ -14,6 +14,6 @@ public final class StringNode extends Node {
 
 	@OriginalMember(owner = "client!sj", name = "<init>", descriptor = "(Lclient!na;)V")
 	public StringNode(@OriginalArg(0) JagString arg0) {
-		this.aClass100_980 = arg0;
+		this.value = arg0;
 	}
 }
diff --git a/client/src/main/java/StructType.java b/client/src/main/java/StructType.java
index 60f48c2..a8a49a2 100644
--- a/client/src/main/java/StructType.java
+++ b/client/src/main/java/StructType.java
@@ -15,7 +15,7 @@ public final class StructType extends SecondaryNode {
 			return arg1;
 		} else {
 			@Pc(29) IntNode local29 = (IntNode) this.aClass133_14.get((long) arg0);
-			return local29 == null ? arg1 : local29.anInt3141;
+			return local29 == null ? arg1 : local29.value;
 		}
 	}
 
@@ -39,7 +39,7 @@ public final class StructType extends SecondaryNode {
 			} else {
 				local58 = new IntNode(arg0.g4());
 			}
-			this.aClass133_14.method3862(local58, (long) local49);
+			this.aClass133_14.put(local58, (long) local49);
 		}
 	}
 
@@ -49,7 +49,7 @@ public final class StructType extends SecondaryNode {
 			return arg0;
 		} else {
 			@Pc(16) StringNode local16 = (StringNode) this.aClass133_14.get((long) arg1);
-			return local16 == null ? arg0 : local16.aClass100_980;
+			return local16 == null ? arg0 : local16.value;
 		}
 	}
 
diff --git a/client/src/main/java/SynthInstrument.java b/client/src/main/java/SynthInstrument.java
index 1d79295..7ecb276 100644
--- a/client/src/main/java/SynthInstrument.java
+++ b/client/src/main/java/SynthInstrument.java
@@ -93,7 +93,7 @@ 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) {
-		Static289.method2618(Static194.anIntArray398, 0, arg0);
+		Static289.clear(Static194.anIntArray398, 0, arg0);
 		if (arg1 < 10) {
 			return Static194.anIntArray398;
 		}
diff --git a/client/src/main/java/TextureOp.java b/client/src/main/java/TextureOp.java
index e8fa62a..567d565 100644
--- a/client/src/main/java/TextureOp.java
+++ b/client/src/main/java/TextureOp.java
@@ -68,7 +68,7 @@ public abstract class TextureOp extends Node {
 	@OriginalMember(owner = "client!j", name = "e", descriptor = "(B)V")
 	public void method4633() {
 		if (this.aBoolean309) {
-			this.aClass121_41.method3442();
+			this.aClass121_41.clear();
 			this.aClass121_41 = null;
 		} else {
 			this.aClass103_41.method3169();
diff --git a/client/src/main/java/TextureOp1.java b/client/src/main/java/TextureOp1.java
index 3640059..a733f89 100644
--- a/client/src/main/java/TextureOp1.java
+++ b/client/src/main/java/TextureOp1.java
@@ -24,7 +24,7 @@ public final class TextureOp1 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(11) int[] local11 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(20) int local20 = Static64.anIntArray153[arg0];
 			@Pc(26) int local26 = local20 - 2048 >> 1;
 			for (@Pc(28) int local28 = 0; local28 < Static189.anInt4457; local28++) {
diff --git a/client/src/main/java/TextureOp10.java b/client/src/main/java/TextureOp10.java
index 4551b85..39cdc2e 100644
--- a/client/src/main/java/TextureOp10.java
+++ b/client/src/main/java/TextureOp10.java
@@ -15,7 +15,7 @@ public final class TextureOp10 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(30) int[][] local30 = this.method4634(arg0, 0);
 			@Pc(34) int[] local34 = local30[0];
 			@Pc(38) int[] local38 = local30[2];
diff --git a/client/src/main/java/TextureOp11.java b/client/src/main/java/TextureOp11.java
index 354a4de..ec88dce 100644
--- a/client/src/main/java/TextureOp11.java
+++ b/client/src/main/java/TextureOp11.java
@@ -31,7 +31,7 @@ public final class TextureOp11 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(28) int local28 = Static189.anInt4457 / this.anInt2220;
 			@Pc(33) int local33 = Static172.anInt4165 / this.anInt2216;
 			@Pc(44) int[] local44;
diff --git a/client/src/main/java/TextureOp12.java b/client/src/main/java/TextureOp12.java
index 5184c5f..a4d7879 100644
--- a/client/src/main/java/TextureOp12.java
+++ b/client/src/main/java/TextureOp12.java
@@ -41,7 +41,7 @@ public final class TextureOp12 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			for (@Pc(26) int local26 = 0; local26 < Static189.anInt4457; local26++) {
 				@Pc(45) int local45 = this.anInt2299 + (Static64.anIntArray153[arg0] << 12) / this.anInt2298;
 				@Pc(57) int local57 = this.anInt2296 + (Static173.anIntArray367[local26] << 12) / this.anInt2298;
diff --git a/client/src/main/java/TextureOp14.java b/client/src/main/java/TextureOp14.java
index a4352d7..b5b9fdf 100644
--- a/client/src/main/java/TextureOp14.java
+++ b/client/src/main/java/TextureOp14.java
@@ -58,7 +58,7 @@ public final class TextureOp14 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(32) int local32 = this.anInt2646 * Static64.anIntArray153[arg0] + 2048;
 			@Pc(36) int local36 = local32 >> 12;
 			@Pc(40) int local40 = local36 + 1;
diff --git a/client/src/main/java/TextureOp15.java b/client/src/main/java/TextureOp15.java
index 9b64865..dfd1379 100644
--- a/client/src/main/java/TextureOp15.java
+++ b/client/src/main/java/TextureOp15.java
@@ -57,7 +57,7 @@ public final class TextureOp15 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			for (@Pc(26) int local26 = 0; local26 < Static189.anInt4457; local26++) {
 				this.method2382(arg0, local26);
 				@Pc(40) int[] local40 = this.method4624(0, Static92.anInt2433);
diff --git a/client/src/main/java/TextureOp16.java b/client/src/main/java/TextureOp16.java
index 30b0676..11ec5a9 100644
--- a/client/src/main/java/TextureOp16.java
+++ b/client/src/main/java/TextureOp16.java
@@ -44,7 +44,7 @@ public final class TextureOp16 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(29) int[] local29 = this.method4624(1, arg0);
 			@Pc(35) int[] local35 = this.method4624(2, arg0);
 			for (@Pc(37) int local37 = 0; local37 < Static189.anInt4457; local37++) {
diff --git a/client/src/main/java/TextureOp17.java b/client/src/main/java/TextureOp17.java
index 138f04b..02b8f56 100644
--- a/client/src/main/java/TextureOp17.java
+++ b/client/src/main/java/TextureOp17.java
@@ -122,7 +122,7 @@ public final class TextureOp17 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(11) int[] local11 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(18) int local18 = 0;
 			@Pc(25) int local25;
 			for (local25 = Static64.anIntArray153[arg0] + this.anInt3675; local25 < 0; local25 += 4096) {
diff --git a/client/src/main/java/TextureOp19.java b/client/src/main/java/TextureOp19.java
index 76a8f08..8a5369f 100644
--- a/client/src/main/java/TextureOp19.java
+++ b/client/src/main/java/TextureOp19.java
@@ -56,7 +56,7 @@ public final class TextureOp19 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(30) int local30 = Static64.anIntArray153[arg0] - 2048;
 			for (@Pc(32) int local32 = 0; local32 < Static189.anInt4457; local32++) {
 				@Pc(40) int local40 = local30 + this.anInt3843;
diff --git a/client/src/main/java/TextureOp2.java b/client/src/main/java/TextureOp2.java
index 2a1bfc7..abfa9fe 100644
--- a/client/src/main/java/TextureOp2.java
+++ b/client/src/main/java/TextureOp2.java
@@ -75,7 +75,7 @@ public final class TextureOp2 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(29) int[] local29 = this.method4624(0, arg0);
 			for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) {
 				@Pc(38) int local38 = local29[local31];
diff --git a/client/src/main/java/TextureOp20.java b/client/src/main/java/TextureOp20.java
index 70d890d..6695a04 100644
--- a/client/src/main/java/TextureOp20.java
+++ b/client/src/main/java/TextureOp20.java
@@ -33,7 +33,7 @@ public final class TextureOp20 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(17) int[] local17 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			Static289.method2614(local17, 0, Static189.anInt4457, this.anInt3894);
 		}
 		return local17;
diff --git a/client/src/main/java/TextureOp21.java b/client/src/main/java/TextureOp21.java
index 7154162..f79d04d 100644
--- a/client/src/main/java/TextureOp21.java
+++ b/client/src/main/java/TextureOp21.java
@@ -21,7 +21,7 @@ public final class TextureOp21 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(31) int local31 = this.anInt4223 + this.anInt4223 + 1;
 			@Pc(35) int local35 = 65536 / local31;
 			@Pc(43) int local43 = this.anInt4221 + this.anInt4221 + 1;
diff --git a/client/src/main/java/TextureOp22.java b/client/src/main/java/TextureOp22.java
index 400ff14..8fc86f7 100644
--- a/client/src/main/java/TextureOp22.java
+++ b/client/src/main/java/TextureOp22.java
@@ -51,7 +51,7 @@ public final class TextureOp22 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (!this.aClass121_41.aBoolean221) {
+		if (!this.aClass121_41.invalid) {
 			return local19;
 		}
 		@Pc(29) int[][] local29 = this.aClass121_41.method3446();
diff --git a/client/src/main/java/TextureOp23.java b/client/src/main/java/TextureOp23.java
index 795c43c..c0aa394 100644
--- a/client/src/main/java/TextureOp23.java
+++ b/client/src/main/java/TextureOp23.java
@@ -18,7 +18,7 @@ public final class TextureOp23 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(34) int[] local34 = this.method4624(0, arg0 - 1 & Static141.anInt3473);
 			@Pc(40) int[] local40 = this.method4624(0, arg0);
 			@Pc(50) int[] local50 = this.method4624(0, Static141.anInt3473 & arg0 + 1);
diff --git a/client/src/main/java/TextureOp24.java b/client/src/main/java/TextureOp24.java
index 14509b2..82df81e 100644
--- a/client/src/main/java/TextureOp24.java
+++ b/client/src/main/java/TextureOp24.java
@@ -45,7 +45,7 @@ public final class TextureOp24 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(30) int local30 = Static165.anInt4042 * this.anInt4580 >> 12;
 			@Pc(40) int[] local40 = this.method4624(0, Static141.anInt3473 & arg0 - 1);
 			@Pc(46) int[] local46 = this.method4624(0, arg0);
diff --git a/client/src/main/java/TextureOp25.java b/client/src/main/java/TextureOp25.java
index 3b7ff4b..7a96f5e 100644
--- a/client/src/main/java/TextureOp25.java
+++ b/client/src/main/java/TextureOp25.java
@@ -15,7 +15,7 @@ public final class TextureOp25 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(9) int[] local9 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			Static289.method2614(local9, 0, Static189.anInt4457, Static64.anIntArray153[arg0]);
 		}
 		return local9;
diff --git a/client/src/main/java/TextureOp26.java b/client/src/main/java/TextureOp26.java
index e5f1ffd..e1e1bef 100644
--- a/client/src/main/java/TextureOp26.java
+++ b/client/src/main/java/TextureOp26.java
@@ -22,7 +22,7 @@ public final class TextureOp26 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(15) int[] local15 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(27) int local27 = Static64.anIntArray153[arg0];
 			for (@Pc(29) int local29 = 0; local29 < Static189.anInt4457; local29++) {
 				local15[local29] = this.method3769(local27, Static173.anIntArray367[local29]) % 4096;
diff --git a/client/src/main/java/TextureOp28.java b/client/src/main/java/TextureOp28.java
index 533604e..a3dbb72 100644
--- a/client/src/main/java/TextureOp28.java
+++ b/client/src/main/java/TextureOp28.java
@@ -18,7 +18,7 @@ public final class TextureOp28 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(28) int local28 = Static64.anIntArray153[arg0];
 			for (@Pc(30) int local30 = 0; local30 < Static189.anInt4457; local30++) {
 				@Pc(41) int local41 = Static173.anIntArray367[local30];
diff --git a/client/src/main/java/TextureOp29.java b/client/src/main/java/TextureOp29.java
index 5e02976..57b15b9 100644
--- a/client/src/main/java/TextureOp29.java
+++ b/client/src/main/java/TextureOp29.java
@@ -18,7 +18,7 @@ public final class TextureOp29 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(13) int[] local13 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			this.method3934(this.aClass121_41.method3446());
 		}
 		return local13;
diff --git a/client/src/main/java/TextureOp31.java b/client/src/main/java/TextureOp31.java
index 20eb0a3..44568a7 100644
--- a/client/src/main/java/TextureOp31.java
+++ b/client/src/main/java/TextureOp31.java
@@ -15,7 +15,7 @@ public final class TextureOp31 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(7) int[] local7 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(21) int[] local21 = this.method4624(0, arg0);
 			for (@Pc(23) int local23 = 0; local23 < Static189.anInt4457; local23++) {
 				local7[local23] = 4096 - local21[local23];
diff --git a/client/src/main/java/TextureOp33.java b/client/src/main/java/TextureOp33.java
index db81319..e729f71 100644
--- a/client/src/main/java/TextureOp33.java
+++ b/client/src/main/java/TextureOp33.java
@@ -53,7 +53,7 @@ public final class TextureOp33 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(28) int local28 = this.anInt5714 >> 1;
 			@Pc(33) int[][] local33 = this.aClass121_41.method3446();
 			@Pc(40) Random local40 = new Random((long) this.anInt5716);
diff --git a/client/src/main/java/TextureOp4.java b/client/src/main/java/TextureOp4.java
index 20530a6..0f84614 100644
--- a/client/src/main/java/TextureOp4.java
+++ b/client/src/main/java/TextureOp4.java
@@ -246,7 +246,7 @@ public final class TextureOp4 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(17) int[] local17 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			this.method584(arg0, local17);
 		}
 		return local17;
diff --git a/client/src/main/java/TextureOp5.java b/client/src/main/java/TextureOp5.java
index 593ba85..39d5b6d 100644
--- a/client/src/main/java/TextureOp5.java
+++ b/client/src/main/java/TextureOp5.java
@@ -61,7 +61,7 @@ public final class TextureOp5 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(11) int[] local11 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(30) int[] local30 = this.method4624(0, arg0);
 			@Pc(36) int[] local36 = this.method4624(1, arg0);
 			@Pc(42) int[] local42 = this.method4624(2, arg0);
diff --git a/client/src/main/java/TextureOp6.java b/client/src/main/java/TextureOp6.java
index 858fe0d..5afc107 100644
--- a/client/src/main/java/TextureOp6.java
+++ b/client/src/main/java/TextureOp6.java
@@ -64,7 +64,7 @@ public final class TextureOp6 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(28) int local28 = Static64.anIntArray153[arg0];
 			@Pc(36) int local36;
 			if (this.anInt1234 == 0) {
diff --git a/client/src/main/java/TextureOp7.java b/client/src/main/java/TextureOp7.java
index ace5107..2c7caea 100644
--- a/client/src/main/java/TextureOp7.java
+++ b/client/src/main/java/TextureOp7.java
@@ -63,7 +63,7 @@ public final class TextureOp7 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(15) int[] local15 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(38) int[] local38 = this.method4624(0, this.aBoolean105 ? Static141.anInt3473 - arg0 : arg0);
 			if (this.aBoolean104) {
 				for (@Pc(51) int local51 = 0; local51 < Static189.anInt4457; local51++) {
diff --git a/client/src/main/java/TextureOp8.java b/client/src/main/java/TextureOp8.java
index 60cf2dc..a76cbd8 100644
--- a/client/src/main/java/TextureOp8.java
+++ b/client/src/main/java/TextureOp8.java
@@ -36,7 +36,7 @@ public final class TextureOp8 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			for (@Pc(25) int local25 = 0; local25 < Static189.anInt4457; local25++) {
 				@Pc(32) int local32 = Static173.anIntArray367[local25];
 				@Pc(36) int local36 = Static64.anIntArray153[arg0];
diff --git a/client/src/main/java/TextureOp9.java b/client/src/main/java/TextureOp9.java
index dbaf82a..d04f00d 100644
--- a/client/src/main/java/TextureOp9.java
+++ b/client/src/main/java/TextureOp9.java
@@ -36,7 +36,7 @@ public final class TextureOp9 extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(30) int[] local30 = this.method4624(0, arg0);
 			for (@Pc(32) int local32 = 0; local32 < Static189.anInt4457; local32++) {
 				local19[local32] = this.anInt2007 + (local30[local32] * this.anInt2001 >> 12);
diff --git a/client/src/main/java/TextureOpBinary.java b/client/src/main/java/TextureOpBinary.java
index 1a61031..39d86c7 100644
--- a/client/src/main/java/TextureOpBinary.java
+++ b/client/src/main/java/TextureOpBinary.java
@@ -21,7 +21,7 @@ public final class TextureOpBinary extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(29) int[] local29 = this.method4624(0, arg0);
 			for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) {
 				@Pc(38) int local38 = local29[local31];
diff --git a/client/src/main/java/TextureOpCombine.java b/client/src/main/java/TextureOpCombine.java
index 6733f97..d2fe28c 100644
--- a/client/src/main/java/TextureOpCombine.java
+++ b/client/src/main/java/TextureOpCombine.java
@@ -18,7 +18,7 @@ public final class TextureOpCombine extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(11) int[] local11 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(22) int[] local22 = this.method4624(0, arg0);
 			@Pc(28) int[] local28 = this.method4624(1, arg0);
 			@Pc(31) int local31 = this.anInt4543;
diff --git a/client/src/main/java/TextureOpCurve.java b/client/src/main/java/TextureOpCurve.java
index e6b201a..a762d36 100644
--- a/client/src/main/java/TextureOpCurve.java
+++ b/client/src/main/java/TextureOpCurve.java
@@ -109,7 +109,7 @@ public final class TextureOpCurve extends TextureOp {
 	@Override
 	public final int[] method4626(@OriginalArg(0) int arg0) {
 		@Pc(19) int[] local19 = this.aClass121_41.method3445(arg0);
-		if (this.aClass121_41.aBoolean221) {
+		if (this.aClass121_41.invalid) {
 			@Pc(29) int[] local29 = this.method4624(0, arg0);
 			for (@Pc(31) int local31 = 0; local31 < Static189.anInt4457; local31++) {
 				@Pc(44) int local44 = local29[local31] >> 4;
diff --git a/client/src/main/java/Wall.java b/client/src/main/java/Wall.java
index 6df883b..7d90075 100644
--- a/client/src/main/java/Wall.java
+++ b/client/src/main/java/Wall.java
@@ -26,5 +26,5 @@ public final class Wall {
 	public int anInt3052;
 
 	@OriginalMember(owner = "client!jh", name = "d", descriptor = "J")
-	public long aLong107 = 0L;
+	public long key = 0L;
 }
diff --git a/client/src/main/java/WallDecor.java b/client/src/main/java/WallDecor.java
index 2832db8..86b298c 100644
--- a/client/src/main/java/WallDecor.java
+++ b/client/src/main/java/WallDecor.java
@@ -32,5 +32,5 @@ public final class WallDecor {
 	public int anInt1395;
 
 	@OriginalMember(owner = "client!df", name = "i", descriptor = "J")
-	public long aLong52 = 0L;
+	public long key = 0L;
 }
diff --git a/client/src/main/java/World.java b/client/src/main/java/World.java
index 1234ff7..6e200c8 100644
--- a/client/src/main/java/World.java
+++ b/client/src/main/java/World.java
@@ -15,6 +15,6 @@ public final class World extends AbstractWorld {
 
 	@OriginalMember(owner = "client!ba", name = "g", descriptor = "(I)Lclient!ee;")
 	public final Class32 getWorldInfo() {
-		return Static203.aClass32Array1[this.anInt377];
+		return Static203.aClass32Array1[this.country];
 	}
 }
diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java
index 795d9f1..f42cd9b 100644
--- a/client/src/main/java/WorldMapFont.java
+++ b/client/src/main/java/WorldMapFont.java
@@ -14,86 +14,86 @@ import org.openrs2.deob.annotation.Pc;
 public final class WorldMapFont {
 
 	@OriginalMember(owner = "client!fd", name = "d", descriptor = "Ljava/lang/String;")
-	public static final String aString2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| " + String.valueOf('Ä') + 'Ë' + 'Ï' + 'Ö' + 'Ü' + 'ä' + 'ë' + 'ï' + 'ö' + 'ü' + 'ÿ' + 'ß' + 'Á' + 'À' + 'É' + 'È' + 'Í' + 'Ì' + 'Ó' + 'Ò' + 'Ú' + 'Ù' + 'á' + 'à' + 'é' + 'è' + 'í' + 'ì' + 'ó' + 'ò' + 'ú' + 'ù' + 'Â' + 'Ê' + 'Î' + 'Ô' + 'Û' + 'â' + 'ê' + 'î' + 'ô' + 'û' + 'Æ' + 'æ';
+	public static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| " + String.valueOf('Ä') + 'Ë' + 'Ï' + 'Ö' + 'Ü' + 'ä' + 'ë' + 'ï' + 'ö' + 'ü' + 'ÿ' + 'ß' + 'Á' + 'À' + 'É' + 'È' + 'Í' + 'Ì' + 'Ó' + 'Ò' + 'Ú' + 'Ù' + 'á' + 'à' + 'é' + 'è' + 'í' + 'ì' + 'ó' + 'ò' + 'ú' + 'ù' + 'Â' + 'Ê' + 'Î' + 'Ô' + 'Û' + 'â' + 'ê' + 'î' + 'ô' + 'û' + 'Æ' + 'æ';
 
 	@OriginalMember(owner = "client!fd", name = "f", descriptor = "[I")
-	private static final int[] anIntArray155 = new int[256];
+	private static final int[] CHAR_INDEXES = new int[256];
 
 	@OriginalMember(owner = "client!fd", name = "c", descriptor = "I")
-	private int anInt1955 = 0;
+	private int dataIndex = 0;
 
 	@OriginalMember(owner = "client!fd", name = "b", descriptor = "Z")
-	private boolean aBoolean112 = false;
+	private boolean grayscale = false;
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "[B")
-	private byte[] aByteArray21 = new byte[100000];
+	private byte[] data = new byte[100000];
 
 	static {
 		for (@Pc(146) int local146 = 0; local146 < 256; local146++) {
-			@Pc(153) int local153 = aString2.indexOf(local146);
+			@Pc(153) int local153 = ALPHABET.indexOf(local146);
 			if (local153 == -1) {
 				local153 = 74;
 			}
-			anIntArray155[local146] = local153 * 9;
+			CHAR_INDEXES[local146] = local153 * 9;
 		}
 	}
 
 	@OriginalMember(owner = "client!fd", name = "<init>", descriptor = "(IZLjava/awt/Component;)V")
 	public WorldMapFont(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) Component arg2) {
-		this.anInt1955 = Static66.anInt1956 * 9;
-		this.aBoolean112 = false;
+		this.dataIndex = Static66.ALPHABET_SIZE * 9;
+		this.grayscale = false;
 		@Pc(30) Font local30 = new Font("Helvetica", 1, arg0);
 		@Pc(34) FontMetrics local34 = arg2.getFontMetrics(local30);
 		@Pc(36) int local36;
-		for (local36 = 0; local36 < Static66.anInt1956; local36++) {
-			this.method1509(local30, local34, aString2.charAt(local36), local36, false);
+		for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
+			this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, false);
 		}
-		if (this.aBoolean112) {
-			this.anInt1955 = Static66.anInt1956 * 9;
-			this.aBoolean112 = false;
+		if (this.grayscale) {
+			this.dataIndex = Static66.ALPHABET_SIZE * 9;
+			this.grayscale = false;
 			local30 = new Font("Helvetica", 0, arg0);
 			local34 = arg2.getFontMetrics(local30);
-			for (local36 = 0; local36 < Static66.anInt1956; local36++) {
-				this.method1509(local30, local34, aString2.charAt(local36), local36, false);
+			for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
+				this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, false);
 			}
-			if (!this.aBoolean112) {
-				this.anInt1955 = Static66.anInt1956 * 9;
-				this.aBoolean112 = false;
-				for (local36 = 0; local36 < Static66.anInt1956; local36++) {
-					this.method1509(local30, local34, aString2.charAt(local36), local36, true);
+			if (!this.grayscale) {
+				this.dataIndex = Static66.ALPHABET_SIZE * 9;
+				this.grayscale = false;
+				for (local36 = 0; local36 < Static66.ALPHABET_SIZE; local36++) {
+					this.preRenderGlyph(local30, local34, ALPHABET.charAt(local36), local36, true);
 				}
 			}
 		}
-		@Pc(121) byte[] local121 = new byte[this.anInt1955];
-		for (@Pc(123) int local123 = 0; local123 < this.anInt1955; local123++) {
-			local121[local123] = this.aByteArray21[local123];
+		@Pc(121) byte[] local121 = new byte[this.dataIndex];
+		for (@Pc(123) int local123 = 0; local123 < this.dataIndex; local123++) {
+			local121[local123] = this.data[local123];
 		}
-		this.aByteArray21 = local121;
+		this.data = local121;
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Lclient!na;IIIZ)V")
-	private void method1502(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
-		if (this.aBoolean112 || arg3 == 0) {
+	private void renderString(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
+		if (this.grayscale || arg3 == 0) {
 			arg4 = false;
 		}
 		for (@Pc(8) int local8 = 0; local8 < arg0.length(); local8++) {
-			@Pc(20) int local20 = anIntArray155[arg0.charAt(local8)];
+			@Pc(20) int local20 = CHAR_INDEXES[arg0.charAt(local8)];
 			if (arg4) {
-				this.method1506(local20, arg1 + 1, arg2, 1, this.aByteArray21);
-				this.method1506(local20, arg1, arg2 + 1, 1, this.aByteArray21);
+				this.renderGlyph(local20, arg1 + 1, arg2, 1, this.data);
+				this.renderGlyph(local20, arg1, arg2 + 1, 1, this.data);
 			}
-			this.method1506(local20, arg1, arg2, arg3, this.aByteArray21);
-			arg1 += this.aByteArray21[local20 + 7];
+			this.renderGlyph(local20, arg1, arg2, arg3, this.data);
+			arg1 += this.data[local20 + 7];
 		}
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "()I")
 	public final int method1503() {
-		return this.aByteArray21[8] - 1;
+		return this.data[8] - 1;
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "([I[BIIIIIII)V")
-	private void method1505(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] 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) {
+	private void renderGlyphGrayscale(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] 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) {
 		for (@Pc(2) int local2 = -arg6; local2 < 0; local2++) {
 			for (@Pc(7) int local7 = -arg5; local7 < 0; local7++) {
 				@Pc(16) int local16 = arg1[arg3++] & 0xFF;
@@ -112,7 +112,7 @@ public final class WorldMapFont {
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "(IIII[B)V")
-	private void method1506(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) byte[] arg4) {
+	private void renderGlyph(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) byte[] arg4) {
 		@Pc(7) int local7 = arg1 + arg4[arg0 + 5];
 		@Pc(15) int local15 = arg2 - arg4[arg0 + 6];
 		@Pc(21) int local21 = arg4[arg0 + 3];
@@ -150,15 +150,15 @@ public final class WorldMapFont {
 		if (local21 <= 0 || local27 <= 0) {
 			return;
 		}
-		if (this.aBoolean112) {
-			this.method1505(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
+		if (this.grayscale) {
+			this.renderGlyphGrayscale(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
 		} else {
-			this.method1507(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
+			this.renderGlyphMono(Static129.pixels, arg4, arg3, local47, local53, local21, local27, local57, local59);
 		}
 	}
 
 	@OriginalMember(owner = "client!fd", name = "b", descriptor = "([I[BIIIIIII)V")
-	private void method1507(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] 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) {
+	private void renderGlyphMono(@OriginalArg(0) int[] arg0, @OriginalArg(1) byte[] 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) {
 		@Pc(4) int local4 = -(arg5 >> 2);
 		@Pc(9) int local9 = -(arg5 & 0x3);
 		for (@Pc(12) int local12 = -arg6; local12 < 0; local12++) {
@@ -198,16 +198,16 @@ public final class WorldMapFont {
 	}
 
 	@OriginalMember(owner = "client!fd", name = "b", descriptor = "(Lclient!na;IIIZ)V")
-	public final void method1508(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
-		@Pc(5) int local5 = this.method1510(arg0) / 2;
+	public final void renderStringCenter(@OriginalArg(0) JagString arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
+		@Pc(5) int local5 = this.getStringWidth(arg0) / 2;
 		@Pc(8) int local8 = this.method1511();
 		if (arg1 - local5 <= Static129.clipRight && (arg1 + local5 >= Static129.clipLeft && (arg2 - local8 <= Static129.clipBottom && arg2 >= 0))) {
-			this.method1502(arg0, arg1 - local5, arg2, arg3, true);
+			this.renderString(arg0, arg1 - local5, arg2, arg3, true);
 		}
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Ljava/awt/Font;Ljava/awt/FontMetrics;CIZ)V")
-	private void method1509(@OriginalArg(0) Font arg0, @OriginalArg(1) FontMetrics arg1, @OriginalArg(2) char arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
+	private void preRenderGlyph(@OriginalArg(0) Font arg0, @OriginalArg(1) FontMetrics arg1, @OriginalArg(2) char arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean arg4) {
 		@Pc(3) int local3 = arg1.charWidth(arg2);
 		@Pc(5) int local5 = local3;
 		if (arg4) {
@@ -284,28 +284,28 @@ public final class WorldMapFont {
 				}
 			}
 		}
-		this.aByteArray21[arg3 * 9] = (byte) (this.anInt1955 / 16384);
-		this.aByteArray21[arg3 * 9 + 1] = (byte) (this.anInt1955 / 128 & 0x7F);
-		this.aByteArray21[arg3 * 9 + 2] = (byte) (this.anInt1955 & 0x7F);
-		this.aByteArray21[arg3 * 9 + 3] = (byte) (local138 - local134);
-		this.aByteArray21[arg3 * 9 + 4] = (byte) (local140 - local136);
-		this.aByteArray21[arg3 * 9 + 5] = (byte) local134;
-		this.aByteArray21[arg3 * 9 + 6] = (byte) (local48 - local136);
-		this.aByteArray21[arg3 * 9 + 7] = (byte) local5;
-		this.aByteArray21[arg3 * 9 + 8] = (byte) local57;
+		this.data[arg3 * 9] = (byte) (this.dataIndex / 16384);
+		this.data[arg3 * 9 + 1] = (byte) (this.dataIndex / 128 & 0x7F);
+		this.data[arg3 * 9 + 2] = (byte) (this.dataIndex & 0x7F);
+		this.data[arg3 * 9 + 3] = (byte) (local138 - local134);
+		this.data[arg3 * 9 + 4] = (byte) (local140 - local136);
+		this.data[arg3 * 9 + 5] = (byte) local134;
+		this.data[arg3 * 9 + 6] = (byte) (local48 - local136);
+		this.data[arg3 * 9 + 7] = (byte) local5;
+		this.data[arg3 * 9 + 8] = (byte) local57;
 		for (local142 = local136; local142 < local140; local142++) {
 			for (local147 = local134; local147 < local138; local147++) {
 				local158 = local111[local147 + local142 * local3] & 0xFF;
 				if (local158 > 30 && local158 < 230) {
-					this.aBoolean112 = true;
+					this.grayscale = true;
 				}
-				this.aByteArray21[this.anInt1955++] = (byte) local158;
+				this.data[this.dataIndex++] = (byte) local158;
 			}
 		}
 	}
 
 	@OriginalMember(owner = "client!fd", name = "a", descriptor = "(Lclient!na;)I")
-	private int method1510(@OriginalArg(0) JagString arg0) {
+	private int getStringWidth(@OriginalArg(0) JagString arg0) {
 		@Pc(1) int local1 = 0;
 		for (@Pc(3) int local3 = 0; local3 < arg0.length(); local3++) {
 			if (arg0.charAt(local3) == 64 && local3 + 4 < arg0.length() && arg0.charAt(local3 + 4) == 64) {
@@ -313,7 +313,7 @@ public final class WorldMapFont {
 			} else if (arg0.charAt(local3) == 126 && local3 + 4 < arg0.length() && arg0.charAt(local3 + 4) == 126) {
 				local3 += 4;
 			} else {
-				local1 += this.aByteArray21[anIntArray155[arg0.charAt(local3)] + 7];
+				local1 += this.data[CHAR_INDEXES[arg0.charAt(local3)] + 7];
 			}
 		}
 		return local1;
@@ -321,6 +321,6 @@ public final class WorldMapFont {
 
 	@OriginalMember(owner = "client!fd", name = "c", descriptor = "()I")
 	public final int method1511() {
-		return this.aByteArray21[6];
+		return this.data[6];
 	}
 }
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
index e65e7d4..5234b44 100644
--- a/client/src/main/java/client.java
+++ b/client/src/main/java/client.java
@@ -37,24 +37,24 @@ public final class client extends GameShell {
 			} else {
 				Static131.method2577("modewhat");
 			}
-			Static249.aBoolean282 = false;
+			Static249.advertSuppressed = false;
 			try {
 				@Pc(63) byte[] local63 = arg0[2].getBytes("ISO-8859-1");
 				local15 = Static101.method2053(Static10.decodeString(local63, local63.length, 0));
 			} catch (@Pc(74) Exception local74) {
 			}
 			if (local15 != -1) {
-				Static141.anInt3470 = local15;
+				Static141.language = local15;
 			} else if (arg0[2].equals("english")) {
-				Static141.anInt3470 = 0;
+				Static141.language = 0;
 			} else if (arg0[2].equals("german")) {
-				Static141.anInt3470 = 1;
+				Static141.language = 1;
 			} else {
 				Static131.method2577("language");
 			}
-			Static3.method4659(Static141.anInt3470);
-			Static233.aBoolean254 = false;
-			Static150.aBoolean175 = false;
+			Static3.setLanguage(Static141.language);
+			Static233.javaScript = false;
+			Static150.objectTag = false;
 			if (arg0[3].equals("game0")) {
 				Static266.game = 0;
 			} else if (arg0[3].equals("game1")) {
@@ -62,16 +62,16 @@ public final class client extends GameShell {
 			} else {
 				Static131.method2577("game");
 			}
-			Static279.anInt5880 = 0;
-			Static178.aBoolean203 = false;
-			Static204.anInt4760 = 0;
-			Static47.aClass100_991 = Static186.EMPTY_FILE;
-			@Pc(146) client local146 = new client();
-			Static215.aClient1 = local146;
-			local146.startApplication(Static81.modeWhat + 32, "runescape");
+			Static279.country = 0;
+			Static178.haveIe6 = false;
+			Static204.affiliate = 0;
+			Static47.settings = Static186.EMPTY;
+			@Pc(146) client c = new client();
+			Static215.instance = c;
+			c.startApplication(Static81.modeWhat + 32, "runescape");
 			GameShell.frame.setLocation(40, 40);
-		} catch (@Pc(167) Exception local167) {
-			Static89.report(null, local167);
+		} catch (@Pc(167) Exception ex) {
+			Static89.report(null, ex);
 		}
 	}
 
@@ -86,7 +86,7 @@ public final class client extends GameShell {
 			Static11.musicChannel.method3570();
 		}
 		if ((Static244.gameState == 30 || Static244.gameState == 10) && (GameShell.replaceCanvas || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) {
-			Static241.setWindowMode(GameShell.replaceCanvas, Static144.method2736(), Static114.anInt5831, Static22.anInt729);
+			Static241.setWindowMode(GameShell.replaceCanvas, Static144.getWindowMode(), Static114.anInt5831, Static22.anInt729);
 		}
 		@Pc(80) int local80;
 		@Pc(84) int local84;
@@ -128,9 +128,9 @@ public final class client extends GameShell {
 			}
 		}
 		if (Static244.gameState == 0) {
-			Static13.method473(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage);
+			Static13.render(null, local158, Static126.mainLoadSecondaryText, Static199.mainLoadPercentage);
 		} else if (Static244.gameState == 5) {
-			Static182.method3359(false, Static280.aClass3_Sub2_Sub9_43);
+			Static182.render(false, Static280.aClass3_Sub2_Sub9_43);
 		} else if (Static244.gameState == 10) {
 			Static126.method2460();
 		} else if (Static244.gameState == 25 || Static244.gameState == 28) {
@@ -155,19 +155,19 @@ public final class client extends GameShell {
 			Static114.drawTextOnScreen(false, Static34.concatenate(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH}));
 		}
 		if (GlRenderer.enabled && Static244.gameState != 0) {
-			GlRenderer.method4153();
+			GlRenderer.swapBuffers();
 			for (local80 = 0; local80 < Static24.anInt766; local80++) {
-				Static31.aBooleanArray29[local80] = false;
+				Static31.rectangleRedraw[local80] = false;
 			}
 		} else {
 			@Pc(388) Graphics local388;
-			if ((Static244.gameState == 30 || Static244.gameState == 10) && Static199.anInt4672 == 0 && !local158) {
+			if ((Static244.gameState == 30 || Static244.gameState == 10) && Static199.rectDebug == 0 && !local158) {
 				try {
 					local388 = GameShell.canvas.getGraphics();
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
-						if (Static31.aBooleanArray29[local84]) {
+						if (Static31.rectangleRedraw[local84]) {
 							Static260.frameBuffer.drawAt(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]);
-							Static31.aBooleanArray29[local84] = false;
+							Static31.rectangleRedraw[local84] = false;
 						}
 					}
 				} catch (@Pc(423) Exception local423) {
@@ -178,7 +178,7 @@ public final class client extends GameShell {
 					local388 = GameShell.canvas.getGraphics();
 					Static260.frameBuffer.draw(local388);
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
-						Static31.aBooleanArray29[local84] = false;
+						Static31.rectangleRedraw[local84] = false;
 					}
 				} catch (@Pc(453) Exception local453) {
 					GameShell.canvas.repaint();
@@ -186,7 +186,7 @@ public final class client extends GameShell {
 			}
 		}
 		if (Static107.clean) {
-			Static213.method3729();
+			Static213.clean();
 		}
 		if (Static164.safeMode && Static244.gameState == 10 && Static154.topLevelInterface != -1) {
 			Static164.safeMode = false;
@@ -201,14 +201,14 @@ public final class client extends GameShell {
 			GlRenderer.quit();
 		}
 		if (GameShell.fullScreenFrame != null) {
-			Static25.method714(GameShell.fullScreenFrame, GameShell.signLink);
+			Static25.exitFullScreen(GameShell.fullScreenFrame, GameShell.signLink);
 			GameShell.fullScreenFrame = null;
 		}
 		if (GameShell.signLink != null) {
 			GameShell.signLink.unloadGlNatives(this.getClass());
 		}
 		if (Static178.instance != null) {
-			Static178.instance.aBoolean151 = false;
+			Static178.instance.running = false;
 		}
 		Static178.instance = null;
 		if (Static124.socket != null) {
@@ -216,21 +216,21 @@ public final class client extends GameShell {
 			Static124.socket = null;
 		}
 		Keyboard.stop(GameShell.canvas);
-		Static223.method3866(GameShell.canvas);
+		Static223.stop(GameShell.canvas);
 		if (Static71.mouseWheel != null) {
-			Static71.mouseWheel.method3291(GameShell.canvas);
+			Static71.mouseWheel.stop(GameShell.canvas);
 		}
-		Static6.method82();
-		Static251.method4277();
+		Static6.quit();
+		Static251.quit();
 		Static71.mouseWheel = null;
 		if (Static11.musicChannel != null) {
-			Static11.musicChannel.method3575();
+			Static11.musicChannel.quit();
 		}
 		if (Static147.soundChannel != null) {
-			Static147.soundChannel.method3575();
+			Static147.soundChannel.quit();
 		}
-		Static107.js5NetQueue.method2329();
-		Static86.js5CacheQueue.method2466();
+		Static107.js5NetQueue.quit();
+		Static86.js5CacheQueue.quit();
 		try {
 			if (Static172.cacheData != null) {
 				Static172.cacheData.method1455();
@@ -269,27 +269,27 @@ public final class client extends GameShell {
 		}
 		@Pc(50) String local50 = this.getParameter("advertsuppressed");
 		if (local50 != null && local50.equals("1")) {
-			Static249.aBoolean282 = true;
+			Static249.advertSuppressed = true;
 		} else {
-			Static249.aBoolean282 = false;
+			Static249.advertSuppressed = false;
 		}
 		try {
-			Static141.anInt3470 = Integer.parseInt(this.getParameter("lang"));
+			Static141.language = Integer.parseInt(this.getParameter("lang"));
 		} catch (@Pc(69) Exception local69) {
-			Static141.anInt3470 = 0;
+			Static141.language = 0;
 		}
-		Static3.method4659(Static141.anInt3470);
+		Static3.setLanguage(Static141.language);
 		@Pc(78) String local78 = this.getParameter("objecttag");
 		if (local78 != null && local78.equals("1")) {
-			Static233.aBoolean254 = true;
+			Static233.javaScript = true;
 		} else {
-			Static233.aBoolean254 = false;
+			Static233.javaScript = false;
 		}
 		@Pc(94) String local94 = this.getParameter("js");
 		if (local94 != null && local94.equals("1")) {
-			Static150.aBoolean175 = true;
+			Static150.objectTag = true;
 		} else {
-			Static150.aBoolean175 = false;
+			Static150.objectTag = false;
 		}
 		@Pc(111) String local111 = this.getParameter("game");
 		if (local111 != null && local111.equals("1")) {
@@ -298,29 +298,29 @@ public final class client extends GameShell {
 			Static266.game = 0;
 		}
 		try {
-			Static204.anInt4760 = Integer.parseInt(this.getParameter("affid"));
+			Static204.affiliate = Integer.parseInt(this.getParameter("affid"));
 		} catch (@Pc(130) Exception local130) {
-			Static204.anInt4760 = 0;
+			Static204.affiliate = 0;
 		}
-		Static47.aClass100_991 = Static227.aClass100_966.method3153(this);
-		if (Static47.aClass100_991 == null) {
-			Static47.aClass100_991 = Static186.EMPTY_FILE;
+		Static47.settings = Static227.SETTINGS.fromParameters(this);
+		if (Static47.settings == null) {
+			Static47.settings = Static186.EMPTY;
 		}
 		@Pc(146) String local146 = this.getParameter("country");
 		if (local146 != null) {
 			try {
-				Static279.anInt5880 = Integer.parseInt(local146);
+				Static279.country = Integer.parseInt(local146);
 			} catch (@Pc(153) Exception local153) {
-				Static279.anInt5880 = 0;
+				Static279.country = 0;
 			}
 		}
 		@Pc(159) String local159 = this.getParameter("haveie6");
 		if (local159 != null && local159.equals("1")) {
-			Static178.aBoolean203 = true;
+			Static178.haveIe6 = true;
 		} else {
-			Static178.aBoolean203 = false;
+			Static178.haveIe6 = false;
 		}
-		Static215.aClient1 = this;
+		Static215.instance = this;
 		this.startApplet(Static81.modeWhat + 32);
 	}
 
@@ -431,35 +431,35 @@ public final class client extends GameShell {
 		Static119.transmitTimer++;
 		if (GlRenderer.enabled) {
 			label191: for (@Pc(57) int local57 = 0; local57 < 32768; local57++) {
-				@Pc(66) Npc local66 = Static175.aClass8_Sub4_Sub2Array1[local57];
+				@Pc(66) Npc local66 = Static175.npcs[local57];
 				if (local66 != null) {
-					@Pc(73) byte local73 = local66.aClass96_1.aByte10;
-					if ((local73 & 0x2) > 0 && local66.anInt3409 == 0 && Math.random() * 1000.0D < 10.0D) {
+					@Pc(73) byte local73 = local66.type.aByte10;
+					if ((local73 & 0x2) > 0 && local66.movementQueueSize == 0 && Math.random() * 1000.0D < 10.0D) {
 						@Pc(98) int local98 = (int) Math.round(Math.random() * 2.0D - 1.0D);
 						@Pc(106) int local106 = (int) Math.round(Math.random() * 2.0D - 1.0D);
 						if (local98 != 0 || local106 != 0) {
-							local66.aByteArray48[0] = 1;
-							local66.movementQueueX[0] = local98 + (local66.anInt3412 >> 7);
-							local66.movementQueueZ[0] = local106 + (local66.anInt3421 >> 7);
-							Static148.collisionMaps[Static55.level].method3056(local66.anInt3412 >> 7, local66.method2693(), false, 0, local66.method2693(), local66.anInt3421 >> 7);
-							if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.method2693() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.method2693() && Static148.collisionMaps[Static55.level].method3054(local66.anInt3421 >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.anInt3412 >> 7)) {
-								if (local66.method2693() > 1) {
-									for (@Pc(226) int local226 = local66.movementQueueX[0]; local66.movementQueueX[0] + local66.method2693() > local226; local226++) {
-										for (@Pc(246) int local246 = local66.movementQueueZ[0]; local66.movementQueueZ[0] + local66.method2693() > local246; local246++) {
+							local66.movementQueueSpeed[0] = 1;
+							local66.movementQueueX[0] = local98 + (local66.xFine >> 7);
+							local66.movementQueueZ[0] = local106 + (local66.zFine >> 7);
+							Static148.collisionMaps[Static55.level].unflagScenery(local66.xFine >> 7, local66.getSize(), false, 0, local66.getSize(), local66.zFine >> 7);
+							if (local66.movementQueueX[0] >= 0 && local66.movementQueueX[0] <= 104 - local66.getSize() && local66.movementQueueZ[0] >= 0 && local66.movementQueueZ[0] <= 104 - local66.getSize() && Static148.collisionMaps[Static55.level].method3054(local66.zFine >> 7, local66.movementQueueZ[0], local66.movementQueueX[0], local66.xFine >> 7)) {
+								if (local66.getSize() > 1) {
+									for (@Pc(226) int local226 = local66.movementQueueX[0]; local66.movementQueueX[0] + local66.getSize() > local226; local226++) {
+										for (@Pc(246) int local246 = local66.movementQueueZ[0]; local66.movementQueueZ[0] + local66.getSize() > local246; local246++) {
 											if ((Static148.collisionMaps[Static55.level].anIntArrayArray30[local226][local246] & 0x12401FF) != 0) {
 												continue label191;
 											}
 										}
 									}
 								}
-								local66.anInt3409 = 1;
+								local66.movementQueueSize = 1;
 							}
 						}
 					}
 					Static104.method2247(local66);
 					Static37.method949(local66);
 					Static34.method879(local66);
-					Static148.collisionMaps[Static55.level].method3043(local66.anInt3412 >> 7, false, local66.anInt3421 >> 7, local66.method2693(), local66.method2693());
+					Static148.collisionMaps[Static55.level].flagScenery(local66.xFine >> 7, false, local66.zFine >> 7, local66.getSize(), local66.getSize());
 				}
 			}
 		}
@@ -873,8 +873,8 @@ public final class client extends GameShell {
 			Static199.mainLoadPercentage = 75;
 			Static166.mainLoadState = 120;
 		} else if (Static166.mainLoadState == 120) {
-			if (Static184.js5Archive10.isFileReady(Static186.EMPTY_FILE, Static252.HUFFMAN_GROUP)) {
-				@Pc(1060) HuffmanCodec codec = new HuffmanCodec(Static184.js5Archive10.fetchFile(Static186.EMPTY_FILE, Static252.HUFFMAN_GROUP));
+			if (Static184.js5Archive10.isFileReady(Static186.EMPTY, Static252.HUFFMAN_GROUP)) {
+				@Pc(1060) HuffmanCodec codec = new HuffmanCodec(Static184.js5Archive10.fetchFile(Static186.EMPTY, Static252.HUFFMAN_GROUP));
 				Static1.method1(codec);
 				Static126.mainLoadSecondaryText = LocalizedText.MAINLOAD120B;
 				Static166.mainLoadState = 130;
@@ -965,10 +965,10 @@ public final class client extends GameShell {
 		if (Static257.js5MasterIndex != null) {
 			Static257.js5MasterIndex.method179();
 		}
-		Static230.method3948();
-		Static107.method2261();
+		Static230.loop();
+		Static107.loop();
 		Keyboard.loop();
-		Static111.handleMouse();
+		Static111.loop();
 		if (GlRenderer.enabled) {
 			Static63.process();
 		}
@@ -978,26 +978,26 @@ public final class client extends GameShell {
 		}
 		if (Static244.gameState == 0) {
 			this.mainLoad();
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static244.gameState == 5) {
 			this.mainLoad();
-			Static234.method4020();
+			Static234.resetTimer();
 		} else if (Static244.gameState == 25 || Static244.gameState == 28) {
 			Static78.rebuildMap();
 		}
 		if (Static244.gameState == 10) {
 			this.method943();
-			Static158.handleAccountCreation();
-			Static31.method848();
-			Static216.handleLogin();
+			Static158.loop();
+			Static31.loopAuto();
+			Static216.loop();
 		} else if (Static244.gameState == 30) {
 			Static81.method1756();
 		} else if (Static244.gameState == 40) {
-			Static216.handleLogin();
-			if (Static266.returnCode != -3) {
-				if (Static266.returnCode == 15) {
+			Static216.loop();
+			if (Static266.reply != -3) {
+				if (Static266.reply == 15) {
 					Static44.method1146();
-				} else if (Static266.returnCode != 2) {
+				} else if (Static266.reply != 2) {
 					Static278.processLogout();
 				}
 			}