diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java
index 8c9dab6..99c8173 100644
--- a/client/src/main/java/AudioChannel.java
+++ b/client/src/main/java/AudioChannel.java
@@ -26,7 +26,7 @@ public class AudioChannel {
 	private final int anInt4621 = 32;
 
 	@OriginalMember(owner = "client!vh", name = "f", descriptor = "J")
-	private long aLong151 = MonotonicClock.method5096();
+	private long aLong151 = MonotonicClock.currentTimeMillis();
 
 	@OriginalMember(owner = "client!vh", name = "w", descriptor = "[Lclient!qb;")
 	private final PcmStream[] aClass3_Sub3Array5 = new PcmStream[8];
@@ -161,7 +161,7 @@ public class AudioChannel {
 		if (this.aClass3_Sub3_6 != null) {
 			this.aClass3_Sub3_6.method4408(arg0, 0, 256);
 		}
-		this.aLong151 = MonotonicClock.method5096();
+		this.aLong151 = MonotonicClock.currentTimeMillis();
 	}
 
 	@OriginalMember(owner = "client!vh", name = "a", descriptor = "(B)V")
@@ -169,7 +169,7 @@ public class AudioChannel {
 		if (this.anIntArray411 == null) {
 			return;
 		}
-		@Pc(14) long local14 = MonotonicClock.method5096();
+		@Pc(14) long local14 = MonotonicClock.currentTimeMillis();
 		try {
 			if (this.aLong153 != 0L) {
 				if (local14 < this.aLong153) {
@@ -268,7 +268,7 @@ public class AudioChannel {
 			this.method3563();
 		} catch (@Pc(10) Exception local10) {
 			this.method3572();
-			this.aLong153 = MonotonicClock.method5096() + 2000L;
+			this.aLong153 = MonotonicClock.currentTimeMillis() + 2000L;
 		}
 	}
 
diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java
index daf5662..4e3ddda 100644
--- a/client/src/main/java/BufferedSocket.java
+++ b/client/src/main/java/BufferedSocket.java
@@ -131,12 +131,12 @@ public final class BufferedSocket implements Runnable {
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(I)I")
-	public final int method2828() throws IOException {
+	public final int read() throws IOException {
 		return this.aBoolean177 ? 0 : this.anInputStream1.read();
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(ZI[BI)V")
-	public final void method2830(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int arg1) throws IOException {
+	public final void write(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int arg1) throws IOException {
 		if (this.aBoolean177) {
 			return;
 		}
@@ -169,7 +169,7 @@ public final class BufferedSocket implements Runnable {
 	}
 
 	@OriginalMember(owner = "client!ma", name = "c", descriptor = "(I)I")
-	public final int method2831() throws IOException {
+	public final int available() throws IOException {
 		return this.aBoolean177 ? 0 : this.anInputStream1.available();
 	}
 
@@ -199,10 +199,10 @@ public final class BufferedSocket implements Runnable {
 			this.notifyAll();
 		}
 		if (this.aClass212_4 != null) {
-			while (this.aClass212_4.anInt5925 == 0) {
+			while (this.aClass212_4.status == 0) {
 				Static231.method3983(1L);
 			}
-			if (this.aClass212_4.anInt5925 == 1) {
+			if (this.aClass212_4.status == 1) {
 				try {
 					((Thread) this.aClass212_4.anObject6).join();
 				} catch (@Pc(59) InterruptedException local59) {
diff --git a/client/src/main/java/DelayedStateChange.java b/client/src/main/java/DelayedStateChange.java
index 49c151e..24265b1 100644
--- a/client/src/main/java/DelayedStateChange.java
+++ b/client/src/main/java/DelayedStateChange.java
@@ -24,7 +24,7 @@ public final class DelayedStateChange extends SecondaryNode {
 
 	@OriginalMember(owner = "client!da", name = "a", descriptor = "(Z)V")
 	public final void method1007() {
-		this.aLong185 = MonotonicClock.method5096() + 500L | Long.MIN_VALUE & this.aLong185;
+		this.aLong185 = MonotonicClock.currentTimeMillis() + 500L | Long.MIN_VALUE & this.aLong185;
 		Static140.aClass16_7.method798(this);
 	}
 
diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java
index b138eea..78824b4 100644
--- a/client/src/main/java/GameShell.java
+++ b/client/src/main/java/GameShell.java
@@ -24,7 +24,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "providesignlink", descriptor = "(Lsignlink!ll;)V")
 	public static void providesignlink(@OriginalArg(0) SignLink arg0) {
-		Static71.aClass213_3 = arg0;
+		Static71.signLink = arg0;
 		Static69.aClass213_4 = arg0;
 	}
 
@@ -57,7 +57,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final AppletContext getAppletContext() {
 		if (Static39.aFrame1 == null) {
-			return Static71.aClass213_3 == null || Static71.aClass213_3.anApplet2 == this ? super.getAppletContext() : Static71.aClass213_3.anApplet2.getAppletContext();
+			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getAppletContext() : Static71.signLink.anApplet2.getAppletContext();
 		} else {
 			return null;
 		}
@@ -82,43 +82,43 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "(B)V")
 	public final synchronized void method926() {
-		if (Static154.aCanvas1 != null) {
-			Static154.aCanvas1.removeFocusListener(this);
-			Static154.aCanvas1.getParent().remove(Static154.aCanvas1);
+		if (Static154.canvas != null) {
+			Static154.canvas.removeFocusListener(this);
+			Static154.canvas.getParent().remove(Static154.canvas);
 		}
 		@Pc(19) Container local19;
 		if (Static69.aFrame2 != null) {
 			local19 = Static69.aFrame2;
 		} else if (Static39.aFrame1 == null) {
-			local19 = Static71.aClass213_3.anApplet2;
+			local19 = Static71.signLink.anApplet2;
 		} else {
 			local19 = Static39.aFrame1;
 		}
 		local19.setLayout(null);
-		Static154.aCanvas1 = new GameCanvas(this);
-		local19.add(Static154.aCanvas1);
-		Static154.aCanvas1.setSize(Static48.anInt1448, Static254.anInt5554);
-		Static154.aCanvas1.setVisible(true);
+		Static154.canvas = new GameCanvas(this);
+		local19.add(Static154.canvas);
+		Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
+		Static154.canvas.setVisible(true);
 		if (local19 == Static39.aFrame1) {
 			@Pc(66) Insets local66 = Static39.aFrame1.getInsets();
-			Static154.aCanvas1.setLocation(Static145.anInt3497 + local66.left, local66.top + Static178.anInt4246);
+			Static154.canvas.setLocation(Static145.anInt3497 + local66.left, local66.top + Static178.anInt4246);
 		} else {
-			Static154.aCanvas1.setLocation(Static145.anInt3497, Static178.anInt4246);
+			Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
 		}
-		Static154.aCanvas1.addFocusListener(this);
-		Static154.aCanvas1.requestFocus();
+		Static154.canvas.addFocusListener(this);
+		Static154.canvas.requestFocus();
 		Static233.aBoolean253 = true;
 		Static69.aBoolean115 = true;
 		Static26.aBoolean59 = true;
 		Static35.aBoolean66 = false;
-		Static243.aLong178 = MonotonicClock.method5096();
+		Static243.aLong178 = MonotonicClock.currentTimeMillis();
 	}
 
 	@OriginalMember(owner = "client!rc", name = "destroy", descriptor = "()V")
 	@Override
 	public final void destroy() {
 		if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) {
-			Static72.aLong74 = MonotonicClock.method5096();
+			Static72.aLong74 = MonotonicClock.currentTimeMillis();
 			Static231.method3983(5000L);
 			Static69.aClass213_4 = null;
 			this.method931(false);
@@ -154,7 +154,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final URL getDocumentBase() {
 		if (Static39.aFrame1 == null) {
-			return Static71.aClass213_3 == null || Static71.aClass213_3.anApplet2 == this ? super.getDocumentBase() : Static71.aClass213_3.anApplet2.getDocumentBase();
+			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getDocumentBase() : Static71.signLink.anApplet2.getDocumentBase();
 		} else {
 			return null;
 		}
@@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			return;
 		}
 		Static69.aBoolean115 = true;
-		if (Static236.aBoolean256 && !Static239.aBoolean269 && MonotonicClock.method5096() - Static243.aLong178 > 1000L) {
+		if (Static236.aBoolean256 && !Static239.aBoolean269 && MonotonicClock.currentTimeMillis() - Static243.aLong178 > 1000L) {
 			@Pc(29) Rectangle local29 = arg0.getClipBounds();
 			if (local29 == null || local29.width >= Static72.anInt2046 && Static122.anInt3045 <= local29.height) {
 				Static35.aBoolean66 = true;
@@ -188,23 +188,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			}
 			Static58.aBoolean101 = true;
 		}
-		if (Static71.aClass213_3.anApplet2 != null) {
-			Static71.aClass213_3.anApplet2.destroy();
+		if (Static71.signLink.anApplet2 != null) {
+			Static71.signLink.anApplet2.destroy();
 		}
 		try {
 			this.method928();
 		} catch (@Pc(34) Exception local34) {
 		}
-		if (Static154.aCanvas1 != null) {
+		if (Static154.canvas != null) {
 			try {
-				Static154.aCanvas1.removeFocusListener(this);
-				Static154.aCanvas1.getParent().remove(Static154.aCanvas1);
+				Static154.canvas.removeFocusListener(this);
+				Static154.canvas.getParent().remove(Static154.canvas);
 			} catch (@Pc(45) Exception local45) {
 			}
 		}
-		if (Static71.aClass213_3 != null) {
+		if (Static71.signLink != null) {
 			try {
-				Static71.aClass213_3.method5124();
+				Static71.signLink.method5124();
 			} catch (@Pc(53) Exception local53) {
 			}
 		}
@@ -225,7 +225,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "b", descriptor = "(Z)V")
 	private void method932() {
-		@Pc(6) long local6 = MonotonicClock.method5096();
+		@Pc(6) long local6 = MonotonicClock.currentTimeMillis();
 		@Pc(10) long local10 = Static228.aLongArray8[Static261.anInt5741];
 		Static228.aLongArray8[Static261.anInt5741] = local6;
 		Static261.anInt5741 = Static261.anInt5741 + 1 & 0x1F;
@@ -239,7 +239,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
 	@OriginalMember(owner = "client!rc", name = "e", descriptor = "(I)V")
 	private void method933() {
-		@Pc(2) long local2 = MonotonicClock.method5096();
+		@Pc(2) long local2 = MonotonicClock.currentTimeMillis();
 		@Pc(6) long local6 = Static7.aLongArray2[Static111.anInt2903];
 		Static7.aLongArray2[Static111.anInt2903] = local2;
 		Static111.anInt2903 = Static111.anInt2903 + 1 & 0x1F;
@@ -250,13 +250,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 		if (Static184.anInt4355++ > 50) {
 			Static69.aBoolean115 = true;
 			Static184.anInt4355 -= 50;
-			Static154.aCanvas1.setSize(Static48.anInt1448, Static254.anInt5554);
-			Static154.aCanvas1.setVisible(true);
+			Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
+			Static154.canvas.setVisible(true);
 			if (Static39.aFrame1 != null && Static69.aFrame2 == null) {
 				@Pc(84) Insets local84 = Static39.aFrame1.getInsets();
-				Static154.aCanvas1.setLocation(local84.left + Static145.anInt3497, Static178.anInt4246 + local84.top);
+				Static154.canvas.setLocation(local84.left + Static145.anInt3497, Static178.anInt4246 + local84.top);
 			} else {
-				Static154.aCanvas1.setLocation(Static145.anInt3497, Static178.anInt4246);
+				Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
 			}
 		}
 		this.method934();
@@ -269,7 +269,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final URL getCodeBase() {
 		if (Static39.aFrame1 == null) {
-			return Static71.aClass213_3 == null || Static71.aClass213_3.anApplet2 == this ? super.getCodeBase() : Static71.aClass213_3.anApplet2.getCodeBase();
+			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getCodeBase() : Static71.signLink.anApplet2.getCodeBase();
 		} else {
 			return null;
 		}
@@ -309,27 +309,27 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 					Static236.aBoolean256 = true;
 				}
 			}
-			if (Static71.aClass213_3.anApplet2 != null) {
+			if (Static71.signLink.anApplet2 != null) {
 				@Pc(125) Method local125 = SignLink.aMethod5;
 				if (local125 != null) {
 					try {
-						local125.invoke(Static71.aClass213_3.anApplet2, Boolean.TRUE);
+						local125.invoke(Static71.signLink.anApplet2, Boolean.TRUE);
 					} catch (@Pc(142) Throwable local142) {
 					}
 				}
 			}
 			Static224.method3888();
 			this.method926();
-			Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.aCanvas1);
+			Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.canvas);
 			this.method935();
 			Static200.aClass93_1 = Static70.method1547();
-			while (Static72.aLong74 == 0L || Static72.aLong74 > MonotonicClock.method5096()) {
+			while (Static72.aLong74 == 0L || Static72.aLong74 > MonotonicClock.currentTimeMillis()) {
 				Static227.anInt5097 = Static200.aClass93_1.method3391(Static226.anInt5081, Static11.anInt386);
 				for (local76 = 0; local76 < Static227.anInt5097; local76++) {
 					this.method932();
 				}
 				this.method933();
-				Static140.method2708(Static71.aClass213_3, Static154.aCanvas1);
+				Static140.method2708(Static71.signLink, Static154.canvas);
 			}
 		} catch (@Pc(198) Exception local198) {
 			Static89.method1839(null, local198);
@@ -342,7 +342,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final String getParameter(@OriginalArg(0) String arg0) {
 		if (Static39.aFrame1 == null) {
-			return Static71.aClass213_3 == null || Static71.aClass213_3.anApplet2 == this ? super.getParameter(arg0) : Static71.aClass213_3.anApplet2.getParameter(arg0);
+			return Static71.signLink == null || Static71.signLink.anApplet2 == this ? super.getParameter(arg0) : Static71.signLink.anApplet2.getParameter(arg0);
 		} else {
 			return null;
 		}
@@ -355,7 +355,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 	@Override
 	public final void stop() {
 		if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) {
-			Static72.aLong74 = MonotonicClock.method5096() + 4000L;
+			Static72.aLong74 = MonotonicClock.currentTimeMillis() + 4000L;
 		}
 	}
 
@@ -381,9 +381,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			Static39.aFrame1.toFront();
 			@Pc(44) Insets local44 = Static39.aFrame1.getInsets();
 			Static39.aFrame1.setSize(local44.left + Static72.anInt2046 + local44.right, local44.top + Static122.anInt3045 + local44.bottom);
-			Static69.aClass213_4 = Static71.aClass213_3 = new SignLink(null, arg0, arg1, 28);
-			@Pc(76) PrivilegedRequest local76 = Static71.aClass213_3.method5130(1, this);
-			while (local76.anInt5925 == 0) {
+			Static69.aClass213_4 = Static71.signLink = new SignLink(null, arg0, arg1, 28);
+			@Pc(76) PrivilegedRequest local76 = Static71.signLink.method5130(1, this);
+			while (local76.status == 0) {
 				Static231.method3983(10L);
 			}
 			Static37.aThread1 = (Thread) local76.anObject6;
@@ -431,11 +431,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 			} else {
 				Static40.aBoolean78 = false;
 			}
-			if (Static71.aClass213_3 == null) {
-				Static69.aClass213_4 = Static71.aClass213_3 = new SignLink(this, arg0, null, 0);
+			if (Static71.signLink == null) {
+				Static69.aClass213_4 = Static71.signLink = new SignLink(this, arg0, null, 0);
 			}
-			@Pc(86) PrivilegedRequest local86 = Static71.aClass213_3.method5130(1, this);
-			while (local86.anInt5925 == 0) {
+			@Pc(86) PrivilegedRequest local86 = Static71.signLink.method5130(1, this);
+			while (local86.status == 0) {
 				Static231.method3983(10L);
 			}
 			Static37.aThread1 = (Thread) local86.anObject6;
diff --git a/client/src/main/java/GlobalConfig.java b/client/src/main/java/GlobalConfig.java
new file mode 100644
index 0000000..8a972c6
--- /dev/null
+++ b/client/src/main/java/GlobalConfig.java
@@ -0,0 +1,8 @@
+public class GlobalConfig {
+    public static int DEFAULT_PORT = 43594;
+    public static int ALTERNATE_PORT = 43593;
+    public static boolean SELECT_DEFAULT_WORLD = true;
+
+    // Some servers don't use ISAAC.
+    public static boolean USE_ISAAC = false;
+}
diff --git a/client/src/main/java/IsaacRandom.java b/client/src/main/java/IsaacRandom.java
index f768581..c0c6313 100644
--- a/client/src/main/java/IsaacRandom.java
+++ b/client/src/main/java/IsaacRandom.java
@@ -159,11 +159,15 @@ public final class IsaacRandom {
 
 	@OriginalMember(owner = "client!ij", name = "a", descriptor = "(I)I")
 	public final int method2295() {
-		if (this.anInt2916-- == 0) {
-			this.method2296();
-			this.anInt2916 = 255;
+		if (GlobalConfig.USE_ISAAC) {
+			if (this.anInt2916-- == 0) {
+				this.method2296();
+				this.anInt2916 = 255;
+			}
+			return this.anIntArray274[this.anInt2916];
+		} else {
+			return 0;
 		}
-		return this.anIntArray274[this.anInt2916];
 	}
 
 	@OriginalMember(owner = "client!ij", name = "b", descriptor = "(I)V")
diff --git a/client/src/main/java/JavaMouseWheel.java b/client/src/main/java/JavaMouseWheel.java
index 9feb9ed..f34e72d 100644
--- a/client/src/main/java/JavaMouseWheel.java
+++ b/client/src/main/java/JavaMouseWheel.java
@@ -34,7 +34,7 @@ public final class JavaMouseWheel extends MouseWheel implements MouseWheelListen
 
 	@OriginalMember(owner = "client!o", name = "a", descriptor = "(Ljava/awt/Component;I)V")
 	@Override
-	public final void method3293(@OriginalArg(0) Component arg0) {
+	public final void start(@OriginalArg(0) Component arg0) {
 		arg0.addMouseWheelListener(this);
 	}
 }
diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java
index 704a0f5..8f4797c 100644
--- a/client/src/main/java/Js5CacheQueue.java
+++ b/client/src/main/java/Js5CacheQueue.java
@@ -20,11 +20,11 @@ public final class Js5CacheQueue implements Runnable {
 
 	@OriginalMember(owner = "client!k", name = "<init>", descriptor = "()V")
 	public Js5CacheQueue() {
-		@Pc(20) PrivilegedRequest local20 = Static71.aClass213_3.method5130(5, this);
-		while (local20.anInt5925 == 0) {
+		@Pc(20) PrivilegedRequest local20 = Static71.signLink.method5130(5, this);
+		while (local20.status == 0) {
 			Static231.method3983(10L);
 		}
-		if (local20.anInt5925 == 2) {
+		if (local20.status == 2) {
 			throw new RuntimeException();
 		}
 		this.aThread2 = (Thread) local20.anObject6;
diff --git a/client/src/main/java/Js5CachedResourceProvider.java b/client/src/main/java/Js5CachedResourceProvider.java
index 8abbd5b..ec4bdee 100644
--- a/client/src/main/java/Js5CachedResourceProvider.java
+++ b/client/src/main/java/Js5CachedResourceProvider.java
@@ -277,7 +277,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				this.aClass69_17 = null;
 			}
 		}
-		if (!this.aBoolean37 || this.aLong20 > MonotonicClock.method5096()) {
+		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()) {
@@ -292,7 +292,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				}
 			}
 		}
-		this.aLong20 = MonotonicClock.method5096() + 1000L;
+		this.aLong20 = MonotonicClock.currentTimeMillis() + 1000L;
 	}
 
 	@OriginalMember(owner = "client!bg", name = "b", descriptor = "(II)I")
@@ -362,8 +362,8 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
 				if (this.aClass70_1.anIntArray268[arg1] != local199) {
 					throw new RuntimeException();
 				}
-				this.aClass73_2.anInt2964 = 0;
-				this.aClass73_2.anInt2963 = 0;
+				this.aClass73_2.errors = 0;
+				this.aClass73_2.response = 0;
 			} catch (@Pc(225) RuntimeException local225) {
 				this.aClass73_2.method2327();
 				local13.method4658();
diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java
index de38492..066b4fb 100644
--- a/client/src/main/java/Js5NetQueue.java
+++ b/client/src/main/java/Js5NetQueue.java
@@ -38,10 +38,10 @@ public final class Js5NetQueue {
 	private byte aByte8 = 0;
 
 	@OriginalMember(owner = "client!jb", name = "I", descriptor = "I")
-	public volatile int anInt2964 = 0;
+	public volatile int errors = 0;
 
 	@OriginalMember(owner = "client!jb", name = "H", descriptor = "I")
-	public volatile int anInt2963 = 0;
+	public volatile int response = 0;
 
 	@OriginalMember(owner = "client!jb", name = "F", descriptor = "Lclient!wa;")
 	private final Buffer aClass3_Sub15_5 = new Buffer(8);
@@ -52,10 +52,10 @@ public final class Js5NetQueue {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "b", descriptor = "(B)Z")
-	public final boolean method2318() {
+	public final boolean loop() {
 		@Pc(19) int local19;
 		if (this.aClass95_1 != null) {
-			@Pc(12) long local12 = MonotonicClock.method5096();
+			@Pc(12) long local12 = MonotonicClock.currentTimeMillis();
 			local19 = (int) (local12 - this.aLong104);
 			this.aLong104 = local12;
 			if (local19 > 200) {
@@ -80,18 +80,18 @@ public final class Js5NetQueue {
 				this.aClass3_Sub15_4.offset = 0;
 				this.aClass3_Sub15_4.p1(1);
 				this.aClass3_Sub15_4.p3((int) local75.aLong185);
-				this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+				this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 				this.aClass16_3.method798(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.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+				this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 				this.aClass16_5.method798(local75);
 			}
 			for (@Pc(172) int local172 = 0; local172 < 100; local172++) {
-				local19 = this.aClass95_1.method2831();
+				local19 = this.aClass95_1.available();
 				if (local19 < 0) {
 					throw new IOException();
 				}
@@ -189,8 +189,8 @@ public final class Js5NetQueue {
 				this.aClass95_1.method2834();
 			} catch (@Pc(650) Exception local650) {
 			}
-			this.anInt2963 = -2;
-			this.anInt2964++;
+			this.response = -2;
+			this.errors++;
 			this.aClass95_1 = null;
 			return this.method2328() == 0 && this.method2321() == 0;
 		}
@@ -205,14 +205,14 @@ public final class Js5NetQueue {
 			this.aClass3_Sub15_4.offset = 0;
 			this.aClass3_Sub15_4.p1(7);
 			this.aClass3_Sub15_4.p3(0);
-			this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(39) IOException local39) {
 			try {
 				this.aClass95_1.method2834();
 			} catch (@Pc(45) Exception local45) {
 			}
-			this.anInt2964++;
-			this.anInt2963 = -2;
+			this.errors++;
+			this.response = -2;
 			this.aClass95_1 = null;
 		}
 	}
@@ -231,14 +231,14 @@ public final class Js5NetQueue {
 			this.aClass3_Sub15_4.offset = 0;
 			this.aClass3_Sub15_4.p1(arg0 ? 2 : 3);
 			this.aClass3_Sub15_4.p3(0);
-			this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(42) IOException local42) {
 			try {
 				this.aClass95_1.method2834();
 			} catch (@Pc(48) Exception local48) {
 			}
-			this.anInt2964++;
-			this.anInt2963 = -2;
+			this.errors++;
+			this.response = -2;
 			this.aClass95_1 = null;
 		}
 	}
@@ -251,7 +251,7 @@ public final class Js5NetQueue {
 	}
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(ZLclient!ma;I)V")
-	public final void method2324(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
+	public final void loggedOut(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
 		if (this.aClass95_1 != null) {
 			try {
 				this.aClass95_1.method2834();
@@ -276,19 +276,19 @@ public final class Js5NetQueue {
 								this.aClass3_Sub15_4.p1(4);
 								this.aClass3_Sub15_4.p1(this.aByte8);
 								this.aClass3_Sub15_4.p2(0);
-								this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+								this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 							} catch (@Pc(107) IOException local107) {
 								try {
 									this.aClass95_1.method2834();
 								} catch (@Pc(113) Exception local113) {
 								}
-								this.anInt2963 = -2;
-								this.anInt2964++;
+								this.response = -2;
+								this.errors++;
 								this.aClass95_1 = null;
 							}
 						}
 						this.anInt2962 = 0;
-						this.aLong104 = MonotonicClock.method5096();
+						this.aLong104 = MonotonicClock.currentTimeMillis();
 						return;
 					}
 					this.aClass16_4.method798(local44);
@@ -309,10 +309,10 @@ public final class Js5NetQueue {
 			this.aClass95_1.method2834();
 		} catch (@Pc(17) Exception local17) {
 		}
-		this.anInt2963 = -1;
+		this.response = -1;
 		this.aByte8 = (byte) (Math.random() * 255.0D + 1.0D);
 		this.aClass95_1 = null;
-		this.anInt2964++;
+		this.errors++;
 	}
 
 	@OriginalMember(owner = "client!jb", name = "d", descriptor = "(I)I")
@@ -356,15 +356,15 @@ public final class Js5NetQueue {
 			this.aClass3_Sub15_4.offset = 0;
 			this.aClass3_Sub15_4.p1(6);
 			this.aClass3_Sub15_4.p3(3);
-			this.aClass95_1.method2830(this.aClass3_Sub15_4.data, 4);
+			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(37) IOException local37) {
 			try {
 				this.aClass95_1.method2834();
 			} catch (@Pc(43) Exception local43) {
 			}
-			this.anInt2964++;
+			this.errors++;
 			this.aClass95_1 = null;
-			this.anInt2963 = -2;
+			this.response = -2;
 		}
 	}
 }
diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java
index 22e1345..9c92de5 100644
--- a/client/src/main/java/Loc.java
+++ b/client/src/main/java/Loc.java
@@ -234,7 +234,7 @@ public final class Loc extends Entity {
 			return null;
 		}
 		@Pc(69) int local69;
-		if (Static266.anInt5343 != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) {
+		if (Static266.game != 0 && this.aBoolean80 && (this.aClass144_2 == null || this.aClass144_2 != null && this.aClass144_2.anInt5361 != local19.anInt4430)) {
 			local69 = local19.anInt4430;
 			if (local19.anInt4430 == -1) {
 				local69 = local22;
diff --git a/client/src/main/java/MillisTimer.java b/client/src/main/java/MillisTimer.java
index 5b78499..b8cbe9b 100644
--- a/client/src/main/java/MillisTimer.java
+++ b/client/src/main/java/MillisTimer.java
@@ -22,7 +22,7 @@ public final class MillisTimer extends Timer {
 	private int anInt3553 = 0;
 
 	@OriginalMember(owner = "client!lj", name = "k", descriptor = "J")
-	private long aLong122 = MonotonicClock.method5096();
+	private long aLong122 = MonotonicClock.currentTimeMillis();
 
 	@OriginalMember(owner = "client!lj", name = "<init>", descriptor = "()V")
 	public MillisTimer() {
@@ -46,7 +46,7 @@ public final class MillisTimer extends Timer {
 		@Pc(20) int local20 = this.anInt3550;
 		this.anInt3550 = 300;
 		this.anInt3552 = 1;
-		this.aLong122 = MonotonicClock.method5096();
+		this.aLong122 = MonotonicClock.currentTimeMillis();
 		if (this.aLongArray4[this.anInt3549] == 0L) {
 			this.anInt3550 = local20;
 			this.anInt3552 = local17;
diff --git a/client/src/main/java/Mouse.java b/client/src/main/java/Mouse.java
index e1c901b..9ee5497 100644
--- a/client/src/main/java/Mouse.java
+++ b/client/src/main/java/Mouse.java
@@ -78,7 +78,7 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis
 			Static93.anInt2467 = 0;
 			Static34.anInt1034 = arg0.getX();
 			Static222.anInt4973 = arg0.getY();
-			Static209.aLong161 = MonotonicClock.method5096();
+			Static209.aLong161 = MonotonicClock.currentTimeMillis();
 			if ((arg0.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
 				Static41.anInt1313 = 1;
 				Static57.anInt1759 = 1;
diff --git a/client/src/main/java/MouseWheel.java b/client/src/main/java/MouseWheel.java
index 5ec28f2..fb50b33 100644
--- a/client/src/main/java/MouseWheel.java
+++ b/client/src/main/java/MouseWheel.java
@@ -13,5 +13,5 @@ public abstract class MouseWheel {
 	public abstract void method3291(@OriginalArg(1) Component arg0);
 
 	@OriginalMember(owner = "client!uc", name = "a", descriptor = "(Ljava/awt/Component;I)V")
-	public abstract void method3293(@OriginalArg(0) Component arg0);
+	public abstract void start(@OriginalArg(0) Component arg0);
 }
diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java
index f8e14a8..05b23a1 100644
--- a/client/src/main/java/Npc.java
+++ b/client/src/main/java/Npc.java
@@ -98,7 +98,7 @@ public final class Npc extends PathingEntity {
 	@OriginalMember(owner = "client!km", name = "b", descriptor = "(I)I")
 	@Override
 	protected final int method2688() {
-		if (Static266.anInt5343 != 0 && this.aClass96_1.anIntArray357 != null) {
+		if (Static266.game != 0 && this.aClass96_1.anIntArray357 != null) {
 			@Pc(17) NpcType local17 = this.aClass96_1.method2932();
 			if (local17 != null && local17.anInt3737 != -1) {
 				return local17.anInt3737;
diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java
index fdc20e7..041dba7 100644
--- a/client/src/main/java/Player.java
+++ b/client/src/main/java/Player.java
@@ -179,7 +179,7 @@ public final class Player extends PathingEntity {
 			Static16.method501();
 		}
 		@Pc(102) int local102;
-		if (Static81.anInt2219 != 0 && local79 < 50) {
+		if (Static81.modeWhat != 0 && local79 < 50) {
 			local102 = 50 - local79;
 			while (Static105.anInt2863 < local102) {
 				Static51.aByteArrayArray8[Static105.anInt2863] = new byte[102400];
diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java
index 2aa29a5..da8269b 100644
--- a/client/src/main/java/Static1.java
+++ b/client/src/main/java/Static1.java
@@ -566,7 +566,7 @@ public final class Static1 {
 		@Pc(161) int local161 = arg0 + arg2 * Static109.anInt2882 / Static48.anInt1449;
 		@Pc(167) int local167 = arg2 * Static89.anInt2387 / Static48.anInt1449;
 		@Pc(169) int local169 = 16711680;
-		if (Static266.anInt5343 == 1) {
+		if (Static266.game == 1) {
 			local169 = 16777215;
 		}
 		if (Static239.aBoolean269) {
diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java
index d7d1b03..21de2b7 100644
--- a/client/src/main/java/Static10.java
+++ b/client/src/main/java/Static10.java
@@ -37,10 +37,10 @@ public final class Static10 {
 			return arg0;
 		}
 		Static82.anInt2231 = 0;
-		if (Static208.anInt4784 == Static249.anInt5428) {
-			Static208.anInt4784 = Static97.anInt2508;
+		if (Static208.worldListPort == Static249.worldListDefaultPort) {
+			Static208.worldListPort = Static97.worldListAlternatePort;
 		} else {
-			Static208.anInt4784 = Static249.anInt5428;
+			Static208.worldListPort = Static249.worldListDefaultPort;
 		}
 		return -1;
 	}
diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java
index da9ae4b..56f38e0 100644
--- a/client/src/main/java/Static103.java
+++ b/client/src/main/java/Static103.java
@@ -138,7 +138,7 @@ public final class Static103 {
 		}
 		@Pc(560) boolean local560;
 		if (local23 == 18) {
-			if (Static266.anInt5343 == 1) {
+			if (Static266.game == 1) {
 				Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
 			} else {
 				local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
@@ -308,7 +308,7 @@ public final class Static103 {
 			Static250.anInt5444 = local15;
 		}
 		if (local23 == 21) {
-			if (Static266.anInt5343 == 1) {
+			if (Static266.game == 1) {
 				Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
 			} else {
 				local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
@@ -392,7 +392,7 @@ public final class Static103 {
 			}
 		}
 		if (local23 == 34) {
-			if (Static266.anInt5343 == 1) {
+			if (Static266.game == 1) {
 				Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
 			} else {
 				local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
@@ -541,7 +541,7 @@ public final class Static103 {
 			Static250.anInt5444 = local15;
 		}
 		if (local23 == 24) {
-			if (Static266.anInt5343 == 1) {
+			if (Static266.game == 1) {
 				Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
 			} else {
 				local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
@@ -686,7 +686,7 @@ public final class Static103 {
 			}
 		}
 		if (local23 == 20) {
-			if (Static266.anInt5343 == 1) {
+			if (Static266.game == 1) {
 				Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 1, false, 0, local15, 1, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
 			} else {
 				local560 = Static102.method2075(Static173.aClass8_Sub4_Sub1_2.anIntArray317[0], 0, 0, false, 0, local15, 0, 0, 2, local19, Static173.aClass8_Sub4_Sub1_2.anIntArray318[0]);
diff --git a/client/src/main/java/Static107.java b/client/src/main/java/Static107.java
index 7b98667..f47609f 100644
--- a/client/src/main/java/Static107.java
+++ b/client/src/main/java/Static107.java
@@ -12,7 +12,7 @@ public final class Static107 {
 	public static int anInt2878;
 
 	@OriginalMember(owner = "client!id", name = "l", descriptor = "Lclient!jb;")
-	public static Js5NetQueue aClass73_3;
+	public static Js5NetQueue js5NetQueue;
 
 	@OriginalMember(owner = "client!id", name = "b", descriptor = "I")
 	public static int anInt2875 = -1;
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index a929adf..b5958bf 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -61,10 +61,10 @@ public final class Static114 {
 			Static239.method4153();
 		} else {
 			try {
-				@Pc(159) Graphics local159 = Static154.aCanvas1.getGraphics();
+				@Pc(159) Graphics local159 = Static154.canvas.getGraphics();
 				Static260.aClass27_2.method4186(local159);
 			} catch (@Pc(167) Exception local167) {
-				Static154.aCanvas1.repaint();
+				Static154.canvas.repaint();
 			}
 		}
 	}
diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java
index e6edf85..0f3380d 100644
--- a/client/src/main/java/Static121.java
+++ b/client/src/main/java/Static121.java
@@ -11,7 +11,7 @@ public final class Static121 {
 	public static int anInt3039;
 
 	@OriginalMember(owner = "client!jg", name = "c", descriptor = "Lclient!en;")
-	public static BufferedFile aClass38_3;
+	public static BufferedFile uid;
 
 	@OriginalMember(owner = "client!jg", name = "g", descriptor = "I")
 	public static int anInt3041;
diff --git a/client/src/main/java/Static123.java b/client/src/main/java/Static123.java
index 4881374..c65ff6b 100644
--- a/client/src/main/java/Static123.java
+++ b/client/src/main/java/Static123.java
@@ -36,7 +36,7 @@ public final class Static123 {
 
 	@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
 	public static void method2418() {
-		if (!Static249.aBoolean282 && Static83.anInt370 != 2) {
+		if (!Static249.aBoolean282 && Static83.modeWhere != 2) {
 			try {
 				Static206.aClass100_900.method3157(Static215.aClient1);
 			} catch (@Pc(26) Throwable local26) {
diff --git a/client/src/main/java/Static125.java b/client/src/main/java/Static125.java
index 8abbb63..7fe545d 100644
--- a/client/src/main/java/Static125.java
+++ b/client/src/main/java/Static125.java
@@ -17,7 +17,7 @@ public final class Static125 {
 	public static final SoftLruHashTable aClass99_19 = new SoftLruHashTable(64);
 
 	@OriginalMember(owner = "client!jl", name = "H", descriptor = "I")
-	public static int anInt3103 = -1;
+	public static int worldId = -1;
 
 	@OriginalMember(owner = "client!jl", name = "J", descriptor = "I")
 	public static int anInt3104 = 127;
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index e297042..bcfd7e6 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -173,7 +173,7 @@ public final class Static127 {
 			if (local10 == null) {
 				return null;
 			}
-			if (local10.method1009() > MonotonicClock.method5096()) {
+			if (local10.method1009() > MonotonicClock.currentTimeMillis()) {
 				return null;
 			}
 			local10.method4658();
@@ -281,15 +281,15 @@ public final class Static127 {
 				Static175.method3279();
 			}
 			if (arg0.method3111(Static279.aClass100_1106)) {
-				Static107.aClass73_3.method2329();
+				Static107.js5NetQueue.method2329();
 			}
 			if (arg0.method3111(Static185.aClass100_823)) {
-				Static107.aClass73_3.method2319();
+				Static107.js5NetQueue.method2319();
 			}
 			if (arg0.method3111(Static165.aClass100_775)) {
-				Static71.aClass213_3.method5110();
+				Static71.signLink.method5110();
 				Static124.aClass95_2.method2833();
-				Static107.aClass73_3.method2323();
+				Static107.js5NetQueue.method2323();
 			}
 			if (arg0.method3111(Static114.aClass100_1100)) {
 				Static35.aBoolean66 = true;
@@ -298,10 +298,10 @@ public final class Static127 {
 				Static196.method3534(25);
 			}
 			if (arg0.method3111(Static107.aClass100_566)) {
-				Static43.aBoolean82 = true;
+				Static43.displayFps = true;
 			}
 			if (arg0.method3111(Static61.aClass100_422)) {
-				Static43.aBoolean82 = false;
+				Static43.displayFps = false;
 			}
 			if (arg0.method3111(Static96.aClass100_522)) {
 				Static241.method4540(false, 0, -1, -1);
@@ -326,10 +326,10 @@ public final class Static127 {
 			}
 			if (arg0.method3138(Static241.aClass100_1088)) {
 				Static76.method1645(arg0.method3136(15).method3132());
-				Static203.method3663(Static71.aClass213_3);
+				Static203.method3663(Static71.signLink);
 				Static18.aBoolean39 = false;
 			}
-			if (arg0.method3138(Static170.aClass100_623) && Static83.anInt370 != 0) {
+			if (arg0.method3138(Static170.aClass100_623) && Static83.modeWhere != 0) {
 				Static115.method2312(arg0.method3136(6).method3132());
 			}
 			if (arg0.method3111(Static272.aClass100_990)) {
@@ -352,12 +352,12 @@ public final class Static127 {
 				}
 			}
 			if (arg0.method3111(Static114.aClass100_1099)) {
-				if (Static172.aBoolean199) {
+				if (Static172.shiftClick) {
 					Static154.aClass100_736.method3129();
-					Static172.aBoolean199 = false;
+					Static172.shiftClick = false;
 				} else {
 					Static43.aClass100_333.method3129();
-					Static172.aBoolean199 = true;
+					Static172.shiftClick = true;
 				}
 			}
 		}
diff --git a/client/src/main/java/Static13.java b/client/src/main/java/Static13.java
index eecb6bc..52e2692 100644
--- a/client/src/main/java/Static13.java
+++ b/client/src/main/java/Static13.java
@@ -30,7 +30,7 @@ public final class Static13 {
 			local32 = Static34.method882(new JagString[] { LocalizedText.USE, LocalizedText.MINISEPARATOR, Static34.aClass100_203, Static225.aClass100_961 });
 		} else if (Static241.aBoolean302 && Static231.anInt5204 < 2) {
 			local32 = Static34.method882(new JagString[] { Static102.aClass100_545, LocalizedText.MINISEPARATOR, Static78.aClass100_466, Static225.aClass100_961 });
-		} else if (Static172.aBoolean199 && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
+		} else if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
 			local32 = Static269.method2228(Static231.anInt5204 - 2);
 		} else {
 			local32 = Static269.method2228(Static231.anInt5204 - 1);
@@ -52,10 +52,10 @@ public final class Static13 {
 	@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) {
 		try {
-			@Pc(6) Graphics local6 = Static154.aCanvas1.getGraphics();
+			@Pc(6) Graphics local6 = Static154.canvas.getGraphics();
 			if (Static222.aFont1 == null) {
 				Static222.aFont1 = new Font("Helvetica", 1, 13);
-				Static240.aFontMetrics1 = Static154.aCanvas1.getFontMetrics(Static222.aFont1);
+				Static240.aFontMetrics1 = Static154.canvas.getFontMetrics(Static222.aFont1);
 			}
 			if (arg1) {
 				local6.setColor(Color.black);
@@ -66,7 +66,7 @@ public final class Static13 {
 			}
 			try {
 				if (Static149.anImage3 == null) {
-					Static149.anImage3 = Static154.aCanvas1.createImage(304, 34);
+					Static149.anImage3 = Static154.canvas.createImage(304, 34);
 				}
 				@Pc(56) Graphics local56 = Static149.anImage3.getGraphics();
 				local56.setColor(arg0);
@@ -92,13 +92,13 @@ public final class Static13 {
 				local6.setColor(Color.white);
 				arg2.method3112(local146 + 22, local140 + (-arg2.method3155(Static240.aFontMetrics1) + 304) / 2, local6);
 			}
-			if (Static278.aClass100_1102 != null) {
+			if (Static278.mainLoadPrimaryText != null) {
 				local6.setFont(Static222.aFont1);
 				local6.setColor(Color.white);
-				Static278.aClass100_1102.method3112(Static254.anInt5554 / 2 - 26, Static48.anInt1448 / 2 - Static278.aClass100_1102.method3155(Static240.aFontMetrics1) / 2, local6);
+				Static278.mainLoadPrimaryText.method3112(Static254.anInt5554 / 2 - 26, Static48.anInt1448 / 2 - Static278.mainLoadPrimaryText.method3155(Static240.aFontMetrics1) / 2, local6);
 			}
 		} catch (@Pc(252) Exception local252) {
-			Static154.aCanvas1.repaint();
+			Static154.canvas.repaint();
 		}
 	}
 }
diff --git a/client/src/main/java/Static139.java b/client/src/main/java/Static139.java
index 2681225..6285124 100644
--- a/client/src/main/java/Static139.java
+++ b/client/src/main/java/Static139.java
@@ -46,7 +46,7 @@ public final class Static139 {
 			if (Static69.aFrame2 != null) {
 				local46 = Static69.aFrame2;
 			} else if (Static39.aFrame1 == null) {
-				local46 = Static71.aClass213_3.anApplet2;
+				local46 = Static71.signLink.anApplet2;
 			} else {
 				local46 = Static39.aFrame1;
 			}
diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java
index e5cc4a7..205acdd 100644
--- a/client/src/main/java/Static140.java
+++ b/client/src/main/java/Static140.java
@@ -15,10 +15,10 @@ public final class Static140 {
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V")
 	public static void method2705(@OriginalArg(0) Buffer arg0) {
 		@Pc(15) byte[] local15 = new byte[24];
-		if (Static121.aClass38_3 != null) {
+		if (Static121.uid != null) {
 			try {
-				Static121.aClass38_3.method1459(0L);
-				Static121.aClass38_3.method1457(local15);
+				Static121.uid.method1459(0L);
+				Static121.uid.method1457(local15);
 				@Pc(28) int local28;
 				for (local28 = 0; local28 < 24 && local15[local28] == 0; local28++) {
 				}
diff --git a/client/src/main/java/Static143.java b/client/src/main/java/Static143.java
index e30bca3..708677d 100644
--- a/client/src/main/java/Static143.java
+++ b/client/src/main/java/Static143.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static143 {
 
 	@OriginalMember(owner = "client!ld", name = "k", descriptor = "Ljava/lang/String;")
-	public static String aString4;
+	public static String worldListHostname;
 
 	@OriginalMember(owner = "client!ld", name = "a", descriptor = "[I")
 	public static final int[] anIntArray329 = new int[] { 2, 2, 4, 0, 1, 8, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0 };
diff --git a/client/src/main/java/Static148.java b/client/src/main/java/Static148.java
index fe61502..016d3eb 100644
--- a/client/src/main/java/Static148.java
+++ b/client/src/main/java/Static148.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static148 {
 
 	@OriginalMember(owner = "client!li", name = "l", descriptor = "Lclient!ge;")
-	public static Cache aClass49_4;
+	public static Cache masterCache;
 
 	@OriginalMember(owner = "client!li", name = "t", descriptor = "I")
 	public static int anInt3534;
@@ -40,10 +40,10 @@ public final class Static148 {
 		Static7.anIntArray75[arg0] = arg1;
 		@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.method3863((long) arg0);
 		if (local21 == null) {
-			local21 = new LongNode(MonotonicClock.method5096() + 500L);
+			local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
 			Static199.aClass133_20.method3862(local21, (long) arg0);
 		} else {
-			local21.aLong55 = MonotonicClock.method5096() + 500L;
+			local21.aLong55 = MonotonicClock.currentTimeMillis() + 500L;
 		}
 	}
 
diff --git a/client/src/main/java/Static15.java b/client/src/main/java/Static15.java
index 5463bff..4a9b58f 100644
--- a/client/src/main/java/Static15.java
+++ b/client/src/main/java/Static15.java
@@ -26,7 +26,7 @@ public final class Static15 {
 	public static JagString method479() {
 		@Pc(8) JagString local8 = Static93.aClass100_518;
 		@Pc(10) JagString local10 = Static186.aClass100_827;
-		if (Static83.anInt370 != 0) {
+		if (Static83.modeWhere != 0) {
 			local8 = Static50.aClass100_365;
 		}
 		if (Static47.aClass100_991 != null) {
diff --git a/client/src/main/java/Static154.java b/client/src/main/java/Static154.java
index da8f3e6..07ab86b 100644
--- a/client/src/main/java/Static154.java
+++ b/client/src/main/java/Static154.java
@@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static154 {
 
 	@OriginalMember(owner = "client!md", name = "L", descriptor = "Ljava/awt/Canvas;")
-	public static Canvas aCanvas1;
+	public static Canvas canvas;
 
 	@OriginalMember(owner = "client!md", name = "S", descriptor = "I")
 	public static int anInt3709;
diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java
index 6d04627..e7db40f 100644
--- a/client/src/main/java/Static156.java
+++ b/client/src/main/java/Static156.java
@@ -116,7 +116,7 @@ public final class Static156 {
 	}
 
 	@OriginalMember(owner = "client!mf", name = "e", descriptor = "(I)V")
-	public static void method2958() {
+	public static void init() {
 		if (SignLink.aString20.toLowerCase().indexOf("microsoft") != -1) {
 			Static196.anIntArray407[187] = 27;
 			Static196.anIntArray407[223] = 28;
diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java
index aebe049..ad58c41 100644
--- a/client/src/main/java/Static158.java
+++ b/client/src/main/java/Static158.java
@@ -39,34 +39,34 @@ public final class Static158 {
 				Static179.anInt4261 = 1;
 				Static226.anInt5079 = 0;
 				Static57.anInt1758++;
-				if (Static209.anInt4794 == Static271.anInt5800) {
-					Static209.anInt4794 = Static55.anInt1738;
+				if (Static209.port == Static271.defaultPort) {
+					Static209.port = Static55.alternatePort;
 				} else {
-					Static209.anInt4794 = Static271.anInt5800;
+					Static209.port = Static271.defaultPort;
 				}
 			}
 			if (Static179.anInt4261 == 1) {
-				Static72.aClass212_3 = Static71.aClass213_3.method5120(Static60.aString1, Static209.anInt4794);
+				Static72.aClass212_3 = Static71.signLink.openSocket(Static60.hostname, Static209.port);
 				Static179.anInt4261 = 2;
 			}
 			@Pc(120) int local120;
 			if (Static179.anInt4261 == 2) {
-				if (Static72.aClass212_3.anInt5925 == 2) {
+				if (Static72.aClass212_3.status == 2) {
 					throw new IOException();
 				}
-				if (Static72.aClass212_3.anInt5925 != 1) {
+				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
 				Static72.aClass212_3 = null;
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				local120 = Static124.aClass95_2.method2828();
+				local120 = Static124.aClass95_2.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -83,14 +83,14 @@ public final class Static158 {
 				Static179.anInt4261 = 3;
 			}
 			if (Static179.anInt4261 == 3) {
-				if (Static124.aClass95_2.method2831() < 1) {
+				if (Static124.aClass95_2.available() < 1) {
 					return;
 				}
-				Static229.aClass100Array156 = new JagString[Static124.aClass95_2.method2828()];
+				Static229.aClass100Array156 = new JagString[Static124.aClass95_2.read()];
 				Static179.anInt4261 = 4;
 			}
 			if (Static179.anInt4261 == 4) {
-				if (Static124.aClass95_2.method2831() < Static229.aClass100Array156.length * 8) {
+				if (Static124.aClass95_2.available() < Static229.aClass100Array156.length * 8) {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
@@ -111,10 +111,10 @@ public final class Static158 {
 			}
 			if (Static57.anInt1758 < 1) {
 				Static57.anInt1758++;
-				if (Static271.anInt5800 == Static209.anInt4794) {
-					Static209.anInt4794 = Static55.anInt1738;
+				if (Static271.defaultPort == Static209.port) {
+					Static209.port = Static55.alternatePort;
 				} else {
-					Static209.anInt4794 = Static271.anInt5800;
+					Static209.port = Static271.defaultPort;
 				}
 				Static226.anInt5079 = 0;
 				Static179.anInt4261 = 1;
diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java
index 490935c..930b07e 100644
--- a/client/src/main/java/Static169.java
+++ b/client/src/main/java/Static169.java
@@ -34,7 +34,7 @@ public final class Static169 {
 		}
 		if (Static239.aBoolean269 && Static40.aBoolean78) {
 			try {
-				Static287.method1758(Static71.aClass213_3.anApplet2, "openjs", new Object[] { arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()).toString() });
+				Static287.method1758(Static71.signLink.anApplet2, "openjs", new Object[] { arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()).toString() });
 				return;
 			} catch (@Pc(48) Throwable local48) {
 			}
@@ -65,13 +65,13 @@ public final class Static169 {
 			return null;
 		}
 		@Pc(90) PrivilegedRequest local90 = arg3.method5129(arg0, arg1, arg2);
-		while (local90.anInt5925 == 0) {
+		while (local90.status == 0) {
 			Static231.method3983(10L);
 		}
 		@Pc(103) Frame local103 = (Frame) local90.anObject6;
 		if (local103 == null) {
 			return null;
-		} else if (local90.anInt5925 == 2) {
+		} else if (local90.status == 2) {
 			Static25.method714(local103, arg3);
 			return null;
 		} else {
diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java
index 7b3443b..314489b 100644
--- a/client/src/main/java/Static170.java
+++ b/client/src/main/java/Static170.java
@@ -81,7 +81,7 @@ public final class Static170 {
 			local20 = new LongNode(4611686018427387905L);
 			Static199.aClass133_20.method3862(local20, (long) arg1);
 		} else if (local20.aLong55 != 4611686018427387905L) {
-			local20.aLong55 = MonotonicClock.method5096() + 500L | 0x4000000000000000L;
+			local20.aLong55 = MonotonicClock.currentTimeMillis() + 500L | 0x4000000000000000L;
 		}
 	}
 }
diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java
index 10ed24a..87dd75d 100644
--- a/client/src/main/java/Static172.java
+++ b/client/src/main/java/Static172.java
@@ -11,7 +11,7 @@ public final class Static172 {
 	public static MidiPcmStream aClass3_Sub3_Sub4_2;
 
 	@OriginalMember(owner = "client!nj", name = "f", descriptor = "Lclient!en;")
-	public static BufferedFile aClass38_4;
+	public static BufferedFile cacheData;
 
 	@OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_70;
@@ -29,7 +29,7 @@ public final class Static172 {
 	public static short[][] aShortArrayArray7;
 
 	@OriginalMember(owner = "client!nj", name = "a", descriptor = "Z")
-	public static boolean aBoolean199 = false;
+	public static boolean shiftClick = false;
 
 	@OriginalMember(owner = "client!nj", name = "h", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_97 = new LinkedList();
diff --git a/client/src/main/java/Static176.java b/client/src/main/java/Static176.java
index 2b298f8..b94a0c7 100644
--- a/client/src/main/java/Static176.java
+++ b/client/src/main/java/Static176.java
@@ -31,19 +31,19 @@ public final class Static176 {
 		@Pc(3) World local3 = Static54.method1310(arg0);
 		if (local3 == null) {
 			return false;
-		} else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.anInt370 == 2) {
+		} else if (SignLink.anInt5928 == 1 || SignLink.anInt5928 == 2 || Static83.modeWhere == 2) {
 			@Pc(31) byte[] local31 = local3.aClass100_71.method3148();
-			Static60.aString1 = new String(local31, 0, local31.length);
-			Static125.anInt3103 = local3.anInt382;
-			if (Static83.anInt370 != 0) {
-				Static271.anInt5800 = Static125.anInt3103 + 40000;
-				Static209.anInt4794 = Static271.anInt5800;
-				Static55.anInt1738 = Static125.anInt3103 + 50000;
+			Static60.hostname = new String(local31, 0, local31.length);
+			Static125.worldId = local3.anInt382;
+			if (Static83.modeWhere != 0) {
+				Static271.defaultPort = Static125.worldId + 43594; // 40000;
+				Static209.port = Static271.defaultPort;
+				Static55.alternatePort = Static125.worldId + 43594; // 50000;
 			}
 			return true;
 		} else {
 			@Pc(62) JagString local62 = Static211.aClass100_230;
-			if (Static83.anInt370 != 0) {
+			if (Static83.modeWhere != 0) {
 				local62 = Static34.method882(new JagString[] { Static31.aClass100_193, Static123.method2423(local3.anInt382 + 7000) });
 			}
 			@Pc(89) JagString local89 = Static211.aClass100_230;
@@ -79,7 +79,7 @@ public final class Static176 {
 					Static98.method1966(Static246.anInt5393, 0L, Static225.aClass100_961, local33, (short) 11, Static102.aClass100_545, local47);
 				}
 			} else {
-				if (Static266.anInt5343 == 1) {
+				if (Static266.game == 1) {
 					Static98.method1966(-1, 0L, Static186.aClass100_827, local33, (short) 36, LocalizedText.FACEHERE, local47);
 				}
 				Static98.method1966(-1, 0L, Static186.aClass100_827, local33, (short) 60, Static195.aClass100_859, local47);
diff --git a/client/src/main/java/Static186.java b/client/src/main/java/Static186.java
index 8f1d11f..92fa6de 100644
--- a/client/src/main/java/Static186.java
+++ b/client/src/main/java/Static186.java
@@ -119,42 +119,42 @@ public final class Static186 {
 			Static41.anInt1309 = 70;
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 70) {
-			Static273.aClass41_7 = new WorldMapFont(11, true, Static154.aCanvas1);
+			Static273.aClass41_7 = new WorldMapFont(11, true, Static154.canvas);
 			Static41.anInt1309 = 73;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 73) {
-			Static152.aClass41_3 = new WorldMapFont(12, true, Static154.aCanvas1);
+			Static152.aClass41_3 = new WorldMapFont(12, true, Static154.canvas);
 			Static41.anInt1309 = 76;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 76) {
-			Static169.aClass41_5 = new WorldMapFont(14, true, Static154.aCanvas1);
+			Static169.aClass41_5 = new WorldMapFont(14, true, Static154.canvas);
 			Static41.anInt1309 = 79;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 79) {
-			Static130.aClass41_1 = new WorldMapFont(17, true, Static154.aCanvas1);
+			Static130.aClass41_1 = new WorldMapFont(17, true, Static154.canvas);
 			Static41.anInt1309 = 82;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 82) {
-			Static203.aClass41_8 = new WorldMapFont(19, true, Static154.aCanvas1);
+			Static203.aClass41_8 = new WorldMapFont(19, true, Static154.canvas);
 			Static41.anInt1309 = 85;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 85) {
-			Static130.aClass41_2 = new WorldMapFont(22, true, Static154.aCanvas1);
+			Static130.aClass41_2 = new WorldMapFont(22, true, Static154.canvas);
 			Static41.anInt1309 = 88;
 			Static7.method842(true);
 			Static234.method4020();
 		} else if (Static41.anInt1309 == 88) {
-			Static270.aClass41_9 = new WorldMapFont(26, true, Static154.aCanvas1);
+			Static270.aClass41_9 = new WorldMapFont(26, true, Static154.canvas);
 			Static41.anInt1309 = 91;
 			Static7.method842(true);
 			Static234.method4020();
 		} else {
-			Static160.aClass41_4 = new WorldMapFont(30, true, Static154.aCanvas1);
+			Static160.aClass41_4 = new WorldMapFont(30, true, Static154.canvas);
 			Static41.anInt1309 = 100;
 			Static7.method842(true);
 			Static234.method4020();
diff --git a/client/src/main/java/Static187.java b/client/src/main/java/Static187.java
index e9e720c..34ca57d 100644
--- a/client/src/main/java/Static187.java
+++ b/client/src/main/java/Static187.java
@@ -11,7 +11,7 @@ public final class Static187 {
 	public static final int[][][] anIntArrayArrayArray18 = new int[4][13][13];
 
 	@OriginalMember(owner = "client!pb", name = "Q", descriptor = "I")
-	public static int anInt4413 = 1;
+	public static int worldListId = 1;
 
 	@OriginalMember(owner = "client!pb", name = "ab", descriptor = "I")
 	public static int anInt4422 = 0;
diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java
index ad2c097..a0a4d07 100644
--- a/client/src/main/java/Static19.java
+++ b/client/src/main/java/Static19.java
@@ -118,7 +118,7 @@ public final class Static19 {
 	}
 
 	@OriginalMember(owner = "client!bi", name = "a", descriptor = "(BLjava/awt/Component;)V")
-	public static void method591(@OriginalArg(1) Component arg0) {
+	public static void start(@OriginalArg(1) Component arg0) {
 		@Pc(10) Method local10 = SignLink.aMethod6;
 		if (local10 != null) {
 			try {
diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java
index 67c5937..0d1dc48 100644
--- a/client/src/main/java/Static190.java
+++ b/client/src/main/java/Static190.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static190 {
 
 	@OriginalMember(owner = "client!pf", name = "f", descriptor = "Lclient!en;")
-	public static BufferedFile aClass38_5;
+	public static BufferedFile cacheMasterIndex;
 
 	@OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;")
 	public static final SoftLruHashTable aClass99_26 = new SoftLruHashTable(200);
diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java
index 600bc5d..eb92696 100644
--- a/client/src/main/java/Static196.java
+++ b/client/src/main/java/Static196.java
@@ -60,10 +60,10 @@ public final class Static196 {
 				} else {
 					Static257.method526(Static250.anInt5441, Static130.aClass153_47, 255);
 				}
-				Static107.aClass73_3.method2322(false);
+				Static107.js5NetQueue.method2322(false);
 			} else {
 				Static29.method801();
-				Static107.aClass73_3.method2322(true);
+				Static107.js5NetQueue.method2322(true);
 			}
 		}
 		if (Static239.aBoolean269 && (arg0 == 25 || arg0 == 28 || arg0 == 40)) {
diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java
index a30cad6..d88b3c4 100644
--- a/client/src/main/java/Static197.java
+++ b/client/src/main/java/Static197.java
@@ -25,10 +25,10 @@ public final class Static197 {
 			return new Class114[0];
 		}
 		@Pc(17) PrivilegedRequest local17 = arg0.method5132();
-		while (local17.anInt5925 == 0) {
+		while (local17.status == 0) {
 			Static231.method3983(10L);
 		}
-		if (local17.anInt5925 == 2) {
+		if (local17.status == 2) {
 			return new Class114[0];
 		}
 		@Pc(39) int[] local39 = (int[]) local17.anObject6;
@@ -50,15 +50,15 @@ public final class Static197 {
 			Static239.method4169();
 		}
 		if (Static69.aFrame2 != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) {
-			Static25.method714(Static69.aFrame2, Static71.aClass213_3);
+			Static25.method714(Static69.aFrame2, Static71.signLink);
 			Static69.aFrame2 = null;
 		}
 		if (arg1 == 3 && Static69.aFrame2 == null) {
-			Static69.aFrame2 = Static169.method3176(0, arg5, arg4, Static71.aClass213_3);
+			Static69.aFrame2 = Static169.method3176(0, arg5, arg4, Static71.signLink);
 			if (Static69.aFrame2 != null) {
 				Static22.anInt729 = arg5;
 				Static114.anInt5831 = arg4;
-				Static203.method3663(Static71.aClass213_3);
+				Static203.method3663(Static71.signLink);
 			}
 		}
 		if (arg1 == 3 && Static69.aFrame2 == null) {
@@ -69,7 +69,7 @@ public final class Static197 {
 		if (Static69.aFrame2 != null) {
 			local85 = Static69.aFrame2;
 		} else if (Static39.aFrame1 == null) {
-			local85 = Static71.aClass213_3.anApplet2;
+			local85 = Static71.signLink.anApplet2;
 		} else {
 			local85 = Static39.aFrame1;
 		}
@@ -93,38 +93,38 @@ public final class Static197 {
 			Static254.anInt5554 = 503;
 		}
 		if (arg0) {
-			Static31.method847(Static154.aCanvas1);
-			Static223.method3866(Static154.aCanvas1);
-			if (Static71.aClass111_2 != null) {
-				Static71.aClass111_2.method3291(Static154.aCanvas1);
+			Static31.method847(Static154.canvas);
+			Static223.method3866(Static154.canvas);
+			if (Static71.mouseWheel != null) {
+				Static71.mouseWheel.method3291(Static154.canvas);
 			}
 			Static215.aClient1.method926();
-			Static19.method591(Static154.aCanvas1);
-			Static88.method1833(Static154.aCanvas1);
-			if (Static71.aClass111_2 != null) {
-				Static71.aClass111_2.method3293(Static154.aCanvas1);
+			Static19.start(Static154.canvas);
+			Static88.start(Static154.canvas);
+			if (Static71.mouseWheel != null) {
+				Static71.mouseWheel.start(Static154.canvas);
 			}
 		} else {
 			if (Static239.aBoolean269) {
 				Static239.method4181(Static48.anInt1448, Static254.anInt5554);
 			}
-			Static154.aCanvas1.setSize(Static48.anInt1448, Static254.anInt5554);
+			Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
 			if (Static39.aFrame1 == local85) {
 				local109 = Static39.aFrame1.getInsets();
-				Static154.aCanvas1.setLocation(local109.left + Static145.anInt3497, local109.top + Static178.anInt4246);
+				Static154.canvas.setLocation(local109.left + Static145.anInt3497, local109.top + Static178.anInt4246);
 			} else {
-				Static154.aCanvas1.setLocation(Static145.anInt3497, Static178.anInt4246);
+				Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
 			}
 		}
 		if (arg1 == 0 && arg3 > 0) {
-			Static239.method4161(Static154.aCanvas1);
+			Static239.method4161(Static154.canvas);
 		}
 		if (arg2 && arg1 > 0) {
-			Static154.aCanvas1.setIgnoreRepaint(true);
+			Static154.canvas.setIgnoreRepaint(true);
 			if (!Static211.aBoolean73) {
 				Static65.method1500();
 				Static260.aClass27_2 = null;
-				Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.aCanvas1);
+				Static260.aClass27_2 = Static131.method2579(Static254.anInt5554, Static48.anInt1448, Static154.canvas);
 				Static129.method2492();
 				if (Static244.anInt5370 == 5) {
 					Static182.method3359(true, Static280.aClass3_Sub2_Sub9_43);
@@ -132,26 +132,26 @@ public final class Static197 {
 					Static114.method4636(false, LocalizedText.LOADING);
 				}
 				try {
-					@Pc(269) Graphics local269 = Static154.aCanvas1.getGraphics();
+					@Pc(269) Graphics local269 = Static154.canvas.getGraphics();
 					Static260.aClass27_2.method4186(local269);
 				} catch (@Pc(277) Exception local277) {
 				}
 				Static139.method2704();
 				if (arg3 == 0) {
-					Static260.aClass27_2 = Static131.method2579(503, 765, Static154.aCanvas1);
+					Static260.aClass27_2 = Static131.method2579(503, 765, Static154.canvas);
 				} else {
 					Static260.aClass27_2 = null;
 				}
-				@Pc(300) PrivilegedRequest local300 = Static71.aClass213_3.method5123(Static215.aClient1.getClass());
-				while (local300.anInt5925 == 0) {
+				@Pc(300) PrivilegedRequest local300 = Static71.signLink.method5123(Static215.aClient1.getClass());
+				while (local300.status == 0) {
 					Static231.method3983(100L);
 				}
-				if (local300.anInt5925 == 1) {
+				if (local300.status == 1) {
 					Static211.aBoolean73 = true;
 				}
 			}
 			if (Static211.aBoolean73) {
-				Static239.method4180(Static154.aCanvas1, Static186.anInt4392 * 2);
+				Static239.method4180(Static154.canvas, Static186.anInt4392 * 2);
 			}
 		}
 		if (!Static239.aBoolean269 && arg1 > 0) {
@@ -169,7 +169,7 @@ public final class Static197 {
 			Static114.method4637();
 		} else if (arg1 == 0 && arg3 > 0) {
 			Static37.aThread1.setPriority(1);
-			Static260.aClass27_2 = Static131.method2579(503, 765, Static154.aCanvas1);
+			Static260.aClass27_2 = Static131.method2579(503, 765, Static154.canvas);
 			Static268.method4583();
 			Static76.method1643();
 			((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(20);
diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java
index 4b6897b..440ca23 100644
--- a/client/src/main/java/Static203.java
+++ b/client/src/main/java/Static203.java
@@ -30,7 +30,7 @@ public final class Static203 {
 		if (Static69.aFrame2 != null) {
 			local8 = Static69.aFrame2;
 		} else if (Static39.aFrame1 == null) {
-			local8 = Static71.aClass213_3.anApplet2;
+			local8 = Static71.signLink.anApplet2;
 		} else {
 			local8 = Static39.aFrame1;
 		}
@@ -56,12 +56,12 @@ public final class Static203 {
 		if (Static239.aBoolean269) {
 			Static239.method4181(Static48.anInt1448, Static254.anInt5554);
 		}
-		Static154.aCanvas1.setSize(Static48.anInt1448, Static254.anInt5554);
+		Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554);
 		if (local8 == Static39.aFrame1) {
 			local35 = Static39.aFrame1.getInsets();
-			Static154.aCanvas1.setLocation(local35.left + Static145.anInt3497, Static178.anInt4246 + local35.top);
+			Static154.canvas.setLocation(local35.left + Static145.anInt3497, Static178.anInt4246 + local35.top);
 		} else {
-			Static154.aCanvas1.setLocation(Static145.anInt3497, Static178.anInt4246);
+			Static154.canvas.setLocation(Static145.anInt3497, Static178.anInt4246);
 		}
 		if (Static154.anInt3711 != -1) {
 			Static210.method3712(true);
@@ -74,10 +74,10 @@ public final class Static203 {
 		@Pc(11) FileOnDisk local11 = null;
 		try {
 			@Pc(16) PrivilegedRequest local16 = arg0.method5112("runescape");
-			while (local16.anInt5925 == 0) {
+			while (local16.status == 0) {
 				Static231.method3983(1L);
 			}
-			if (local16.anInt5925 == 1) {
+			if (local16.status == 1) {
 				local11 = (FileOnDisk) local16.anObject6;
 				@Pc(39) Buffer local39 = Static48.method1196();
 				local11.method5134(local39.data, local39.offset, 0);
diff --git a/client/src/main/java/Static206.java b/client/src/main/java/Static206.java
index b861c5d..a392e55 100644
--- a/client/src/main/java/Static206.java
+++ b/client/src/main/java/Static206.java
@@ -8,7 +8,7 @@ public final class Static206 {
 	public static int[] anIntArray427;
 
 	@OriginalMember(owner = "client!qk", name = "g", descriptor = "Lclient!ma;")
-	public static BufferedSocket aClass95_3;
+	public static BufferedSocket js5Socket;
 
 	@OriginalMember(owner = "client!qk", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_899 = Static28.parse("0(U");
diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java
index 88cc747..00fa77c 100644
--- a/client/src/main/java/Static207.java
+++ b/client/src/main/java/Static207.java
@@ -89,26 +89,27 @@ public final class Static207 {
 	public static int method3684() {
 		try {
 			if (Static82.anInt2231 == 0) {
-				if (MonotonicClock.method5096() - 5000L < Static231.aLong174) {
+				if (MonotonicClock.currentTimeMillis() - 5000L < Static231.aLong174) {
 					return 0;
 				}
-				Static72.aClass212_3 = Static71.aClass213_3.method5120(Static143.aString4, Static208.anInt4784);
-				Static15.aLong18 = MonotonicClock.method5096();
+				System.out.println(Static208.worldListPort);
+				Static72.aClass212_3 = Static71.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
+				Static15.aLong18 = MonotonicClock.currentTimeMillis();
 				Static82.anInt2231 = 1;
 			}
-			if (Static15.aLong18 + 30000L < MonotonicClock.method5096()) {
+			if (Static15.aLong18 + 30000L < MonotonicClock.currentTimeMillis()) {
 				return Static10.method347(1000);
 			}
 			@Pc(82) int local82;
 			@Pc(124) int local124;
 			if (Static82.anInt2231 == 1) {
-				if (Static72.aClass212_3.anInt5925 == 2) {
+				if (Static72.aClass212_3.status == 2) {
 					return Static10.method347(1001);
 				}
-				if (Static72.aClass212_3.anInt5925 != 1) {
+				if (Static72.aClass212_3.status != 1) {
 					return -1;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
 				Static6.aClass3_Sub15_Sub1_1.offset = 0;
 				Static72.aClass212_3 = null;
 				local82 = 0;
@@ -117,14 +118,14 @@ public final class Static207 {
 				}
 				Static6.aClass3_Sub15_Sub1_1.p1(255);
 				Static6.aClass3_Sub15_Sub1_1.p4(local82);
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				local124 = Static124.aClass95_2.method2828();
+				local124 = Static124.aClass95_2.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -137,12 +138,12 @@ public final class Static207 {
 				Static82.anInt2231 = 2;
 			}
 			if (Static82.anInt2231 == 2) {
-				if (Static124.aClass95_2.method2831() < 2) {
+				if (Static124.aClass95_2.available() < 2) {
 					return -1;
 				}
-				Static116.anInt2961 = Static124.aClass95_2.method2828();
+				Static116.anInt2961 = Static124.aClass95_2.read();
 				Static116.anInt2961 <<= 0x8;
-				Static116.anInt2961 += Static124.aClass95_2.method2828();
+				Static116.anInt2961 += Static124.aClass95_2.read();
 				Static82.anInt2231 = 3;
 				Static141.anInt3469 = 0;
 				Static229.aByteArray70 = new byte[Static116.anInt2961];
@@ -150,7 +151,7 @@ public final class Static207 {
 			if (Static82.anInt2231 != 3) {
 				return -1;
 			}
-			local82 = Static124.aClass95_2.method2831();
+			local82 = Static124.aClass95_2.available();
 			if (local82 < 1) {
 				return -1;
 			}
@@ -175,7 +176,7 @@ public final class Static207 {
 				Static127.anInt3132 = 0;
 				Static82.anInt2231 = 0;
 				Static229.aByteArray70 = null;
-				Static231.aLong174 = MonotonicClock.method5096();
+				Static231.aLong174 = MonotonicClock.currentTimeMillis();
 				return 0;
 			} else {
 				return Static10.method347(1002);
diff --git a/client/src/main/java/Static208.java b/client/src/main/java/Static208.java
index ff0003c..5e57641 100644
--- a/client/src/main/java/Static208.java
+++ b/client/src/main/java/Static208.java
@@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static208 {
 
 	@OriginalMember(owner = "client!r", name = "f", descriptor = "I")
-	public static int anInt4784;
+	public static int worldListPort;
 
 	@OriginalMember(owner = "client!r", name = "b", descriptor = "[Lclient!tk;")
 	public static final SeqType[] aClass144Array2 = new SeqType[14];
diff --git a/client/src/main/java/Static209.java b/client/src/main/java/Static209.java
index 946263f..8b9da1f 100644
--- a/client/src/main/java/Static209.java
+++ b/client/src/main/java/Static209.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static209 {
 
 	@OriginalMember(owner = "client!ra", name = "s", descriptor = "I")
-	public static int anInt4794;
+	public static int port;
 
 	@OriginalMember(owner = "client!ra", name = "K", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_86;
diff --git a/client/src/main/java/Static211.java b/client/src/main/java/Static211.java
index 5ea6e8f..b9787f0 100644
--- a/client/src/main/java/Static211.java
+++ b/client/src/main/java/Static211.java
@@ -45,9 +45,9 @@ public final class Static211 {
 			Static147.aClass62_2.method3575();
 		}
 		Static41.method1045(Static99.aBoolean143);
-		Static11.aClass62_1 = Static107.method2262(22050, Static71.aClass213_3, Static154.aCanvas1, 0);
+		Static11.aClass62_1 = Static107.method2262(22050, Static71.signLink, Static154.canvas, 0);
 		Static11.aClass62_1.method3566(Static148.aClass3_Sub3_Sub4_1);
-		Static147.aClass62_2 = Static107.method2262(2048, Static71.aClass213_3, Static154.aCanvas1, 1);
+		Static147.aClass62_2 = Static107.method2262(2048, Static71.signLink, Static154.canvas, 1);
 		Static147.aClass62_2.method3566(Static204.aClass3_Sub3_Sub2_1);
 	}
 }
diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java
index 65c993b..cf082d1 100644
--- a/client/src/main/java/Static216.java
+++ b/client/src/main/java/Static216.java
@@ -32,40 +32,40 @@ public final class Static216 {
 					return;
 				}
 				Static92.anInt2430 = 0;
-				if (Static209.anInt4794 == Static271.anInt5800) {
-					Static209.anInt4794 = Static55.anInt1738;
+				if (Static209.port == Static271.defaultPort) {
+					Static209.port = Static55.alternatePort;
 				} else {
-					Static209.anInt4794 = Static271.anInt5800;
+					Static209.port = Static271.defaultPort;
 				}
 				Static184.anInt4348 = 1;
 				Static276.anInt5816++;
 			}
 			if (Static184.anInt4348 == 1) {
-				Static72.aClass212_3 = Static71.aClass213_3.method5120(Static60.aString1, Static209.anInt4794);
+				Static72.aClass212_3 = Static71.signLink.openSocket(Static60.hostname, Static209.port);
 				Static184.anInt4348 = 2;
 			}
 			if (Static184.anInt4348 == 2) {
-				if (Static72.aClass212_3.anInt5925 == 2) {
+				if (Static72.aClass212_3.status == 2) {
 					throw new IOException();
 				}
-				if (Static72.aClass212_3.anInt5925 != 1) {
+				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
 				Static72.aClass212_3 = null;
 				@Pc(106) long local106 = Static101.aLong98 = Static186.aClass100_829.method3158();
 				Static6.aClass3_Sub15_Sub1_1.offset = 0;
 				Static6.aClass3_Sub15_Sub1_1.p1(14);
 				@Pc(120) int local120 = (int) (local106 >> 16 & 0x1FL);
 				Static6.aClass3_Sub15_Sub1_1.p1(local120);
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, 2);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, 2);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				@Pc(150) int local150 = Static124.aClass95_2.method2828();
+				@Pc(150) int local150 = Static124.aClass95_2.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -82,7 +82,7 @@ public final class Static216 {
 				Static184.anInt4348 = 3;
 			}
 			if (Static184.anInt4348 == 3) {
-				if (Static124.aClass95_2.method2831() < 8) {
+				if (Static124.aClass95_2.available() < 8) {
 					return;
 				}
 				Static124.aClass95_2.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data);
@@ -152,7 +152,7 @@ public final class Static216 {
 				Static17.aClass3_Sub15_Sub1_2.p4(Static167.aClass153_63.method4480());
 				Static17.aClass3_Sub15_Sub1_2.p4(Static226.aClass153_93.method4480());
 				Static17.aClass3_Sub15_Sub1_2.pBytes(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
-				Static124.aClass95_2.method2830(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset);
+				Static124.aClass95_2.write(Static17.aClass3_Sub15_Sub1_2.data, Static17.aClass3_Sub15_Sub1_2.offset);
 				Static6.aClass3_Sub15_Sub1_1.method2240(local210);
 				for (@Pc(583) int local583 = 0; local583 < 4; local583++) {
 					local210[local583] += 50;
@@ -161,10 +161,10 @@ public final class Static216 {
 				Static184.anInt4348 = 4;
 			}
 			if (Static184.anInt4348 == 4) {
-				if (Static124.aClass95_2.method2831() < 1) {
+				if (Static124.aClass95_2.available() < 1) {
 					return;
 				}
-				@Pc(623) int local623 = Static124.aClass95_2.method2828();
+				@Pc(623) int local623 = Static124.aClass95_2.read();
 				if (local623 == 21) {
 					Static184.anInt4348 = 7;
 				} else if (local623 == 29) {
@@ -197,13 +197,13 @@ public final class Static216 {
 			if (Static184.anInt4348 == 6) {
 				Static6.aClass3_Sub15_Sub1_1.offset = 0;
 				Static6.aClass3_Sub15_Sub1_1.method2242(17);
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 				Static184.anInt4348 = 4;
 				return;
 			}
 			if (Static184.anInt4348 == 7) {
-				if (Static124.aClass95_2.method2831() >= 1) {
-					Static231.anInt5202 = (Static124.aClass95_2.method2828() + 3) * 60;
+				if (Static124.aClass95_2.available() >= 1) {
+					Static231.anInt5202 = (Static124.aClass95_2.read() + 3) * 60;
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 21;
 					Static124.aClass95_2.method2834();
@@ -213,8 +213,8 @@ public final class Static216 {
 				return;
 			}
 			if (Static184.anInt4348 == 10) {
-				if (Static124.aClass95_2.method2831() >= 1) {
-					Static204.anInt4765 = Static124.aClass95_2.method2828();
+				if (Static124.aClass95_2.available() >= 1) {
+					Static204.anInt4765 = Static124.aClass95_2.read();
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 29;
 					Static124.aClass95_2.method2834();
@@ -224,7 +224,7 @@ public final class Static216 {
 				return;
 			}
 			if (Static184.anInt4348 == 8) {
-				if (Static124.aClass95_2.method2831() < 14) {
+				if (Static124.aClass95_2.available() < 14) {
 					return;
 				}
 				Static124.aClass95_2.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data);
@@ -244,12 +244,12 @@ public final class Static216 {
 				if (!Static249.aBoolean282) {
 					if (Static124.aBoolean157 && !Static25.aBoolean57 || Static202.aBoolean233) {
 						try {
-							Static167.aClass100_781.method3157(Static71.aClass213_3.anApplet2);
+							Static167.aClass100_781.method3157(Static71.signLink.anApplet2);
 						} catch (@Pc(910) Throwable local910) {
 						}
 					} else {
 						try {
-							Static56.aClass100_380.method3157(Static71.aClass213_3.anApplet2);
+							Static56.aClass100_380.method3157(Static71.signLink.anApplet2);
 						} catch (@Pc(920) Throwable local920) {
 						}
 					}
@@ -259,7 +259,7 @@ public final class Static216 {
 				Static184.anInt4348 = 9;
 			}
 			if (Static184.anInt4348 == 9) {
-				if (Static124.aClass95_2.method2831() < Static223.anInt5028) {
+				if (Static124.aClass95_2.available() < Static223.anInt5028) {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
@@ -284,10 +284,10 @@ public final class Static216 {
 				Static184.anInt4348 = 1;
 				Static92.anInt2430 = 0;
 				Static276.anInt5816++;
-				if (Static271.anInt5800 == Static209.anInt4794) {
-					Static209.anInt4794 = Static55.anInt1738;
+				if (Static271.defaultPort == Static209.port) {
+					Static209.port = Static55.alternatePort;
 				} else {
-					Static209.anInt4794 = Static271.anInt5800;
+					Static209.port = Static271.defaultPort;
 				}
 			}
 		}
diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java
index b4741c0..17aaf04 100644
--- a/client/src/main/java/Static217.java
+++ b/client/src/main/java/Static217.java
@@ -8,7 +8,7 @@ public final class Static217 {
 	public static int anInt4903;
 
 	@OriginalMember(owner = "client!rj", name = "Y", descriptor = "J")
-	public static long aLong165;
+	public static long js5ConnectTime;
 
 	@OriginalMember(owner = "client!rj", name = "P", descriptor = "I")
 	public static int anInt4901 = -1;
@@ -42,7 +42,7 @@ public final class Static217 {
 					local22 = false;
 				}
 			}
-			@Pc(95) JagString local95 = Static266.anInt5343 == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
+			@Pc(95) JagString local95 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
 			if (arg2.anInt1652 < arg2.anInt1656) {
 				local158 = Static34.method882(new JagString[] { arg2.method1264(), local22 ? Static123.method2420(arg2.anInt1652, Static173.aClass8_Sub4_Sub1_2.anInt1652) : Static204.aClass100_896, Static123.aClass100_593, local95, Static123.method2423(arg2.anInt1652), Static78.aClass100_465, Static123.method2423(arg2.anInt1656 - arg2.anInt1652), Static72.aClass100_448 });
 			} else {
@@ -58,7 +58,7 @@ public final class Static217 {
 			for (local275 = 7; local275 >= 0; local275--) {
 				if (Static160.aClass100Array121[local275] != null) {
 					@Pc(291) short local291 = 0;
-					if (Static266.anInt5343 == 0 && Static160.aClass100Array121[local275].method3111(LocalizedText.ATTACK)) {
+					if (Static266.game == 0 && Static160.aClass100Array121[local275].method3111(LocalizedText.ATTACK)) {
 						if (arg2.anInt1652 > Static173.aClass8_Sub4_Sub1_2.anInt1652) {
 							local291 = 2000;
 						}
@@ -106,7 +106,7 @@ public final class Static217 {
 		Static10.method351();
 		Static230.method3947();
 		Static147.method2764();
-		if (Static81.anInt2219 != 0) {
+		if (Static81.modeWhat != 0) {
 			for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) {
 				Static51.aByteArrayArray8[local54] = null;
 			}
diff --git a/client/src/main/java/Static22.java b/client/src/main/java/Static22.java
index 7621326..ce27e2d 100644
--- a/client/src/main/java/Static22.java
+++ b/client/src/main/java/Static22.java
@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 public final class Static22 {
 
 	@OriginalMember(owner = "client!bl", name = "P", descriptor = "I")
-	public static int anInt722 = 0;
+	public static int js5ConnectDelay = 0;
 
 	@OriginalMember(owner = "client!bl", name = "Q", descriptor = "I")
 	public static int anInt723 = 0;
diff --git a/client/src/main/java/Static225.java b/client/src/main/java/Static225.java
index e016ba1..4a99c12 100644
--- a/client/src/main/java/Static225.java
+++ b/client/src/main/java/Static225.java
@@ -84,7 +84,7 @@ public final class Static225 {
 		Static186.aClass100_829 = arg0;
 		if (Static186.aClass100_829.method3108(Static186.aClass100_827) || Static186.aClass100_828.method3108(Static186.aClass100_827)) {
 			Static266.anInt5336 = 3;
-		} else if (Static125.anInt3103 == -1) {
+		} else if (Static125.worldId == -1) {
 			Static20.anInt673 = 0;
 			Static196.anInt4587 = 0;
 			Static266.anInt5336 = -3;
diff --git a/client/src/main/java/Static230.java b/client/src/main/java/Static230.java
index 3ef3346..adb2d41 100644
--- a/client/src/main/java/Static230.java
+++ b/client/src/main/java/Static230.java
@@ -153,19 +153,19 @@ 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;
-		if (Static71.aClass213_3.anApplet2 == null) {
+		if (Static71.signLink.anApplet2 == null) {
 			return;
 		}
 		try {
-			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(Static71.aClass213_3.anApplet2);
-			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(Static71.aClass213_3.anApplet2);
+			@Pc(17) JagString local17 = Static272.aClass100_989.method3153(Static71.signLink.anApplet2);
+			@Pc(23) JagString local23 = Static246.aClass100_1029.method3153(Static71.signLink.anApplet2);
 			@Pc(48) JagString local48 = Static34.method882(new JagString[] { local17, Static142.aClass100_667, arg0, Static276.aClass100_1095, local23 });
 			if (arg0.length() == 0) {
 				local48 = Static34.method882(new JagString[] { local48, Static245.aClass100_1018 });
 			} else {
-				local48 = Static34.method882(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.method5096() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
+				local48 = Static34.method882(new JagString[] { local48, Static263.aClass100_1082, Static33.method873(MonotonicClock.currentTimeMillis() + 94608000000L), Static64.aClass100_431, Static154.method2929(94608000L) });
 			}
-			Static34.method882(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(Static71.aClass213_3.anApplet2);
+			Static34.method882(new JagString[] { Static221.aClass100_821, local48, Static223.aClass100_946 }).method3134(Static71.signLink.anApplet2);
 		} catch (@Pc(124) Throwable local124) {
 		}
 	}
diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java
index 5fd818c..43b5eba 100644
--- a/client/src/main/java/Static233.java
+++ b/client/src/main/java/Static233.java
@@ -53,7 +53,7 @@ public final class Static233 {
 	public static final int[] anIntArray452 = new int[32];
 
 	@OriginalMember(owner = "client!t", name = "F", descriptor = "I")
-	public static int anInt5226 = 0;
+	public static int js5PrevErrors = 0;
 
 	@OriginalMember(owner = "client!t", name = "b", descriptor = "(I)V")
 	public static void method3999() {
@@ -161,18 +161,18 @@ public final class Static233 {
 			@Pc(25) int local25;
 			for (local25 = 0; local25 < local18.anInt1725; local25++) {
 				if (local18.aClass212Array2[local25] != null) {
-					if (local18.aClass212Array2[local25].anInt5925 == 2) {
+					if (local18.aClass212Array2[local25].status == 2) {
 						local18.anIntArray138[local25] = -5;
 					}
-					if (local18.aClass212Array2[local25].anInt5925 == 0) {
+					if (local18.aClass212Array2[local25].status == 0) {
 						local23 = true;
 					}
 				}
 				if (local18.aClass212Array1[local25] != null) {
-					if (local18.aClass212Array1[local25].anInt5925 == 2) {
+					if (local18.aClass212Array1[local25].status == 2) {
 						local18.anIntArray138[local25] = -6;
 					}
-					if (local18.aClass212Array1[local25].anInt5925 == 0) {
+					if (local18.aClass212Array1[local25].status == 0) {
 						local23 = true;
 					}
 				}
diff --git a/client/src/main/java/Static235.java b/client/src/main/java/Static235.java
index 0aac57a..7a207ff 100644
--- a/client/src/main/java/Static235.java
+++ b/client/src/main/java/Static235.java
@@ -15,7 +15,7 @@ public final class Static235 {
 
 	@OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")
 	public static int method4044() {
-		return Static172.aBoolean199 && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1];
+		return Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2 ? Static190.anIntArray382[Static231.anInt5204 - 2] : Static190.anIntArray382[Static231.anInt5204 - 1];
 	}
 
 	@OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;")
diff --git a/client/src/main/java/Static246.java b/client/src/main/java/Static246.java
index a60af68..0d06845 100644
--- a/client/src/main/java/Static246.java
+++ b/client/src/main/java/Static246.java
@@ -49,7 +49,7 @@ public final class Static246 {
 		}
 		@Pc(35) JagString local35 = arg0.aClass100_738;
 		if (arg0.anInt3726 != 0) {
-			@Pc(47) JagString local47 = Static266.anInt5343 == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
+			@Pc(47) JagString local47 = Static266.game == 1 ? LocalizedText.RATING : LocalizedText.LEVEL;
 			local35 = Static34.method882(new JagString[] { local35, Static123.method2420(arg0.anInt3726, Static173.aClass8_Sub4_Sub1_2.anInt1652), Static123.aClass100_593, local47, Static123.method2423(arg0.anInt3726), Static72.aClass100_448 });
 		}
 		if (Static260.anInt5014 == 1) {
@@ -67,7 +67,7 @@ public final class Static246 {
 			@Pc(140) int local140;
 			if (local129 != null) {
 				for (local140 = 4; local140 >= 0; local140--) {
-					if (local129[local140] != null && (Static266.anInt5343 != 0 || !local129[local140].method3111(LocalizedText.ATTACK))) {
+					if (local129[local140] != null && (Static266.game != 0 || !local129[local140].method3111(LocalizedText.ATTACK))) {
 						@Pc(161) byte local161 = 0;
 						if (local140 == 0) {
 							local161 = 17;
@@ -95,7 +95,7 @@ public final class Static246 {
 					}
 				}
 			}
-			if (Static266.anInt5343 == 0 && local129 != null) {
+			if (Static266.game == 0 && local129 != null) {
 				for (local140 = 4; local140 >= 0; local140--) {
 					if (local129[local140] != null && local129[local140].method3111(LocalizedText.ATTACK)) {
 						@Pc(271) short local271 = 0;
diff --git a/client/src/main/java/Static249.java b/client/src/main/java/Static249.java
index 4e0f536..68182e6 100644
--- a/client/src/main/java/Static249.java
+++ b/client/src/main/java/Static249.java
@@ -7,7 +7,7 @@ public final class Static249 {
 	public static Js5 aClass153_100;
 
 	@OriginalMember(owner = "client!ud", name = "K", descriptor = "I")
-	public static int anInt5428;
+	public static int worldListDefaultPort;
 
 	@OriginalMember(owner = "client!ud", name = "O", descriptor = "I")
 	public static int anInt5431 = 0;
diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java
index c49aaae..b9a7660 100644
--- a/client/src/main/java/Static25.java
+++ b/client/src/main/java/Static25.java
@@ -36,10 +36,10 @@ public final class Static25 {
 	public static void method714(@OriginalArg(0) Frame arg0, @OriginalArg(2) SignLink arg1) {
 		while (true) {
 			@Pc(16) PrivilegedRequest local16 = arg1.method5115(arg0);
-			while (local16.anInt5925 == 0) {
+			while (local16.status == 0) {
 				Static231.method3983(10L);
 			}
-			if (local16.anInt5925 == 1) {
+			if (local16.status == 1) {
 				arg0.setVisible(false);
 				arg0.dispose();
 				return;
diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java
index bd1f529..223a95a 100644
--- a/client/src/main/java/Static253.java
+++ b/client/src/main/java/Static253.java
@@ -154,7 +154,7 @@ public final class Static253 {
 		Static5.anInt40 = local57;
 		Static138.anInt3439 = local59;
 		Static184.anInt4358 = local125;
-		if (Static19.aBoolean43 && Static107.aClass73_3.method2328() == 0) {
+		if (Static19.aBoolean43 && Static107.js5NetQueue.method2328() == 0) {
 			Static19.aBoolean43 = false;
 		}
 		if (Static19.aBoolean43) {
diff --git a/client/src/main/java/Static266.java b/client/src/main/java/Static266.java
index c8a4c9f..0c4f988 100644
--- a/client/src/main/java/Static266.java
+++ b/client/src/main/java/Static266.java
@@ -23,7 +23,7 @@ public final class Static266 {
 	public static final int anInt5338 = (int) (Math.random() * 33.0D) - 16;
 
 	@OriginalMember(owner = "client!vk", name = "n", descriptor = "I")
-	public static int anInt5343 = 0;
+	public static int game = 0;
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(Lclient!ve;Lclient!ve;I)V")
 	public static void method4187(@OriginalArg(0) Js5 arg0, @OriginalArg(1) Js5 arg1) {
diff --git a/client/src/main/java/Static267.java b/client/src/main/java/Static267.java
index b945284..bb2a529 100644
--- a/client/src/main/java/Static267.java
+++ b/client/src/main/java/Static267.java
@@ -47,7 +47,7 @@ public final class Static267 {
 	public static boolean method4527() {
 		if (Static150.aBoolean175) {
 			try {
-				return !((Boolean) Static119.aClass100_588.method3157(Static71.aClass213_3.anApplet2));
+				return !((Boolean) Static119.aClass100_588.method3157(Static71.signLink.anApplet2));
 			} catch (@Pc(21) Throwable local21) {
 			}
 		}
diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java
index 4d18c79..696cf2f 100644
--- a/client/src/main/java/Static269.java
+++ b/client/src/main/java/Static269.java
@@ -306,7 +306,7 @@ public final class Static269 {
 				Static201.anInt1864--;
 			}
 		}
-		if (!Static43.aBoolean82) {
+		if (!Static43.displayFps) {
 			return;
 		}
 		@Pc(405) int local405 = arg1 + arg2 - 8;
diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java
index 355e767..e17d9a9 100644
--- a/client/src/main/java/Static271.java
+++ b/client/src/main/java/Static271.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static271 {
 
 	@OriginalMember(owner = "client!wc", name = "c", descriptor = "I")
-	public static int anInt5800;
+	public static int defaultPort;
 
 	@OriginalMember(owner = "client!wc", name = "g", descriptor = "I")
 	public static int anInt5804 = 0;
@@ -31,10 +31,10 @@ public final class Static271 {
 
 	@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!wa;I)V")
 	public static void method4598(@OriginalArg(0) Buffer arg0) {
-		if (Static121.aClass38_3 != null) {
+		if (Static121.uid != null) {
 			try {
-				Static121.aClass38_3.method1459(0L);
-				Static121.aClass38_3.method1458(arg0.data, arg0.offset, 24);
+				Static121.uid.method1459(0L);
+				Static121.uid.method1458(arg0.data, arg0.offset, 24);
 			} catch (@Pc(16) Exception local16) {
 			}
 		}
diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java
index 1f7e9e0..22d351e 100644
--- a/client/src/main/java/Static278.java
+++ b/client/src/main/java/Static278.java
@@ -8,7 +8,7 @@ public final class Static278 {
 	public static final JagString aClass100_1101 = Static28.parse(" <col=ffff00>");
 
 	@OriginalMember(owner = "client!wj", name = "e", descriptor = "Lclient!na;")
-	public static JagString aClass100_1102 = null;
+	public static JagString mainLoadPrimaryText = null;
 
 	@OriginalMember(owner = "client!wj", name = "f", descriptor = "Lclient!na;")
 	public static final JagString aClass100_1103 = Static28.parse("ul");
diff --git a/client/src/main/java/Static3.java b/client/src/main/java/Static3.java
index 7713a65..a5385c8 100644
--- a/client/src/main/java/Static3.java
+++ b/client/src/main/java/Static3.java
@@ -46,7 +46,7 @@ public final class Static3 {
 	@OriginalMember(owner = "client!ab", name = "c", descriptor = "(B)[Lclient!od;")
 	public static Class114[] method4660() {
 		if (Static105.aClass114Array1 == null) {
-			@Pc(16) Class114[] local16 = Static197.method3558(Static71.aClass213_3);
+			@Pc(16) Class114[] local16 = Static197.method3558(Static71.signLink);
 			@Pc(20) Class114[] local20 = new Class114[local16.length];
 			@Pc(22) int local22 = 0;
 			label52: for (@Pc(24) int local24 = 0; local24 < local16.length; local24++) {
diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java
index c2d5336..9cd3282 100644
--- a/client/src/main/java/Static31.java
+++ b/client/src/main/java/Static31.java
@@ -61,34 +61,34 @@ public final class Static31 {
 				Static20.anInt673 = 0;
 				Static196.anInt4587++;
 				Static219.anInt4937 = 1;
-				if (Static208.anInt4784 == Static249.anInt5428) {
-					Static208.anInt4784 = Static97.anInt2508;
+				if (Static208.worldListPort == Static249.worldListDefaultPort) {
+					Static208.worldListPort = Static97.worldListAlternatePort;
 				} else {
-					Static208.anInt4784 = Static249.anInt5428;
+					Static208.worldListPort = Static249.worldListDefaultPort;
 				}
 			}
 			if (Static219.anInt4937 == 1) {
-				Static72.aClass212_3 = Static71.aClass213_3.method5120(Static143.aString4, Static208.anInt4784);
+				Static72.aClass212_3 = Static71.signLink.openSocket(Static143.worldListHostname, Static208.worldListPort);
 				Static219.anInt4937 = 2;
 			}
 			@Pc(126) int local126;
 			if (Static219.anInt4937 == 2) {
-				if (Static72.aClass212_3.anInt5925 == 2) {
+				if (Static72.aClass212_3.status == 2) {
 					throw new IOException();
 				}
-				if (Static72.aClass212_3.anInt5925 != 1) {
+				if (Static72.aClass212_3.status != 1) {
 					return;
 				}
-				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.aClass213_3);
+				Static124.aClass95_2 = new BufferedSocket((Socket) Static72.aClass212_3.anObject6, Static71.signLink);
 				Static72.aClass212_3 = null;
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
 				if (Static147.aClass62_2 != null) {
 					Static147.aClass62_2.method3571();
 				}
-				local126 = Static124.aClass95_2.method2828();
+				local126 = Static124.aClass95_2.read();
 				if (Static11.aClass62_1 != null) {
 					Static11.aClass62_1.method3571();
 				}
@@ -105,12 +105,12 @@ public final class Static31 {
 				Static219.anInt4937 = 3;
 			}
 			if (Static219.anInt4937 == 3) {
-				if (Static124.aClass95_2.method2831() < 2) {
+				if (Static124.aClass95_2.available() < 2) {
 					return;
 				}
-				local126 = Static124.aClass95_2.method2828() << 8 | Static124.aClass95_2.method2828();
+				local126 = Static124.aClass95_2.read() << 8 | Static124.aClass95_2.read();
 				Static176.method3303(local126);
-				if (Static125.anInt3103 == -1) {
+				if (Static125.worldId == -1) {
 					Static219.anInt4937 = 0;
 					Static266.anInt5336 = 6;
 					Static124.aClass95_2.method2834();
@@ -129,10 +129,10 @@ public final class Static31 {
 				Static124.aClass95_2 = null;
 			}
 			if (Static196.anInt4587 < 1) {
-				if (Static208.anInt4784 == Static249.anInt5428) {
-					Static208.anInt4784 = Static97.anInt2508;
+				if (Static208.worldListPort == Static249.worldListDefaultPort) {
+					Static208.worldListPort = Static97.worldListAlternatePort;
 				} else {
-					Static208.anInt4784 = Static249.anInt5428;
+					Static208.worldListPort = Static249.worldListDefaultPort;
 				}
 				Static219.anInt4937 = 1;
 				Static20.anInt673 = 0;
diff --git a/client/src/main/java/Static37.java b/client/src/main/java/Static37.java
index d3ac505..7098eb0 100644
--- a/client/src/main/java/Static37.java
+++ b/client/src/main/java/Static37.java
@@ -14,7 +14,7 @@ public final class Static37 {
 	public static int anInt1176;
 
 	@OriginalMember(owner = "client!cm", name = "f", descriptor = "Lsignlink!im;")
-	public static PrivilegedRequest aClass212_2;
+	public static PrivilegedRequest js5SocketRequest;
 
 	@OriginalMember(owner = "client!cm", name = "a", descriptor = "(ILclient!fe;)V")
 	public static void method949(@OriginalArg(1) PathingEntity arg0) {
diff --git a/client/src/main/java/Static38.java b/client/src/main/java/Static38.java
index 3b8d4df..5b3294a 100644
--- a/client/src/main/java/Static38.java
+++ b/client/src/main/java/Static38.java
@@ -137,7 +137,7 @@ public final class Static38 {
 
 	@OriginalMember(owner = "client!cn", name = "a", descriptor = "(ZI)I")
 	public static int method963(@OriginalArg(0) boolean arg0) {
-		@Pc(4) long local4 = MonotonicClock.method5096();
+		@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()) {
 			if ((local28.aLong55 & 0x3FFFFFFFFFFFFFFFL) < local4) {
 				if ((local28.aLong55 & 0x4000000000000000L) != 0L) {
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index b95c98f..5280230 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -9,7 +9,7 @@ public final class Static4 {
 	public static byte[][][] aByteArrayArrayArray1;
 
 	@OriginalMember(owner = "client!ac", name = "c", descriptor = "I")
-	public static int anInt30 = 0;
+	public static int js5ConnectState = 0;
 
 	@OriginalMember(owner = "client!ac", name = "i", descriptor = "Lclient!ih;")
 	public static final LinkedList aClass69_2 = new LinkedList();
@@ -70,7 +70,7 @@ public final class Static4 {
 		if (Static124.aClass95_2 == null) {
 			return false;
 		}
-		@Pc(14) int local14 = Static124.aClass95_2.method2831();
+		@Pc(14) int local14 = Static124.aClass95_2.available();
 		if (local14 == 0) {
 			return false;
 		}
@@ -398,7 +398,7 @@ public final class Static4 {
 				return true;
 			} else if (Static164.anInt3985 == 164) {
 				local133 = Static57.aClass3_Sub15_Sub1_3.g4rme();
-				Static232.aClass212_5 = Static71.aClass213_3.method5128(local133);
+				Static232.aClass212_5 = Static71.signLink.method5128(local133);
 				Static164.anInt3985 = -1;
 				return true;
 			} else if (Static164.anInt3985 == 225) {
@@ -821,7 +821,7 @@ public final class Static4 {
 								local908--;
 								@Pc(2961) boolean local2961 = true;
 								for (local916 = 0; local916 < local908; local916++) {
-									if (Static104.anIntArray255[local916] != Static125.anInt3103 && Static125.anInt3103 == Static104.anIntArray255[local916 + 1] || Static104.anIntArray255[local916] == 0 && Static104.anIntArray255[local916 + 1] != 0) {
+									if (Static104.anIntArray255[local916] != Static125.worldId && Static125.worldId == Static104.anIntArray255[local916 + 1] || Static104.anIntArray255[local916] == 0 && Static104.anIntArray255[local916 + 1] != 0) {
 										local2961 = false;
 										local3002 = Static104.anIntArray255[local916];
 										Static104.anIntArray255[local916] = Static104.anIntArray255[local916 + 1];
@@ -983,7 +983,7 @@ public final class Static4 {
 								Static209.anInt4808 = Static119.anInt3028;
 								return true;
 							} else if (Static164.anInt3985 == 114) {
-								Static202.method3654(Static71.aClass213_3, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028);
+								Static202.method3654(Static71.signLink, Static57.aClass3_Sub15_Sub1_3, Static223.anInt5028);
 								Static164.anInt3985 = -1;
 								return true;
 							} else if (Static164.anInt3985 == 65) {
@@ -1047,7 +1047,7 @@ public final class Static4 {
 								} else {
 									Static175.aClass100_797 = local156;
 									Static164.aBoolean194 = true;
-									Static33.aClass212_1 = Static71.aClass213_3.method5131(new String(local156.method3148(), "ISO-8859-1"));
+									Static33.aClass212_1 = Static71.signLink.method5131(new String(local156.method3148(), "ISO-8859-1"));
 								}
 								Static164.anInt3985 = -1;
 								return true;
diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java
index d8f0039..b00e004 100644
--- a/client/src/main/java/Static43.java
+++ b/client/src/main/java/Static43.java
@@ -17,7 +17,7 @@ public final class Static43 {
 	public static final JagString aClass100_334 = Static28.parse("Cache:");
 
 	@OriginalMember(owner = "client!dg", name = "f", descriptor = "Z")
-	public static boolean aBoolean82 = false;
+	public static boolean displayFps = false;
 
 	@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIILclient!th;IJZ)Z")
 	public static boolean method1141(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) Entity arg5, @OriginalArg(6) int arg6, @OriginalArg(7) long arg7, @OriginalArg(8) boolean arg8) {
diff --git a/client/src/main/java/Static44.java b/client/src/main/java/Static44.java
index 6135a88..a378d32 100644
--- a/client/src/main/java/Static44.java
+++ b/client/src/main/java/Static44.java
@@ -119,7 +119,7 @@ public final class Static44 {
 	}
 
 	@OriginalMember(owner = "client!dh", name = "a", descriptor = "(B)Lclient!uc;")
-	public static MouseWheel method1150() {
+	public static MouseWheel create() {
 		try {
 			return (MouseWheel) Class.forName("JavaMouseWheel").getDeclaredConstructor().newInstance();
 		} catch (@Pc(15) Throwable local15) {
diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java
index d8715b1..2e4cbd9 100644
--- a/client/src/main/java/Static47.java
+++ b/client/src/main/java/Static47.java
@@ -8,7 +8,7 @@ public final class Static47 {
 	public static JagString aClass100_991 = null;
 
 	@OriginalMember(owner = "client!dk", name = "j", descriptor = "[Lclient!en;")
-	public static final BufferedFile[] aClass38Array2 = new BufferedFile[28];
+	public static final BufferedFile[] cacheIndexes = new BufferedFile[28];
 
 	@OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;")
 	public static Scenery method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
diff --git a/client/src/main/java/Static55.java b/client/src/main/java/Static55.java
index 338688b..1402fd5 100644
--- a/client/src/main/java/Static55.java
+++ b/client/src/main/java/Static55.java
@@ -9,7 +9,7 @@ public final class Static55 {
 	public static int anInt1736;
 
 	@OriginalMember(owner = "client!ee", name = "g", descriptor = "I")
-	public static int anInt1738;
+	public static int alternatePort;
 
 	@OriginalMember(owner = "client!ee", name = "a", descriptor = "Lclient!na;")
 	public static final JagString aClass100_376 = Static28.parse(" GMT");
diff --git a/client/src/main/java/Static59.java b/client/src/main/java/Static59.java
index a13061b..32d6b8f 100644
--- a/client/src/main/java/Static59.java
+++ b/client/src/main/java/Static59.java
@@ -21,7 +21,7 @@ public final class Static59 {
 		if (Static162.anInt3953 == 2) {
 			if (Static155.anInt3751 == Static277.anInt5850 && Static60.anInt1892 == Static280.anInt5895) {
 				Static162.anInt3953 = 0;
-				if (Static172.aBoolean199 && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
+				if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
 					Static103.method2232(Static231.anInt5204 - 2);
 				} else {
 					Static103.method2232(Static231.anInt5204 - 1);
@@ -29,7 +29,7 @@ public final class Static59 {
 			}
 		} else if (Static155.anInt3751 == Static7.anInt985 && Static60.anInt1892 == Static60.anInt1893) {
 			Static162.anInt3953 = 0;
-			if (Static172.aBoolean199 && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
+			if (Static172.shiftClick && Static187.aBooleanArray101[81] && Static231.anInt5204 > 2) {
 				Static103.method2232(Static231.anInt5204 - 2);
 			} else {
 				Static103.method2232(Static231.anInt5204 - 1);
diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java
index ce48adc..cb2b049 100644
--- a/client/src/main/java/Static60.java
+++ b/client/src/main/java/Static60.java
@@ -8,7 +8,7 @@ public final class Static60 {
 	public static int[][][] anIntArrayArrayArray6;
 
 	@OriginalMember(owner = "client!em", name = "v", descriptor = "Ljava/lang/String;")
-	public static String aString1;
+	public static String hostname;
 
 	@OriginalMember(owner = "client!em", name = "w", descriptor = "I")
 	public static int anInt1892;
diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java
index 582254d..7bd8c04 100644
--- a/client/src/main/java/Static63.java
+++ b/client/src/main/java/Static63.java
@@ -97,9 +97,9 @@ public final class Static63 {
 								while (true) {
 									local8 = (IntNode) aClass69_51.method2287();
 									if (local8 == null) {
-										if (anInt1945 + anInt1944 + anInt1942 > 100663296 && MonotonicClock.method5096() > aLong71 + 60000L) {
+										if (anInt1945 + anInt1944 + anInt1942 > 100663296 && MonotonicClock.currentTimeMillis() > aLong71 + 60000L) {
 											System.gc();
-											aLong71 = MonotonicClock.method5096();
+											aLong71 = MonotonicClock.currentTimeMillis();
 										}
 										return;
 									}
diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java
index 9b3790c..7ae0d05 100644
--- a/client/src/main/java/Static7.java
+++ b/client/src/main/java/Static7.java
@@ -43,7 +43,7 @@ public final class Static7 {
 		if (!Static224.aBoolean247 && Static124.aClass95_2 != null) {
 			Static6.aClass3_Sub15_Sub1_1.method2242(93);
 			try {
-				Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+				Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 				Static6.aClass3_Sub15_Sub1_1.offset = 0;
 			} catch (@Pc(53) IOException local53) {
 				Static224.aBoolean247 = true;
diff --git a/client/src/main/java/Static71.java b/client/src/main/java/Static71.java
index 323c69e..4f728a1 100644
--- a/client/src/main/java/Static71.java
+++ b/client/src/main/java/Static71.java
@@ -11,10 +11,10 @@ public final class Static71 {
 	public static int[][] anIntArrayArray10;
 
 	@OriginalMember(owner = "client!fk", name = "l", descriptor = "Lsignlink!ll;")
-	public static SignLink aClass213_3;
+	public static SignLink signLink;
 
 	@OriginalMember(owner = "client!fk", name = "q", descriptor = "Lclient!uc;")
-	public static MouseWheel aClass111_2;
+	public static MouseWheel mouseWheel;
 
 	@OriginalMember(owner = "client!fk", name = "g", descriptor = "Z")
 	public static boolean aBoolean107 = true;
diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java
index 5ca22a8..d8f9a08 100644
--- a/client/src/main/java/Static80.java
+++ b/client/src/main/java/Static80.java
@@ -35,7 +35,7 @@ public final class Static80 {
 	}
 
 	@OriginalMember(owner = "client!gf", name = "a", descriptor = "(Lsignlink!ll;I)V")
-	public static void method3615(@OriginalArg(0) SignLink arg0) {
+	public static void read(@OriginalArg(0) SignLink arg0) {
 		Static113.anInt4609 = 3;
 		Static53.method1293(true);
 		aBoolean231 = true;
@@ -72,10 +72,10 @@ public final class Static80 {
 		Static214.anInt5581 = 0;
 		try {
 			@Pc(78) PrivilegedRequest local78 = arg0.method5112("runescape");
-			while (local78.anInt5925 == 0) {
+			while (local78.status == 0) {
 				Static231.method3983(1L);
 			}
-			if (local78.anInt5925 == 1) {
+			if (local78.status == 1) {
 				local48 = (FileOnDisk) local78.anObject6;
 				@Pc(106) byte[] local106 = new byte[(int) local48.method5137()];
 				@Pc(128) int local128;
diff --git a/client/src/main/java/Static81.java b/client/src/main/java/Static81.java
index 2eb0540..e4661b5 100644
--- a/client/src/main/java/Static81.java
+++ b/client/src/main/java/Static81.java
@@ -16,7 +16,7 @@ public final class Static81 {
 	public static int anInt2223;
 
 	@OriginalMember(owner = "client!gg", name = "U", descriptor = "I")
-	public static int anInt2219 = 0;
+	public static int modeWhat = 0;
 
 	@OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;")
 	public static final JagString aClass100_475 = Static28.parse("null");
@@ -41,12 +41,12 @@ public final class Static81 {
 			if (local28 == null) {
 				arg0 = -1;
 			} else {
-				Static71.aClass213_3.method5113(local28.method301(), local28.anInt1860, Static154.aCanvas1, new Point(local24.anInt2852, local24.anInt2850), local28.anInt1866);
+				Static71.signLink.method5113(local28.method301(), local28.anInt1860, Static154.canvas, new Point(local24.anInt2852, local24.anInt2850), local28.anInt1866);
 				Static115.anInt2941 = arg0;
 			}
 		}
 		if (arg0 == -1 && Static115.anInt2941 != -1) {
-			Static71.aClass213_3.method5113(null, -1, Static154.aCanvas1, new Point(), -1);
+			Static71.signLink.method5113(null, -1, Static154.canvas, new Point(), -1);
 			Static115.anInt2941 = -1;
 		}
 	}
@@ -599,7 +599,7 @@ public final class Static81 {
 												Static48.method1197(14500);
 												Static6.aClass3_Sub15_Sub1_1.method2242(245);
 											}
-											if (Static33.aClass212_1 != null && Static33.aClass212_1.anInt5925 == 1) {
+											if (Static33.aClass212_1 != null && Static33.aClass212_1.status == 1) {
 												if (Static33.aClass212_1.anObject6 != null) {
 													Static169.method3175(Static175.aClass100_797, Static164.aBoolean194);
 												}
@@ -672,7 +672,7 @@ public final class Static81 {
 											}
 											try {
 												if (Static124.aClass95_2 != null && Static6.aClass3_Sub15_Sub1_1.offset > 0) {
-													Static124.aClass95_2.method2830(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
+													Static124.aClass95_2.write(Static6.aClass3_Sub15_Sub1_1.data, Static6.aClass3_Sub15_Sub1_1.offset);
 													Static131.anInt3251 = 0;
 													Static6.aClass3_Sub15_Sub1_1.offset = 0;
 												}
diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java
index b8a185a..517909f 100644
--- a/client/src/main/java/Static83.java
+++ b/client/src/main/java/Static83.java
@@ -14,7 +14,7 @@ public final class Static83 {
 	public static float aFloat3;
 
 	@OriginalMember(owner = "client!gj", name = "b", descriptor = "I")
-	public static int anInt370 = 0;
+	public static int modeWhere = 0;
 
 	@OriginalMember(owner = "client!gj", name = "d", descriptor = "I")
 	public static int anInt372 = 0;
diff --git a/client/src/main/java/Static86.java b/client/src/main/java/Static86.java
index 6204df0..d382eff 100644
--- a/client/src/main/java/Static86.java
+++ b/client/src/main/java/Static86.java
@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static86 {
 
 	@OriginalMember(owner = "client!gm", name = "T", descriptor = "Lclient!k;")
-	public static Js5CacheQueue aClass80_3;
+	public static Js5CacheQueue js5CacheQueue;
 
 	@OriginalMember(owner = "client!gm", name = "ib", descriptor = "Lclient!ve;")
 	public static Js5 aClass153_37;
diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java
index 2392359..d2ec3cd 100644
--- a/client/src/main/java/Static87.java
+++ b/client/src/main/java/Static87.java
@@ -20,7 +20,7 @@ public final class Static87 {
 	public static boolean method1802() {
 		if (Static150.aBoolean175) {
 			try {
-				Static9.aClass100_35.method3157(Static71.aClass213_3.anApplet2);
+				Static9.aClass100_35.method3157(Static71.signLink.anApplet2);
 				return true;
 			} catch (@Pc(14) Throwable local14) {
 			}
@@ -255,7 +255,7 @@ public final class Static87 {
 									}
 									continue;
 								}
-								if (Static266.anInt5343 == 1) {
+								if (Static266.game == 1) {
 									Static98.method1966(-1, 1L, Static186.aClass100_827, local563, (short) 36, LocalizedText.FACEHERE, local571);
 								}
 								Static98.method1966(-1, 1L, Static186.aClass100_827, local563, (short) 60, Static195.aClass100_859, local571);
@@ -303,7 +303,7 @@ public final class Static87 {
 								continue;
 							}
 							if (local30.anInt453 == 1405) {
-								if (!Static43.aBoolean82) {
+								if (!Static43.displayFps) {
 									continue;
 								}
 								local270 = local30.anInt445 + local123;
diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java
index c5189bb..3aed203 100644
--- a/client/src/main/java/Static88.java
+++ b/client/src/main/java/Static88.java
@@ -1425,7 +1425,7 @@ public final class Static88 {
 										continue;
 									}
 									if (local226 == 3318) {
-										Static254.anIntArray487[local28++] = Static125.anInt3103;
+										Static254.anIntArray487[local28++] = Static125.worldId;
 										continue;
 									}
 									if (local226 == 3321) {
@@ -2882,7 +2882,7 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static214.anInt5581 = local809;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														continue;
 													}
 												} else if (local226 < 5500) {
@@ -2981,7 +2981,7 @@ public final class Static88 {
 														if (Static39.aFrame1 != null || local1552 && SignLink.anInt5928 != 3 && SignLink.aString15.startsWith("win") && !Static178.aBoolean203) {
 															Static164.aBoolean194 = local1552;
 															Static175.aClass100_797 = local8356;
-															Static33.aClass212_1 = Static71.aClass213_3.method5131(new String(local8356.method3148(), "ISO-8859-1"));
+															Static33.aClass212_1 = Static71.signLink.method5131(new String(local8356.method3148(), "ISO-8859-1"));
 															continue;
 														}
 														Static169.method3175(local8356, local1552);
@@ -2995,13 +2995,13 @@ public final class Static88 {
 														local609 = Static3.aClass100Array176[local26];
 														if (local609.length() > 0) {
 															if (Static103.aClass100Array88 == null) {
-																Static103.aClass100Array88 = new JagString[Static132.anIntArray309[Static266.anInt5343]];
+																Static103.aClass100Array88 = new JagString[Static132.anIntArray309[Static266.game]];
 															}
 															Static103.aClass100Array88[local1052] = local609;
 														}
 														if (local2522.length() > 0) {
 															if (Static263.aClass100Array174 == null) {
-																Static263.aClass100Array174 = new JagString[Static132.anIntArray309[Static266.anInt5343]];
+																Static263.aClass100Array174 = new JagString[Static132.anIntArray309[Static266.game]];
 															}
 															Static263.aClass100Array174[local1052] = local2522;
 														}
@@ -3224,7 +3224,7 @@ public final class Static88 {
 															}
 														}
 														Static269.method2172();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3234,7 +3234,7 @@ public final class Static88 {
 														Static90.method1854();
 														Static145.method2742();
 														Static269.method2218();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3242,7 +3242,7 @@ public final class Static88 {
 														local28--;
 														Static80.aBoolean231 = Static254.anIntArray487[local28] == 1;
 														Static269.method2218();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3250,7 +3250,7 @@ public final class Static88 {
 														local28--;
 														Static250.aBoolean283 = Static254.anIntArray487[local28] == 1;
 														Static145.method2742();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3258,35 +3258,35 @@ public final class Static88 {
 														local28--;
 														Static53.aBoolean99 = Static254.anIntArray487[local28] == 1;
 														((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3245(!Static53.aBoolean99);
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
 													if (local226 == 6007) {
 														local28--;
 														Static15.aBoolean33 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
 													if (local226 == 6008) {
 														local28--;
 														Static11.aBoolean15 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
 													if (local226 == 6009) {
 														local28--;
 														Static159.aBoolean189 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
 													if (local226 == 6010) {
 														local28--;
 														Static209.aBoolean240 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3297,7 +3297,7 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static139.anInt3451 = local809;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3324,7 +3324,7 @@ public final class Static88 {
 															}
 														}
 														Static145.method2742();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3334,7 +3334,7 @@ public final class Static88 {
 														if (Static239.aBoolean269) {
 															Static145.method2742();
 														}
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3344,7 +3344,7 @@ public final class Static88 {
 														if (Static239.aBoolean269) {
 															Static86.method1799();
 														}
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3364,7 +3364,7 @@ public final class Static88 {
 														local28--;
 														Static99.aBoolean143 = Static254.anIntArray487[local28] == 1;
 														Static211.method930();
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3378,7 +3378,7 @@ public final class Static88 {
 															local809 = 127;
 														}
 														Static125.anInt3104 = local809;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3403,7 +3403,7 @@ public final class Static88 {
 															}
 															Static12.anInt391 = local809;
 														}
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3417,7 +3417,7 @@ public final class Static88 {
 															local809 = 127;
 														}
 														Static30.anInt978 = local809;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														continue;
 													}
@@ -3442,7 +3442,7 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static76.method1645(local809);
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														Static18.aBoolean39 = false;
 														Static254.anIntArray487[local28++] = local1552 ? 0 : 1;
 														continue;
@@ -3454,13 +3454,13 @@ public final class Static88 {
 															local809 = 0;
 														}
 														Static102.anInt2679 = local809;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														continue;
 													}
 													if (local226 == 6028) {
 														local28--;
 														Static64.aBoolean111 = Static254.anIntArray487[local28] != 0;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														continue;
 													}
 												} else if (local226 < 6200) {
@@ -3623,11 +3623,11 @@ public final class Static88 {
 													}
 												} else if (local226 < 6400) {
 													if (local226 == 6300) {
-														Static254.anIntArray487[local28++] = (int) (MonotonicClock.method5096() / 60000L);
+														Static254.anIntArray487[local28++] = (int) (MonotonicClock.currentTimeMillis() / 60000L);
 														continue;
 													}
 													if (local226 == 6301) {
-														Static254.anIntArray487[local28++] = (int) (MonotonicClock.method5096() / 86400000L) - 11745;
+														Static254.anIntArray487[local28++] = (int) (MonotonicClock.currentTimeMillis() / 86400000L) - 11745;
 														continue;
 													}
 													if (local226 == 6302) {
@@ -3643,7 +3643,7 @@ public final class Static88 {
 													}
 													if (local226 == 6303) {
 														Static102.aCalendar2.clear();
-														Static102.aCalendar2.setTime(new Date(MonotonicClock.method5096()));
+														Static102.aCalendar2.setTime(new Date(MonotonicClock.currentTimeMillis()));
 														Static254.anIntArray487[local28++] = Static102.aCalendar2.get(1);
 														continue;
 													}
@@ -3738,7 +3738,7 @@ public final class Static88 {
 													if (local226 == 6504) {
 														local28--;
 														Static164.anInt3988 = Static254.anIntArray487[local28];
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														continue;
 													}
 													if (local226 == 6505) {
@@ -3778,7 +3778,7 @@ public final class Static88 {
 													if (local226 == 6600) {
 														local28--;
 														Static33.aBoolean63 = Static254.anIntArray487[local28] == 1;
-														Static203.method3663(Static71.aClass213_3);
+														Static203.method3663(Static71.signLink);
 														continue;
 													}
 													if (local226 == 6601) {
@@ -4118,7 +4118,7 @@ public final class Static88 {
 			}
 		} catch (@Pc(14378) Exception local14378) {
 			if (local14.aClass100_880 == null) {
-				if (Static83.anInt370 != 0) {
+				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.aClass100_447, 0, Static136.aClass100_633);
 				}
 				Static89.method1839("CS2 - scr:" + local14.aLong192 + " op:" + local44, local14378);
@@ -4132,7 +4132,7 @@ public final class Static88 {
 					local58 = local33[local30];
 					local14385.method3113(Static176.aClass100_802).method3113(Static123.method2423(local58));
 				}
-				if (Static83.anInt370 != 0) {
+				if (Static83.modeWhere != 0) {
 					Static103.method2231(Static72.aClass100_447, 0, Static34.method882(new JagString[] { Static167.aClass100_780, local14.aClass100_880 }));
 				}
 				Static89.method1839("CS2 - scr:" + local14.aLong192 + " op:" + local44 + new String(local14385.method3148()), local14378);
@@ -4146,7 +4146,7 @@ public final class Static88 {
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(Ljava/awt/Component;Z)V")
-	public static void method1833(@OriginalArg(0) java.awt.Component arg0) {
+	public static void start(@OriginalArg(0) java.awt.Component arg0) {
 		arg0.addMouseListener(Static93.aClass150_1);
 		arg0.addMouseMotionListener(Static93.aClass150_1);
 		arg0.addFocusListener(Static93.aClass150_1);
diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java
index d231a91..3140823 100644
--- a/client/src/main/java/Static89.java
+++ b/client/src/main/java/Static89.java
@@ -131,10 +131,10 @@ public final class Static89 {
 				return;
 			}
 			@Pc(109) PrivilegedRequest local109 = Static69.aClass213_4.method5118(new URL(Static69.aClass213_4.anApplet2.getCodeBase(), "clienterror.ws?c=" + Static131.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.aString20 + "&v2=" + SignLink.aString14 + "&e=" + local13));
-			while (local109.anInt5925 == 0) {
+			while (local109.status == 0) {
 				Static231.method3983(1L);
 			}
-			if (local109.anInt5925 == 1) {
+			if (local109.status == 1) {
 				@Pc(128) DataInputStream local128 = (DataInputStream) local109.anObject6;
 				local128.read();
 				local128.close();
diff --git a/client/src/main/java/Static9.java b/client/src/main/java/Static9.java
index d995d9a..a74fab5 100644
--- a/client/src/main/java/Static9.java
+++ b/client/src/main/java/Static9.java
@@ -77,10 +77,10 @@ public final class Static9 {
 	@OriginalMember(owner = "client!al", name = "a", descriptor = "(ZZZIZ)Lclient!ve;")
 	public static Js5 method183(@OriginalArg(0) boolean arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3) {
 		@Pc(7) Cache local7 = null;
-		if (Static172.aClass38_4 != null) {
-			local7 = new Cache(arg3, Static172.aClass38_4, Static47.aClass38Array2[arg3], 1000000);
+		if (Static172.cacheData != null) {
+			local7 = new Cache(arg3, Static172.cacheData, Static47.cacheIndexes[arg3], 1000000);
 		}
-		Static269.aClass14_Sub1Array3[arg3] = Static257.aClass9_2.method180(arg3, Static148.aClass49_4, local7);
+		Static269.aClass14_Sub1Array3[arg3] = Static257.aClass9_2.method180(arg3, Static148.masterCache, local7);
 		if (arg1) {
 			Static269.aClass14_Sub1Array3[arg3].method528();
 		}
diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java
index 4705d3b..7e25212 100644
--- a/client/src/main/java/Static97.java
+++ b/client/src/main/java/Static97.java
@@ -10,7 +10,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Static97 {
 
 	@OriginalMember(owner = "client!hi", name = "g", descriptor = "I")
-	public static int anInt2508;
+	public static int worldListAlternatePort;
 
 	@OriginalMember(owner = "client!hi", name = "a", descriptor = "I")
 	public static int anInt2503 = -1;
diff --git a/client/src/main/java/WorldMapFont.java b/client/src/main/java/WorldMapFont.java
index 23ca8b9..6edcc85 100644
--- a/client/src/main/java/WorldMapFont.java
+++ b/client/src/main/java/WorldMapFont.java
@@ -224,7 +224,7 @@ public final class WorldMapFont {
 		@Pc(48) int local48 = arg1.getMaxAscent();
 		@Pc(54) int local54 = arg1.getMaxAscent() + arg1.getMaxDescent();
 		@Pc(57) int local57 = arg1.getHeight();
-		@Pc(62) Image local62 = Static154.aCanvas1.createImage(local3, local54);
+		@Pc(62) Image local62 = Static154.canvas.createImage(local3, local54);
 		@Pc(65) Graphics local65 = local62.getGraphics();
 		local65.setColor(Color.black);
 		local65.fillRect(0, 0, local3, local54);
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
index 1718ad7..690ae5c 100644
--- a/client/src/main/java/client.java
+++ b/client/src/main/java/client.java
@@ -4,6 +4,7 @@ import java.awt.Insets;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.GregorianCalendar;
+
 import org.openrs2.deob.annotation.OriginalArg;
 import org.openrs2.deob.annotation.OriginalClass;
 import org.openrs2.deob.annotation.OriginalMember;
@@ -19,14 +20,14 @@ public final class client extends GameShell {
 				Static131.method2577("argument count");
 			}
 			@Pc(15) int local15 = -1;
-			Static187.anInt4413 = Integer.parseInt(arg0[0]);
-			Static83.anInt370 = 2;
+			Static187.worldListId = Integer.parseInt(arg0[0]);
+			Static83.modeWhere = 2;
 			if (arg0[1].equals("live")) {
-				Static81.anInt2219 = 0;
+				Static81.modeWhat = 0;
 			} else if (arg0[1].equals("rc")) {
-				Static81.anInt2219 = 1;
+				Static81.modeWhat = 1;
 			} else if (arg0[1].equals("wip")) {
-				Static81.anInt2219 = 2;
+				Static81.modeWhat = 2;
 			} else {
 				Static131.method2577("modewhat");
 			}
@@ -49,9 +50,9 @@ public final class client extends GameShell {
 			Static233.aBoolean254 = false;
 			Static150.aBoolean175 = false;
 			if (arg0[3].equals("game0")) {
-				Static266.anInt5343 = 0;
+				Static266.game = 0;
 			} else if (arg0[3].equals("game1")) {
-				Static266.anInt5343 = 1;
+				Static266.game = 1;
 			} else {
 				Static131.method2577("game");
 			}
@@ -61,7 +62,7 @@ public final class client extends GameShell {
 			Static47.aClass100_991 = Static186.aClass100_827;
 			@Pc(146) client local146 = new client();
 			Static215.aClient1 = local146;
-			local146.method936(Static81.anInt2219 + 32, "runescape");
+			local146.method936(Static81.modeWhat + 32, "runescape");
 			Static39.aFrame1.setLocation(40, 40);
 		} catch (@Pc(167) Exception local167) {
 			Static89.method1839(null, local167);
@@ -78,7 +79,7 @@ public final class client extends GameShell {
 		if (local15 && Static144.aBoolean173 && Static11.aClass62_1 != null) {
 			Static11.aClass62_1.method3570();
 		}
-		if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (Static35.aBoolean66 || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.method5096())) {
+		if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && (Static35.aBoolean66 || Static97.aLong89 != 0L && Static97.aLong89 < MonotonicClock.currentTimeMillis())) {
 			Static241.method4540(Static35.aBoolean66, Static144.method2736(), Static114.anInt5831, Static22.anInt729);
 		}
 		@Pc(80) int local80;
@@ -88,7 +89,7 @@ public final class client extends GameShell {
 			if (Static69.aFrame2 != null) {
 				local65 = Static69.aFrame2;
 			} else if (Static39.aFrame1 == null) {
-				local65 = Static71.aClass213_3.anApplet2;
+				local65 = Static71.signLink.anApplet2;
 			} else {
 				local65 = Static39.aFrame1;
 			}
@@ -101,7 +102,7 @@ public final class client extends GameShell {
 			}
 			if (local80 != Static72.anInt2046 || local84 != Static122.anInt3045) {
 				Static203.method3662();
-				Static97.aLong89 = MonotonicClock.method5096() + 500L;
+				Static97.aLong89 = MonotonicClock.currentTimeMillis() + 500L;
 			}
 		}
 		if (Static69.aFrame2 != null && !Static26.aBoolean59 && (Static244.anInt5370 == 30 || Static244.anInt5370 == 10)) {
@@ -156,7 +157,7 @@ public final class client extends GameShell {
 			@Pc(388) Graphics local388;
 			if ((Static244.anInt5370 == 30 || Static244.anInt5370 == 10) && Static199.anInt4672 == 0 && !local158) {
 				try {
-					local388 = Static154.aCanvas1.getGraphics();
+					local388 = Static154.canvas.getGraphics();
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
 						if (Static31.aBooleanArray29[local84]) {
 							Static260.aClass27_2.method4191(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]);
@@ -164,17 +165,17 @@ public final class client extends GameShell {
 						}
 					}
 				} catch (@Pc(423) Exception local423) {
-					Static154.aCanvas1.repaint();
+					Static154.canvas.repaint();
 				}
 			} else if (Static244.anInt5370 != 0) {
 				try {
-					local388 = Static154.aCanvas1.getGraphics();
+					local388 = Static154.canvas.getGraphics();
 					Static260.aClass27_2.method4186(local388);
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
 						Static31.aBooleanArray29[local84] = false;
 					}
 				} catch (@Pc(453) Exception local453) {
-					Static154.aCanvas1.repaint();
+					Static154.canvas.repaint();
 				}
 			}
 		}
@@ -183,7 +184,7 @@ public final class client extends GameShell {
 		}
 		if (Static164.aBoolean191 && Static244.anInt5370 == 10 && Static154.anInt3711 != -1) {
 			Static164.aBoolean191 = false;
-			Static203.method3663(Static71.aClass213_3);
+			Static203.method3663(Static71.signLink);
 		}
 	}
 
@@ -194,11 +195,11 @@ public final class client extends GameShell {
 			Static239.method4169();
 		}
 		if (Static69.aFrame2 != null) {
-			Static25.method714(Static69.aFrame2, Static71.aClass213_3);
+			Static25.method714(Static69.aFrame2, Static71.signLink);
 			Static69.aFrame2 = null;
 		}
-		if (Static71.aClass213_3 != null) {
-			Static71.aClass213_3.method5121(this.getClass());
+		if (Static71.signLink != null) {
+			Static71.signLink.method5121(this.getClass());
 		}
 		if (Static178.aClass74_1 != null) {
 			Static178.aClass74_1.aBoolean151 = false;
@@ -208,38 +209,38 @@ public final class client extends GameShell {
 			Static124.aClass95_2.method2834();
 			Static124.aClass95_2 = null;
 		}
-		Static31.method847(Static154.aCanvas1);
-		Static223.method3866(Static154.aCanvas1);
-		if (Static71.aClass111_2 != null) {
-			Static71.aClass111_2.method3291(Static154.aCanvas1);
+		Static31.method847(Static154.canvas);
+		Static223.method3866(Static154.canvas);
+		if (Static71.mouseWheel != null) {
+			Static71.mouseWheel.method3291(Static154.canvas);
 		}
 		Static6.method82();
 		Static251.method4277();
-		Static71.aClass111_2 = null;
+		Static71.mouseWheel = null;
 		if (Static11.aClass62_1 != null) {
 			Static11.aClass62_1.method3575();
 		}
 		if (Static147.aClass62_2 != null) {
 			Static147.aClass62_2.method3575();
 		}
-		Static107.aClass73_3.method2329();
-		Static86.aClass80_3.method2466();
+		Static107.js5NetQueue.method2329();
+		Static86.js5CacheQueue.method2466();
 		try {
-			if (Static172.aClass38_4 != null) {
-				Static172.aClass38_4.method1455();
+			if (Static172.cacheData != null) {
+				Static172.cacheData.method1455();
 			}
-			if (Static47.aClass38Array2 != null) {
-				for (@Pc(95) int local95 = 0; local95 < Static47.aClass38Array2.length; local95++) {
-					if (Static47.aClass38Array2[local95] != null) {
-						Static47.aClass38Array2[local95].method1455();
+			if (Static47.cacheIndexes != null) {
+				for (@Pc(95) int local95 = 0; local95 < Static47.cacheIndexes.length; local95++) {
+					if (Static47.cacheIndexes[local95] != null) {
+						Static47.cacheIndexes[local95].method1455();
 					}
 				}
 			}
-			if (Static190.aClass38_5 != null) {
-				Static190.aClass38_5.method1455();
+			if (Static190.cacheMasterIndex != null) {
+				Static190.cacheMasterIndex.method1455();
 			}
-			if (Static121.aClass38_3 != null) {
-				Static121.aClass38_3.method1455();
+			if (Static121.uid != null) {
+				Static121.uid.method1455();
 			}
 		} catch (@Pc(129) IOException local129) {
 		}
@@ -251,14 +252,14 @@ public final class client extends GameShell {
 		if (!this.method925()) {
 			return;
 		}
-		Static187.anInt4413 = Integer.parseInt(this.getParameter("worldid"));
-		Static83.anInt370 = Integer.parseInt(this.getParameter("modewhere"));
-		if (Static83.anInt370 < 0 || Static83.anInt370 > 1) {
-			Static83.anInt370 = 0;
+		Static187.worldListId = Integer.parseInt(this.getParameter("worldid"));
+		Static83.modeWhere = Integer.parseInt(this.getParameter("modewhere"));
+		if (Static83.modeWhere < 0 || Static83.modeWhere > 1) {
+			Static83.modeWhere = 0;
 		}
-		Static81.anInt2219 = Integer.parseInt(this.getParameter("modewhat"));
-		if (Static81.anInt2219 < 0 || Static81.anInt2219 > 2) {
-			Static81.anInt2219 = 0;
+		Static81.modeWhat = Integer.parseInt(this.getParameter("modewhat"));
+		if (Static81.modeWhat < 0 || Static81.modeWhat > 2) {
+			Static81.modeWhat = 0;
 		}
 		@Pc(50) String local50 = this.getParameter("advertsuppressed");
 		if (local50 != null && local50.equals("1")) {
@@ -286,9 +287,9 @@ public final class client extends GameShell {
 		}
 		@Pc(111) String local111 = this.getParameter("game");
 		if (local111 != null && local111.equals("1")) {
-			Static266.anInt5343 = 1;
+			Static266.game = 1;
 		} else {
-			Static266.anInt5343 = 0;
+			Static266.game = 0;
 		}
 		try {
 			Static204.anInt4760 = Integer.parseInt(this.getParameter("affid"));
@@ -314,34 +315,34 @@ public final class client extends GameShell {
 			Static178.aBoolean203 = false;
 		}
 		Static215.aClient1 = this;
-		this.method937(Static81.anInt2219 + 32);
+		this.method937(Static81.modeWhat + 32);
 	}
 
 	@OriginalMember(owner = "client!client", name = "g", descriptor = "(I)V")
 	@Override
 	protected final void method935() {
 		Static203.method3662();
-		Static86.aClass80_3 = new Js5CacheQueue();
-		Static107.aClass73_3 = new Js5NetQueue();
-		if (Static81.anInt2219 != 0) {
+		Static86.js5CacheQueue = new Js5CacheQueue();
+		Static107.js5NetQueue = new Js5NetQueue();
+		if (Static81.modeWhat != 0) {
 			Static51.aByteArrayArray8 = new byte[50][];
 		}
-		Static80.method3615(Static71.aClass213_3);
-		if (Static83.anInt370 == 0) {
-			Static143.aString4 = this.getCodeBase().getHost();
-			Static97.anInt2508 = 443;
-			Static249.anInt5428 = 43594;
-		} else if (Static83.anInt370 == 1) {
-			Static143.aString4 = this.getCodeBase().getHost();
-			Static97.anInt2508 = Static187.anInt4413 + 50000;
-			Static249.anInt5428 = Static187.anInt4413 + 40000;
-		} else if (Static83.anInt370 == 2) {
-			Static143.aString4 = "127.0.0.1";
-			Static97.anInt2508 = Static187.anInt4413 + 50000;
-			Static249.anInt5428 = Static187.anInt4413 + 40000;
+		Static80.read(Static71.signLink); // preferences
+		if (Static83.modeWhere == 0) {
+			Static143.worldListHostname = this.getCodeBase().getHost();
+			Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + 1;
+			Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + 1;
+		} else if (Static83.modeWhere == 1) {
+			Static143.worldListHostname = this.getCodeBase().getHost();
+			Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + Static187.worldListId;
+			Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + Static187.worldListId;
+		} else if (Static83.modeWhere == 2) {
+			Static143.worldListHostname = "127.0.0.1";
+			Static97.worldListAlternatePort = GlobalConfig.ALTERNATE_PORT + Static187.worldListId;
+			Static249.worldListDefaultPort = GlobalConfig.DEFAULT_PORT + Static187.worldListId;
 		}
-		if (Static266.anInt5343 == 1) {
-			Static172.aBoolean199 = true;
+		if (Static266.game == 1) {
+			Static172.shiftClick = true;
 			Static161.anInt3923 = 16777215;
 			Static161.anInt3922 = 0;
 			Static33.aShortArrayArray2 = Static198.aShortArrayArray4;
@@ -354,46 +355,46 @@ public final class client extends GameShell {
 			Static172.aShortArrayArray7 = Static43.aShortArrayArray5;
 			Static200.aShortArray65 = Static260.aShortArray71;
 		}
-		Static55.anInt1738 = Static97.anInt2508;
-		Static271.anInt5800 = Static249.anInt5428;
-		Static60.aString1 = Static143.aString4;
-		Static208.anInt4784 = Static249.anInt5428;
+		Static55.alternatePort = Static97.worldListAlternatePort;
+		Static271.defaultPort = Static249.worldListDefaultPort;
+		Static60.hostname = Static143.worldListHostname;
+		Static208.worldListPort = Static249.worldListDefaultPort;
 		Static259.aShortArray88 = Static62.aShortArray19 = Static232.aShortArray74 = Static259.aShortArray87 = new short[256];
-		Static209.anInt4794 = Static208.anInt4784;
-		if (SignLink.anInt5928 == 3 && Static83.anInt370 != 2) {
-			Static125.anInt3103 = Static187.anInt4413;
+		Static209.port = Static208.worldListPort;
+		if ((SignLink.anInt5928 == 3 && Static83.modeWhere != 2) || GlobalConfig.SELECT_DEFAULT_WORLD) {
+			Static125.worldId = Static187.worldListId;
 		}
-		Static156.method2958();
-		Static19.method591(Static154.aCanvas1);
-		Static88.method1833(Static154.aCanvas1);
-		Static71.aClass111_2 = Static44.method1150();
-		if (Static71.aClass111_2 != null) {
-			Static71.aClass111_2.method3293(Static154.aCanvas1);
+		Static156.init(); // keyboard
+		Static19.start(Static154.canvas); // keyboard
+		Static88.start(Static154.canvas); // mouse
+		Static71.mouseWheel = Static44.create();
+		if (Static71.mouseWheel != null) {
+			Static71.mouseWheel.start(Static154.canvas);
 		}
 		Static7.anInt986 = SignLink.anInt5928;
 		try {
-			if (Static71.aClass213_3.aClass214_2 != null) {
-				Static172.aClass38_4 = new BufferedFile(Static71.aClass213_3.aClass214_2, 5200, 0);
-				for (@Pc(162) int local162 = 0; local162 < 28; local162++) {
-					Static47.aClass38Array2[local162] = new BufferedFile(Static71.aClass213_3.aClass214Array1[local162], 6000, 0);
+			if (Static71.signLink.cacheData != null) {
+				Static172.cacheData = new BufferedFile(Static71.signLink.cacheData, 5200, 0);
+				for (@Pc(162) int i = 0; i < 28; i++) {
+					Static47.cacheIndexes[i] = new BufferedFile(Static71.signLink.cacheIndexes[i], 6000, 0);
 				}
-				Static190.aClass38_5 = new BufferedFile(Static71.aClass213_3.aClass214_3, 6000, 0);
-				Static148.aClass49_4 = new Cache(255, Static172.aClass38_4, Static190.aClass38_5, 500000);
-				Static121.aClass38_3 = new BufferedFile(Static71.aClass213_3.aClass214_4, 24, 0);
-				Static71.aClass213_3.aClass214Array1 = null;
-				Static71.aClass213_3.aClass214_3 = null;
-				Static71.aClass213_3.aClass214_4 = null;
-				Static71.aClass213_3.aClass214_2 = null;
+				Static190.cacheMasterIndex = new BufferedFile(Static71.signLink.cacheMasterIndex, 6000, 0);
+				Static148.masterCache = new Cache(255, Static172.cacheData, Static190.cacheMasterIndex, 500000);
+				Static121.uid = new BufferedFile(Static71.signLink.uid, 24, 0);
+				Static71.signLink.cacheIndexes = null;
+				Static71.signLink.cacheMasterIndex = null;
+				Static71.signLink.uid = null;
+				Static71.signLink.cacheData = null;
 			}
-		} catch (@Pc(220) IOException local220) {
-			Static121.aClass38_3 = null;
-			Static172.aClass38_4 = null;
-			Static190.aClass38_5 = null;
-			Static148.aClass49_4 = null;
+		} catch (@Pc(220) IOException ex) {
+			Static121.uid = null;
+			Static172.cacheData = null;
+			Static190.cacheMasterIndex = null;
+			Static148.masterCache = null;
 		}
-		Static278.aClass100_1102 = LocalizedText.GAME0_LOADING;
-		if (Static83.anInt370 != 0) {
-			Static43.aBoolean82 = true;
+		Static278.mainLoadPrimaryText = LocalizedText.GAME0_LOADING;
+		if (Static83.modeWhere != 0) {
+			Static43.displayFps = true;
 		}
 	}
 
@@ -403,12 +404,12 @@ public final class client extends GameShell {
 	}
 
 	@OriginalMember(owner = "client!client", name = "a", descriptor = "(ZI)V")
-	private void method942(@OriginalArg(1) int arg0) {
-		Static107.aClass73_3.anInt2964++;
-		Static37.aClass212_2 = null;
-		Static107.aClass73_3.anInt2963 = arg0;
-		Static206.aClass95_3 = null;
-		Static4.anInt30 = 0;
+	private void setJs5Response(@OriginalArg(1) int arg0) {
+		Static107.js5NetQueue.errors++;
+		Static37.js5SocketRequest = null;
+		Static107.js5NetQueue.response = arg0;
+		Static206.js5Socket = null;
+		Static4.js5ConnectState = 0;
 	}
 
 	@OriginalMember(owner = "client!client", name = "d", descriptor = "(B)V")
@@ -486,7 +487,7 @@ public final class client extends GameShell {
 											if (Static105.aClass13_14 != null) {
 												Static4.method28();
 											}
-											if (Static33.aClass212_1 != null && Static33.aClass212_1.anInt5925 == 1) {
+											if (Static33.aClass212_1 != null && Static33.aClass212_1.status == 1) {
 												if (Static33.aClass212_1.anObject6 != null) {
 													Static169.method3175(Static175.aClass100_797, Static164.aBoolean194);
 												}
@@ -528,39 +529,39 @@ public final class client extends GameShell {
 	}
 
 	@OriginalMember(owner = "client!client", name = "d", descriptor = "(Z)V")
-	private void method944() {
-		@Pc(3) boolean local3 = Static107.aClass73_3.method2318();
-		if (!local3) {
-			this.method945();
+	private void js5NetworkLoop() {
+		@Pc(3) boolean idle = Static107.js5NetQueue.loop();
+		if (!idle) {
+			this.js5Connect();
 		}
 	}
 
 	@OriginalMember(owner = "client!client", name = "h", descriptor = "(I)V")
-	private void method945() {
-		if (Static233.anInt5226 < Static107.aClass73_3.anInt2964) {
-			Static22.anInt722 = 5 * 50 * (Static107.aClass73_3.anInt2964 - 1);
-			if (Static271.anInt5800 == Static209.anInt4794) {
-				Static209.anInt4794 = Static55.anInt1738;
+	private void js5Connect() {
+		if (Static233.js5PrevErrors < Static107.js5NetQueue.errors) {
+			Static22.js5ConnectDelay = 5 * 50 * (Static107.js5NetQueue.errors - 1);
+			if (Static271.defaultPort == Static209.port) {
+				Static209.port = Static55.alternatePort;
 			} else {
-				Static209.anInt4794 = Static271.anInt5800;
+				Static209.port = Static271.defaultPort;
 			}
-			if (Static22.anInt722 > 3000) {
-				Static22.anInt722 = 3000;
+			if (Static22.js5ConnectDelay > 3000) {
+				Static22.js5ConnectDelay = 3000;
 			}
-			if (Static107.aClass73_3.anInt2964 >= 2 && Static107.aClass73_3.anInt2963 == 6) {
+			if (Static107.js5NetQueue.errors >= 2 && Static107.js5NetQueue.response == 6) {
 				this.method927("js5connect_outofdate");
 				Static244.anInt5370 = 1000;
 				return;
 			}
-			if (Static107.aClass73_3.anInt2964 >= 4 && Static107.aClass73_3.anInt2963 == -1) {
+			if (Static107.js5NetQueue.errors >= 4 && Static107.js5NetQueue.response == -1) {
 				this.method927("js5crc");
 				Static244.anInt5370 = 1000;
 				return;
 			}
-			if (Static107.aClass73_3.anInt2964 >= 4 && (Static244.anInt5370 == 0 || Static244.anInt5370 == 5)) {
-				if (Static107.aClass73_3.anInt2963 == 7 || Static107.aClass73_3.anInt2963 == 9) {
+			if (Static107.js5NetQueue.errors >= 4 && (Static244.anInt5370 == 0 || Static244.anInt5370 == 5)) {
+				if (Static107.js5NetQueue.response == 7 || Static107.js5NetQueue.response == 9) {
 					this.method927("js5connect_full");
-				} else if (Static107.aClass73_3.anInt2963 > 0) {
+				} else if (Static107.js5NetQueue.response > 0) {
 					this.method927("js5connect");
 				} else {
 					this.method927("js5io");
@@ -569,56 +570,56 @@ public final class client extends GameShell {
 				return;
 			}
 		}
-		Static233.anInt5226 = Static107.aClass73_3.anInt2964;
-		if (Static22.anInt722 > 0) {
-			Static22.anInt722--;
+		Static233.js5PrevErrors = Static107.js5NetQueue.errors;
+		if (Static22.js5ConnectDelay > 0) {
+			Static22.js5ConnectDelay--;
 			return;
 		}
 		try {
-			if (Static4.anInt30 == 0) {
-				Static37.aClass212_2 = Static71.aClass213_3.method5120(Static60.aString1, Static209.anInt4794);
-				Static4.anInt30++;
+			if (Static4.js5ConnectState == 0) {
+				Static37.js5SocketRequest = Static71.signLink.openSocket(Static60.hostname, Static209.port);
+				Static4.js5ConnectState++;
 			}
-			if (Static4.anInt30 == 1) {
-				if (Static37.aClass212_2.anInt5925 == 2) {
-					this.method942(1000);
+			if (Static4.js5ConnectState == 1) {
+				if (Static37.js5SocketRequest.status == 2) {
+					this.setJs5Response(1000);
 					return;
 				}
-				if (Static37.aClass212_2.anInt5925 == 1) {
-					Static4.anInt30++;
+				if (Static37.js5SocketRequest.status == 1) {
+					Static4.js5ConnectState++;
 				}
 			}
-			if (Static4.anInt30 == 2) {
-				Static206.aClass95_3 = new BufferedSocket((Socket) Static37.aClass212_2.anObject6, Static71.aClass213_3);
-				@Pc(194) Buffer local194 = new Buffer(5);
-				local194.p1(15);
-				local194.p4(530);
-				Static206.aClass95_3.method2830(local194.data, 5);
-				Static4.anInt30++;
-				Static217.aLong165 = MonotonicClock.method5096();
+			if (Static4.js5ConnectState == 2) {
+				Static206.js5Socket = new BufferedSocket((Socket) Static37.js5SocketRequest.anObject6, Static71.signLink);
+				@Pc(194) Buffer buffer = new Buffer(5);
+				buffer.p1(15);
+				buffer.p4(530);
+				Static206.js5Socket.write(buffer.data, 5);
+				Static4.js5ConnectState++;
+				Static217.js5ConnectTime = MonotonicClock.currentTimeMillis();
 			}
-			if (Static4.anInt30 == 3) {
-				if (Static244.anInt5370 == 0 || Static244.anInt5370 == 5 || Static206.aClass95_3.method2831() > 0) {
-					@Pc(258) int local258 = Static206.aClass95_3.method2828();
-					if (local258 != 0) {
-						this.method942(local258);
+			if (Static4.js5ConnectState == 3) {
+				if (Static244.anInt5370 == 0 || Static244.anInt5370 == 5 || Static206.js5Socket.available() > 0) {
+					@Pc(258) int response = Static206.js5Socket.read();
+					if (response != 0) {
+						this.setJs5Response(response);
 						return;
 					}
-					Static4.anInt30++;
-				} else if (MonotonicClock.method5096() - Static217.aLong165 > 30000L) {
-					this.method942(1001);
+					Static4.js5ConnectState++;
+				} else if (MonotonicClock.currentTimeMillis() - Static217.js5ConnectTime > 30000L) {
+					this.setJs5Response(1001);
 					return;
 				}
 			}
-			if (Static4.anInt30 == 4) {
-				@Pc(296) boolean local296 = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28;
-				Static107.aClass73_3.method2324(!local296, Static206.aClass95_3);
-				Static206.aClass95_3 = null;
-				Static37.aClass212_2 = null;
-				Static4.anInt30 = 0;
+			if (Static4.js5ConnectState == 4) {
+				@Pc(296) boolean loggedOut = Static244.anInt5370 == 5 || Static244.anInt5370 == 10 || Static244.anInt5370 == 28;
+				Static107.js5NetQueue.loggedOut(!loggedOut, Static206.js5Socket);
+				Static206.js5Socket = null;
+				Static37.js5SocketRequest = null;
+				Static4.js5ConnectState = 0;
 			}
-		} catch (@Pc(315) IOException local315) {
-			this.method942(1002);
+		} catch (@Pc(315) IOException ex) {
+			this.setJs5Response(1002);
 		}
 	}
 
@@ -638,7 +639,7 @@ public final class client extends GameShell {
 		if (Static166.anInt4051 == 0) {
 			@Pc(34) Runtime local34 = Runtime.getRuntime();
 			local43 = (int) (0L / 1024L);
-			@Pc(46) long local46 = MonotonicClock.method5096();
+			@Pc(46) long local46 = MonotonicClock.currentTimeMillis();
 			if (Static175.aLong138 == 0L) {
 				Static175.aLong138 = local46;
 			}
@@ -667,7 +668,7 @@ public final class client extends GameShell {
 			Static126.aClass100_602 = LocalizedText.MAINLOAD10B;
 		} else if (Static166.anInt4051 == 30) {
 			if (Static257.aClass9_2 == null) {
-				Static257.aClass9_2 = new Js5MasterIndex(Static107.aClass73_3, Static86.aClass80_3);
+				Static257.aClass9_2 = new Js5MasterIndex(Static107.js5NetQueue, Static86.js5CacheQueue);
 			}
 			if (Static257.aClass9_2.method178()) {
 				Static213.aClass153_88 = Static9.method183(false, true, true, 0);
@@ -727,10 +728,10 @@ public final class client extends GameShell {
 			Static41.method1045(Static99.aBoolean143);
 			Static148.aClass3_Sub3_Sub4_1 = new MidiPcmStream();
 			Static148.aClass3_Sub3_Sub4_1.method4420();
-			Static11.aClass62_1 = Static107.method2262(22050, Static71.aClass213_3, Static154.aCanvas1, 0);
+			Static11.aClass62_1 = Static107.method2262(22050, Static71.signLink, Static154.canvas, 0);
 			Static11.aClass62_1.method3566(Static148.aClass3_Sub3_Sub4_1);
 			Static34.method876(Static148.aClass3_Sub3_Sub4_1, Static138.aClass153_51, Static137.aClass153_49, Static248.aClass153_75);
-			Static147.aClass62_2 = Static107.method2262(2048, Static71.aClass213_3, Static154.aCanvas1, 1);
+			Static147.aClass62_2 = Static107.method2262(2048, Static71.signLink, Static154.canvas, 1);
 			Static204.aClass3_Sub3_Sub2_1 = new MixerPcmStream();
 			Static147.aClass62_2.method3566(Static204.aClass3_Sub3_Sub2_1);
 			Static56.aClass156_1 = new Resampler(22050, Static44.anInt1404);
@@ -860,7 +861,7 @@ public final class client extends GameShell {
 			}
 		} else if (Static166.anInt4051 == 110) {
 			Static178.aClass74_1 = new MouseRecorder();
-			Static71.aClass213_3.method5130(10, Static178.aClass74_1);
+			Static71.signLink.method5130(10, Static178.aClass74_1);
 			Static126.aClass100_602 = LocalizedText.MAINLOAD110B;
 			Static199.anInt4670 = 75;
 			Static166.anInt4051 = 120;
@@ -931,7 +932,7 @@ public final class client extends GameShell {
 				Static141.anInt3474 = 0;
 			}
 			Static164.aBoolean191 = true;
-			Static203.method3663(Static71.aClass213_3);
+			Static203.method3663(Static71.signLink);
 			Static241.method4540(false, Static214.anInt5581, -1, -1);
 			Static199.anInt4670 = 100;
 			Static166.anInt4051 = 160;
@@ -953,7 +954,7 @@ public final class client extends GameShell {
 			Static60.anInt1895 = local24.get(11) * 600 + local24.get(12) * 10 + local24.get(13) / 6;
 			Static39.aRandom1.setSeed((long) Static60.anInt1895);
 		}
-		this.method944();
+		this.js5NetworkLoop();
 		if (Static257.aClass9_2 != null) {
 			Static257.aClass9_2.method179();
 		}
@@ -964,8 +965,8 @@ public final class client extends GameShell {
 		if (Static239.aBoolean269) {
 			Static63.method1490();
 		}
-		if (Static71.aClass111_2 != null) {
-			@Pc(75) int local75 = Static71.aClass111_2.method3287();
+		if (Static71.mouseWheel != null) {
+			@Pc(75) int local75 = Static71.mouseWheel.method3287();
 			Static58.anInt1766 = local75;
 		}
 		if (Static244.anInt5370 == 0) {
diff --git a/signlink/src/main/java/MonotonicClock.java b/signlink/src/main/java/MonotonicClock.java
index 3f78bcb..b0e4beb 100644
--- a/signlink/src/main/java/MonotonicClock.java
+++ b/signlink/src/main/java/MonotonicClock.java
@@ -12,7 +12,7 @@ public final class MonotonicClock {
 	private static long aLong1313;
 
 	@OriginalMember(owner = "signlink!ad", name = "a", descriptor = "(B)J")
-	public static synchronized long method5096() {
+	public static synchronized long currentTimeMillis() {
 		@Pc(1) long local1 = System.currentTimeMillis();
 		if (aLong1313 > local1) {
 			aLong1312 += aLong1313 - local1;
diff --git a/signlink/src/main/java/PrivilegedRequest.java b/signlink/src/main/java/PrivilegedRequest.java
index 0a06e7c..e1e556e 100644
--- a/signlink/src/main/java/PrivilegedRequest.java
+++ b/signlink/src/main/java/PrivilegedRequest.java
@@ -23,5 +23,5 @@ public final class PrivilegedRequest {
 	public int anInt5927;
 
 	@OriginalMember(owner = "signlink!im", name = "d", descriptor = "I")
-	public volatile int anInt5925 = 0;
+	public volatile int status = 0;
 }
diff --git a/signlink/src/main/java/SignLink.java b/signlink/src/main/java/SignLink.java
index 5ec8224..0de196f 100644
--- a/signlink/src/main/java/SignLink.java
+++ b/signlink/src/main/java/SignLink.java
@@ -63,7 +63,7 @@ public final class SignLink implements Runnable {
 	private AudioSource anInterface10_2;
 
 	@OriginalMember(owner = "signlink!ll", name = "g", descriptor = "Lsignlink!qm;")
-	public FileOnDisk aClass214_2 = null;
+	public FileOnDisk cacheData = null;
 
 	@OriginalMember(owner = "signlink!ll", name = "p", descriptor = "Lsignlink!im;")
 	private PrivilegedRequest aClass212_7 = null;
@@ -72,10 +72,10 @@ public final class SignLink implements Runnable {
 	private boolean aBoolean360 = false;
 
 	@OriginalMember(owner = "signlink!ll", name = "h", descriptor = "Lsignlink!qm;")
-	public FileOnDisk aClass214_3 = null;
+	public FileOnDisk cacheMasterIndex = null;
 
 	@OriginalMember(owner = "signlink!ll", name = "d", descriptor = "Lsignlink!qm;")
-	public FileOnDisk aClass214_4 = null;
+	public FileOnDisk uid = null;
 
 	@OriginalMember(owner = "signlink!ll", name = "y", descriptor = "Lsignlink!im;")
 	private PrivilegedRequest aClass212_8 = null;
@@ -93,7 +93,7 @@ public final class SignLink implements Runnable {
 	public EventQueue anEventQueue1;
 
 	@OriginalMember(owner = "signlink!ll", name = "c", descriptor = "[Lsignlink!qm;")
-	public FileOnDisk[] aClass214Array1;
+	public FileOnDisk[] cacheIndexes;
 
 	@OriginalMember(owner = "signlink!ll", name = "t", descriptor = "Lsignlink!e;")
 	private FullScreenManager aClass210_1;
@@ -223,12 +223,12 @@ public final class SignLink implements Runnable {
 			}
 		} catch (@Pc(153) Exception local153) {
 		}
-		this.aClass214_4 = new FileOnDisk(method5127(null, this.anInt5929, "random.dat"), "rw", 25L);
-		this.aClass214_2 = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.dat2"), "rw", 104857600L);
-		this.aClass214_3 = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.idx255"), "rw", 1048576L);
-		this.aClass214Array1 = new FileOnDisk[arg3];
+		this.uid = new FileOnDisk(method5127(null, this.anInt5929, "random.dat"), "rw", 25L);
+		this.cacheData = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.dat2"), "rw", 104857600L);
+		this.cacheMasterIndex = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.idx255"), "rw", 1048576L);
+		this.cacheIndexes = new FileOnDisk[arg3];
 		for (@Pc(200) int local200 = 0; local200 < arg3; local200++) {
-			this.aClass214Array1[local200] = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.idx" + local200), "rw", 1048576L);
+			this.cacheIndexes[local200] = new FileOnDisk(method5127(this.aString19, this.anInt5929, "main_file_cache.idx" + local200), "rw", 1048576L);
 		}
 		try {
 			this.aClass210_1 = new FullScreenManager();
@@ -258,7 +258,7 @@ public final class SignLink implements Runnable {
 
 	@OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(I)V")
 	public final void method5110() {
-		aLong1314 = MonotonicClock.method5096() + 5000L;
+		aLong1314 = MonotonicClock.currentTimeMillis() + 5000L;
 	}
 
 	@OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(Z)Z")
@@ -306,7 +306,7 @@ public final class SignLink implements Runnable {
 	}
 
 	@OriginalMember(owner = "signlink!ll", name = "a", descriptor = "(BLjava/lang/String;I)Lsignlink!im;")
-	public final PrivilegedRequest method5120(@OriginalArg(1) String arg0, @OriginalArg(2) int arg1) {
+	public final PrivilegedRequest openSocket(@OriginalArg(1) String arg0, @OriginalArg(2) int arg1) {
 		return this.method5114(1, 0, arg0, arg1);
 	}
 
@@ -347,7 +347,7 @@ public final class SignLink implements Runnable {
 			try {
 				@Pc(45) int local45 = local16.anInt5924;
 				if (local45 == 1) {
-					if (aLong1314 > MonotonicClock.method5096()) {
+					if (aLong1314 > MonotonicClock.currentTimeMillis()) {
 						throw new IOException();
 					}
 					local16.anObject6 = new Socket(InetAddress.getByName((String) local16.anObject7), local16.anInt5926);
@@ -358,7 +358,7 @@ public final class SignLink implements Runnable {
 					local813.setPriority(local16.anInt5926);
 					local16.anObject6 = local813;
 				} else if (local45 == 4) {
-					if (aLong1314 > MonotonicClock.method5096()) {
+					if (aLong1314 > MonotonicClock.currentTimeMillis()) {
 						throw new IOException();
 					}
 					local16.anObject6 = new DataInputStream(((URL) local16.anObject7).openStream());
@@ -379,7 +379,7 @@ public final class SignLink implements Runnable {
 					} else {
 						@Pc(147) String local147;
 						if (local45 == 3) {
-							if (MonotonicClock.method5096() < aLong1314) {
+							if (MonotonicClock.currentTimeMillis() < aLong1314) {
 								throw new IOException();
 							}
 							local147 = (local16.anInt5926 >> 24 & 0xFF) + "." + (local16.anInt5926 >> 16 & 0xFF) + "." + (local16.anInt5926 >> 8 & 0xFF) + "." + (local16.anInt5926 & 0xFF);
@@ -481,11 +481,11 @@ public final class SignLink implements Runnable {
 						}
 					}
 				}
-				local16.anInt5925 = 1;
+				local16.status = 1;
 			} catch (@Pc(830) ThreadDeath local830) {
 				throw local830;
 			} catch (@Pc(833) Throwable local833) {
-				local16.anInt5925 = 2;
+				local16.status = 2;
 			}
 		}
 	}
@@ -505,31 +505,31 @@ public final class SignLink implements Runnable {
 			this.aThread3.join();
 		} catch (@Pc(21) InterruptedException local21) {
 		}
-		if (this.aClass214_2 != null) {
+		if (this.cacheData != null) {
 			try {
-				this.aClass214_2.method5136();
+				this.cacheData.method5136();
 			} catch (@Pc(39) IOException local39) {
 			}
 		}
-		if (this.aClass214_3 != null) {
+		if (this.cacheMasterIndex != null) {
 			try {
-				this.aClass214_3.method5136();
+				this.cacheMasterIndex.method5136();
 			} catch (@Pc(49) IOException local49) {
 			}
 		}
-		if (this.aClass214Array1 != null) {
-			for (@Pc(55) int local55 = 0; local55 < this.aClass214Array1.length; local55++) {
-				if (this.aClass214Array1[local55] != null) {
+		if (this.cacheIndexes != null) {
+			for (@Pc(55) int local55 = 0; local55 < this.cacheIndexes.length; local55++) {
+				if (this.cacheIndexes[local55] != null) {
 					try {
-						this.aClass214Array1[local55].method5136();
+						this.cacheIndexes[local55].method5136();
 					} catch (@Pc(79) IOException local79) {
 					}
 				}
 			}
 		}
-		if (this.aClass214_4 != null) {
+		if (this.uid != null) {
 			try {
-				this.aClass214_4.method5136();
+				this.uid.method5136();
 			} catch (@Pc(93) IOException local93) {
 			}
 		}