diff --git a/cache/src/main/java/net/runelite/cache/script/Instructions.java b/cache/src/main/java/net/runelite/cache/script/Instructions.java
index 17dfabfcd1..a0c7b859a1 100644
--- a/cache/src/main/java/net/runelite/cache/script/Instructions.java
+++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java
@@ -78,6 +78,7 @@ public class Instructions
 		add(CC_SETSIZE, "cc_setsize");
 		add(CC_SETHIDE, "cc_sethide");
 		add(CC_SETNOCLICKTHROUGH, "cc_setnoclickthrough");
+		add(CC_SETNOSCROLLTHROUGH, "cc_setnoscrollthrough");
 		add(CC_SETSCROLLPOS, "cc_setscrollpos");
 		add(CC_SETCOLOUR, "cc_setcolour");
 		add(CC_SETFILL, "cc_setfill");
@@ -287,11 +288,14 @@ public class Instructions
 		add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages");
 		add(SETTAPTODROP, "settaptodrop");
 		add(GETTAPTODROP, "gettaptodrop");
+		add(SETOCULUSORBSPEED, "setoculusorbspeed");
 		add(GETCANVASSIZE, "getcanvassize");
 		add(SETHIDEUSERNAME, "sethideusername");
 		add(GETHIDEUSERNAME, "gethideusername");
 		add(SETREMEMBERUSERNAME, "setrememberusername");
 		add(GETREMEMBERUSERNAME, "getrememberusername");
+		add(SETTITLEMUSICENABLED, "settitlemusicenabled");
+		add(GETTITLEMUSICENABLED, "gettitlemusicenabled");
 		add(SOUND_SYNTH, "sound_synth");
 		add(SOUND_SONG, "sound_song");
 		add(SOUND_JINGLE, "sound_jingle");
@@ -411,6 +415,7 @@ public class Instructions
 		add(REMOVETAGS, "removetags");
 		add(STRING_INDEXOF_CHAR, "string_indexof_char");
 		add(STRING_INDEXOF_STRING, "string_indexof_string");
+		add(UPPERCASE, "uppercase");
 		add(OC_NAME, "oc_name");
 		add(OC_OP, "oc_op");
 		add(OC_IOP, "oc_iop");
@@ -461,6 +466,7 @@ public class Instructions
 		add(WORLDLIST_NEXT, "worldlist_next");
 		add(WORLDLIST_SPECIFIC, "worldlist_specific");
 		add(WORLDLIST_SORT, "worldlist_sort");
+		add(GETWORLDINFO, "getworldinfo");
 		add(SETFOLLOWEROPSLOWPRIORITY, "setfolloweropslowpriority");
 		add(NC_PARAM, "nc_param");
 		add(LC_PARAM, "lc_param");
diff --git a/cache/src/main/java/net/runelite/cache/script/Opcodes.java b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
index e69a1ef5ef..5a4fe89061 100644
--- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java
+++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
@@ -69,6 +69,7 @@ public class Opcodes
 	public static final int CC_SETSIZE = 1001;
 	public static final int CC_SETHIDE = 1003;
 	public static final int CC_SETNOCLICKTHROUGH = 1005;
+	public static final int CC_SETNOSCROLLTHROUGH = 1006;
 	public static final int CC_SETSCROLLPOS = 1100;
 	public static final int CC_SETCOLOUR = 1101;
 	public static final int CC_SETFILL = 1102;
@@ -278,11 +279,14 @@ public class Opcodes
 	public static final int SETSHOWLOADINGMESSAGES = 3126;
 	public static final int SETTAPTODROP = 3127;
 	public static final int GETTAPTODROP = 3128;
+	public static final int SETOCULUSORBSPEED = 3129;
 	public static final int GETCANVASSIZE = 3132;
 	public static final int SETHIDEUSERNAME = 3141;
 	public static final int GETHIDEUSERNAME = 3142;
 	public static final int SETREMEMBERUSERNAME = 3143;
 	public static final int GETREMEMBERUSERNAME = 3144;
+	public static final int SETTITLEMUSICENABLED = 3146;
+	public static final int GETTITLEMUSICENABLED = 3147;
 	public static final int SOUND_SYNTH = 3200;
 	public static final int SOUND_SONG = 3201;
 	public static final int SOUND_JINGLE = 3202;
@@ -402,6 +406,7 @@ public class Opcodes
 	public static final int REMOVETAGS = 4119;
 	public static final int STRING_INDEXOF_CHAR = 4120;
 	public static final int STRING_INDEXOF_STRING = 4121;
+	public static final int UPPERCASE = 4122;
 	public static final int OC_NAME = 4200;
 	public static final int OC_OP = 4201;
 	public static final int OC_IOP = 4202;
@@ -452,6 +457,7 @@ public class Opcodes
 	public static final int WORLDLIST_NEXT = 6502;
 	public static final int WORLDLIST_SPECIFIC = 6506;
 	public static final int WORLDLIST_SORT = 6507;
+	public static final int GETWORLDINFO = 6511;
 	public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
 	public static final int NC_PARAM = 6513;
 	public static final int LC_PARAM = 6514;
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java
index 5033c63e43..1a8e4abbfd 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java
@@ -48,6 +48,7 @@ public enum ScriptOpcode
 	CC_SETSIZE(1001),
 	CC_SETHIDE(1003),
 	CC_SETNOCLICKTHROUGH(1005),
+	CC_SETNOSCROLLTHROUGH(1006),
 	CC_SETSCROLLPOS(1100),
 	CC_SETCOLOUR(1101),
 	CC_SETFILL(1102),
@@ -257,11 +258,14 @@ public enum ScriptOpcode
 	SETSHOWLOADINGMESSAGES(3126),
 	SETTAPTODROP(3127),
 	GETTAPTODROP(3128),
+	SETOCULUSORBSPEED(3129),
 	GETCANVASSIZE(3132),
 	SETHIDEUSERNAME(3141),
 	GETHIDEUSERNAME(3142),
 	SETREMEMBERUSERNAME(3143),
 	GETREMEMBERUSERNAME(3144),
+	SETTITLEMUSICENABLED(3146),
+	GETTITLEMUSICENABLED(3147),
 	SOUND_SYNTH(3200),
 	SOUND_SONG(3201),
 	SOUND_JINGLE(3202),
@@ -381,6 +385,7 @@ public enum ScriptOpcode
 	REMOVETAGS(4119),
 	STRING_INDEXOF_CHAR(4120),
 	STRING_INDEXOF_STRING(4121),
+	UPPERCASE(4122),
 	OC_NAME(4200),
 	OC_OP(4201),
 	OC_IOP(4202),
@@ -431,6 +436,7 @@ public enum ScriptOpcode
 	WORLDLIST_NEXT(6502),
 	WORLDLIST_SPECIFIC(6506),
 	WORLDLIST_SORT(6507),
+	GETWORLDINFO(6511),
 	SETFOLLOWEROPSLOWPRIORITY(6512),
 	NC_PARAM(6513),
 	LC_PARAM(6514),
diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
index fe137ec096..dddc93c4d6 100644
--- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
+++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
@@ -1,5 +1,6 @@
 package net.runelite.deob.updater;
 
+import com.google.common.base.Strings;
 import java.io.File;
 import net.runelite.asm.ClassFile;
 import net.runelite.asm.ClassGroup;
@@ -39,6 +40,12 @@ public class AnnotationCleaner
 
 			log.debug("Checking {}", c.toString());
 
+			String implementingName = DeobAnnotations.getImplements(c);
+			if (!Strings.isNullOrEmpty(implementingName))
+			{
+				assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName());
+			}
+
 			for (Field f : c.getFields())
 			{
 				Annotations an = f.getAnnotations();
@@ -48,11 +55,11 @@ public class AnnotationCleaner
 
 				if (exportedName == null)
 				{
-					assertTrue("Field " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.contains("$"));
+					assertTrue("Field " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null);
 					continue;
 				}
 
-				assertEquals("Field " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
+				assertEquals("Field " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
 			}
 
 			for (Method m : c.getMethods())
@@ -64,11 +71,11 @@ public class AnnotationCleaner
 
 				if (exportedName == null)
 				{
-					assertTrue("Method " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.endsWith("init>") || fieldName.equals("values") || fieldName.equals("valueOf") || fieldName.startsWith("compareTo") || fieldName.equals("equals") || fieldName.equals("hashCode") || fieldName.equals("compare"));
+					assertTrue("Method " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null);
 					continue;
 				}
 
-				assertEquals("Method " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
+				assertEquals("Method " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
 			}
 		}
 	}
diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
index be654e127d..3c304807be 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
@@ -33,6 +33,7 @@ import net.runelite.asm.ClassGroup;
 import net.runelite.asm.Method;
 import net.runelite.asm.Type;
 import net.runelite.asm.attributes.Annotations;
+import net.runelite.asm.attributes.Code;
 import net.runelite.asm.attributes.annotation.Annotation;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
@@ -89,9 +90,9 @@ public class InjectHookMethod
 			obfuscatedClassName = DeobAnnotations.getObfuscatedName(cf.getAnnotations());
 
 		// might be a constructor
-		if (obfuscatedMethodName == null && method.getName().equals("<init>"))
+		if (obfuscatedMethodName == null)
 		{
-			obfuscatedMethodName = "<init>";
+			obfuscatedMethodName = method.getName();
 		}
 
 		assert obfuscatedClassName != null : "hook on method in class with no obfuscated name";
@@ -110,7 +111,12 @@ public class InjectHookMethod
 
 	private void injectHookMethod(Method hookMethod, String hookName, boolean end, Method deobMethod, Method vanillaMethod, boolean useHooks) throws InjectionException
 	{
-		Instructions instructions = vanillaMethod.getCode().getInstructions();
+		Code code = vanillaMethod.getCode();
+		if (code == null)
+		{
+			logger.warn(vanillaMethod + " code is null");
+		}
+		Instructions instructions = code.getInstructions();
 
 		Signature.Builder builder = new Signature.Builder()
 			.setReturnType(Type.VOID); // Hooks always return void
diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
index 1f0275110c..27b60ce344 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
@@ -181,4 +181,17 @@ public class InjectUtil
 
 		throw new InjectionException(String.format("Mapped field \"%s\" could not be found.", name));
 	}
+
+	public static Method findStaticDeob(Inject inject, String name) throws InjectionException
+	{
+		for (ClassFile cf : inject.getDeobfuscated().getClasses())
+		{
+			if (cf.findMethod(name) != null)
+			{
+				return cf.findMethod(name);
+			}
+		}
+
+		throw new InjectionException("Fycj you");
+	}
 }
diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
index a3d71a4e4e..6bebd6ccb1 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
@@ -21,7 +21,7 @@ public class RenderDraw
 	private static final Logger log = LoggerFactory.getLogger(RenderDraw.class);
 	private static final net.runelite.asm.pool.Method renderDraw = new net.runelite.asm.pool.Method(
 		new Class("net.runelite.client.callback.Hooks"),
-		"draw",
+		"renderDraw",
 		new Signature("(Lnet/runelite/api/Renderable;IIIIIIIIJ)V")
 	);
 	private final Inject inject;
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
index e13893c244..77b62b5aca 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
 
 public interface RSBuddy extends ChatPlayer, RSUser
 {
-	@Import("world0")
+	@Import("getWorld")
 	@Override
 	int getWorld();
 
diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index bef6ef48d4..509818dd92 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -92,7 +92,7 @@ public abstract class AbstractByteArrayCopier {
    )
    static void method4024() {
       PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher);
-      var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822());
+      var0.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode());
       var0.packetBuffer.writeShort(SoundCache.canvasWidth);
       var0.packetBuffer.writeShort(Huffman.canvasHeight);
       Client.packetWriter.method241(var0);
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index 9f2d053651..6071aae588 100644
--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -1,4 +1,5 @@
 import java.util.Comparator;
+import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -7,18 +8,20 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
    @ObfuscatedName("f")
-   Comparator field3;
+   @Export("nextComparator")
+   Comparator nextComparator;
 
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "(Ljava/util/Comparator;B)V",
       garbageValue = "-2"
    )
-   final void method11(Comparator var1) {
-      if (this.field3 == null) {
-         this.field3 = var1;
-      } else if (this.field3 instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.field3).method11(var1);
+   @Export("addComparator")
+   final void addComparator(Comparator var1) {
+      if (this.nextComparator == null) {
+         this.nextComparator = var1;
+      } else if (this.nextComparator instanceof AbstractUserComparator) {
+         ((AbstractUserComparator)this.nextComparator).addComparator(var1);
       }
 
    }
@@ -28,12 +31,12 @@ public abstract class AbstractUserComparator implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-962181316"
    )
-   protected final int method12(User var1, User var2) {
-      return this.field3 == null ? 0 : this.field3.compare(var1, var2);
+   @Export("compareUser")
+   protected final int compareUser(User var1, User var2) {
+      return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method13(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index 04e7f744bb..6eb7f5cc76 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -54,16 +54,16 @@ public abstract class AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   @Export("element")
-   public abstract int element();
+   @Export("getElement")
+   public abstract int getElement();
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   @Export("label")
-   abstract WorldMapLabel label();
+   @Export("getLabel")
+   abstract WorldMapLabel getLabel();
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -94,7 +94,7 @@ public abstract class AbstractWorldMapIcon {
       garbageValue = "1150380891"
    )
    boolean method19() {
-      return this.element() >= 0;
+      return this.getElement() >= 0;
    }
 
    @ObfuscatedName("b")
@@ -106,7 +106,7 @@ public abstract class AbstractWorldMapIcon {
       if (!this.method19()) {
          return false;
       } else {
-         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.element());
+         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement());
          int var4 = this.vmethod397();
          int var5 = this.vmethod398();
          switch(var3.field3287.field3528) {
@@ -155,7 +155,7 @@ public abstract class AbstractWorldMapIcon {
       garbageValue = "1201712205"
    )
    boolean method21(int var1, int var2) {
-      WorldMapLabel var3 = this.label();
+      WorldMapLabel var3 = this.getLabel();
       return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false);
    }
 
diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java
index 1bd1f3e6f5..11542e7c7b 100644
--- a/runescape-client/src/main/java/Archive.java
+++ b/runescape-client/src/main/java/Archive.java
@@ -389,7 +389,7 @@ public class Archive extends AbstractArchive {
       garbageValue = "-34"
    )
    static final void method4703(int var0) {
-      class12.method159();
+      GrandExchangeOfferAgeComparator.method159();
 
       for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
          if (var1.obj != null) {
diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
index 3e12c3d7da..d9899dacb7 100644
--- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -28,8 +28,6 @@ public class ArchiveDiskActionHandler implements Runnable {
    @Export("ArchiveDiskActionHandler_lock")
    static Object ArchiveDiskActionHandler_lock;
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
          while (true) {
@@ -89,10 +87,11 @@ public class ArchiveDiskActionHandler implements Runnable {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "67"
    )
-   static final void method4655(String var0) {
+   @Export("clanKickUser")
+   static final void clanKickUser(String var0) {
       if (PacketWriter.clanChat != null) {
          PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher);
-         var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
+         var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0));
          var1.packetBuffer.writeStringCp1252NullTerminated(var0);
          Client.packetWriter.method241(var1);
       }
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 2f393def77..207673d24a 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -81,7 +81,7 @@ public enum AttackOption implements Enumerated {
       signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;II)I",
       garbageValue = "-189314181"
    )
-   public static int method2033(CharSequence var0, CharSequence var1, int var2) {
+   public static int method2033(CharSequence var0, CharSequence var1, int language) {
       int var3 = var0.length();
       int var4 = var1.length();
       int var5 = 0;
@@ -146,13 +146,13 @@ public enum AttackOption implements Enumerated {
          }
 
          var8 = var12;
-         var9 = class12.method155(var9, var2);
-         var14 = class12.method155(var14, var2);
+         var9 = GrandExchangeOfferAgeComparator.method155(var9, language);
+         var14 = GrandExchangeOfferAgeComparator.method155(var14, language);
          if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) {
             var9 = Character.toLowerCase(var9);
             var14 = Character.toLowerCase(var14);
             if (var14 != var9) {
-               return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var14, var2);
+               return CollisionMap.method3631(var9, language) - CollisionMap.method3631(var14, language);
             }
          }
       }
@@ -168,7 +168,7 @@ public enum AttackOption implements Enumerated {
             var19 = Character.toLowerCase(var19);
             var18 = Character.toLowerCase(var18);
             if (var19 != var18) {
-               return CollisionMap.method3631(var19, var2) - CollisionMap.method3631(var18, var2);
+               return CollisionMap.method3631(var19, language) - CollisionMap.method3631(var18, language);
             }
          }
       }
@@ -181,7 +181,7 @@ public enum AttackOption implements Enumerated {
             var18 = var0.charAt(var20);
             char var13 = var1.charAt(var20);
             if (var18 != var13) {
-               return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var13, var2);
+               return CollisionMap.method3631(var18, language) - CollisionMap.method3631(var13, language);
             }
          }
 
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 28eb923bce..46652aebef 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -130,8 +130,7 @@ public class Bounds {
       return this.field42 + this.field44;
    }
 
-   @ObfuscatedName("toString")
-   public String method35() {
+   public String toString() {
       return null;
    }
 
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index a676800453..a45ba272a1 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -11,8 +11,8 @@ public class Buddy extends User {
    @ObfuscatedGetter(
       intValue = 429472919
    )
-   @Export("world0")
-   public int world0;
+   @Export("world")
+   public int world;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 120689297
@@ -27,7 +27,7 @@ public class Buddy extends User {
    public int rank;
 
    Buddy() {
-      this.world0 = -1;
+      this.world = -1;
    }
 
    @ObfuscatedName("an")
@@ -37,7 +37,7 @@ public class Buddy extends User {
    )
    @Export("set")
    void set(int var1, int var2) {
-      this.world0 = var1;
+      this.world = var1;
       this.int2 = var2;
    }
 
@@ -46,9 +46,9 @@ public class Buddy extends User {
       signature = "(B)I",
       garbageValue = "0"
    )
-   @Export("world")
-   public int world() {
-      return this.world0;
+   @Export("getWorld")
+   public int getWorld() {
+      return this.world;
    }
 
    @ObfuscatedName("au")
@@ -58,7 +58,7 @@ public class Buddy extends User {
    )
    @Export("hasWorld")
    public boolean hasWorld() {
-      return this.world0 > 0;
+      return this.world > 0;
    }
 
    @ObfuscatedName("ff")
diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/BuddyRankComparator.java
similarity index 58%
rename from runescape-client/src/main/java/class157.java
rename to runescape-client/src/main/java/BuddyRankComparator.java
index a7d3eb0d9f..23c76bfbd4 100644
--- a/runescape-client/src/main/java/class157.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -1,19 +1,23 @@
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("fw")
-public class class157 extends AbstractUserComparator {
+@Implements("BuddyRankComparator")
+public class BuddyRankComparator extends AbstractUserComparator {
    @ObfuscatedName("nm")
    @ObfuscatedGetter(
       intValue = 1006519291
    )
    static int field1114;
    @ObfuscatedName("m")
-   final boolean field1969;
+   @Export("reversed")
+   final boolean reversed;
 
-   public class157(boolean var1) {
-      this.field1969 = var1;
+   public BuddyRankComparator(boolean var1) {
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -21,12 +25,13 @@ public class class157 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "884616259"
    )
-   int method3381(Buddy var1, Buddy var2) {
-      return var2.rank != var1.rank ? (this.field1969 ? var1.rank - var2.rank : var2.rank - var1.rank) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var2.rank != var1.rank ? (this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank) : this.compareUser(var1, var2);
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method3381((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("s")
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 9ace18e0fd..107fecae1d 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -40,8 +40,8 @@ public class BufferedSink implements Runnable {
    @Export("exception")
    IOException exception;
    @ObfuscatedName("l")
-   @Export("isClosed0")
-   boolean isClosed0;
+   @Export("closed")
+   boolean closed;
 
    BufferedSink(OutputStream var1, int var2) {
       this.position = 0;
@@ -61,7 +61,7 @@ public class BufferedSink implements Runnable {
    )
    @Export("isClosed")
    boolean isClosed() {
-      if (this.isClosed0) {
+      if (this.closed) {
          try {
             this.outputStream.close();
             if (this.exception == null) {
@@ -127,7 +127,7 @@ public class BufferedSink implements Runnable {
    @Export("close")
    void close() {
       synchronized(this) {
-         this.isClosed0 = true;
+         this.closed = true;
          this.notifyAll();
       }
 
@@ -138,8 +138,6 @@ public class BufferedSink implements Runnable {
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       while (true) {
          synchronized(this) {
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index 5528e12d5f..c4371c89af 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -201,8 +201,6 @@ public class BufferedSource implements Runnable {
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       while (true) {
          int var1;
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index 079c70b9f2..fa8f279fc6 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -154,7 +154,7 @@ public final class Canvas extends java.awt.Canvas {
                if (var2) {
                   WorldMapIcon1.field1030 = var10;
                } else {
-                  class12.field1111 = var10;
+                  GrandExchangeOfferAgeComparator.field1111 = var10;
                }
 
                class22.method295(var5);
@@ -164,7 +164,7 @@ public final class Canvas extends java.awt.Canvas {
       } else {
          Widget var6;
          if (var0 == ScriptOpcodes.CC_DELETE) {
-            var6 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+            var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
             var5 = Huffman.getWidget(var6.id);
             var5.children[var6.childIndex] = null;
             class22.method295(var5);
@@ -182,7 +182,7 @@ public final class Canvas extends java.awt.Canvas {
                   if (var2) {
                      WorldMapIcon1.field1030 = var6;
                   } else {
-                     class12.field1111 = var6;
+                     GrandExchangeOfferAgeComparator.field1111 = var6;
                   }
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -202,7 +202,7 @@ public final class Canvas extends java.awt.Canvas {
                if (var2) {
                   WorldMapIcon1.field1030 = var5;
                } else {
-                  class12.field1111 = var5;
+                  GrandExchangeOfferAgeComparator.field1111 = var5;
                }
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -218,9 +218,9 @@ public final class Canvas extends java.awt.Canvas {
       signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V",
       garbageValue = "-9124"
    )
-   public static void method858(int var0, AbstractArchive var1, String var2, String var3, int var4, boolean var5) {
-      int var6 = var1.getGroupId(var2);
-      int var7 = var1.getFileId(var6, var3);
+   public static void method858(int var0, AbstractArchive var1, String groupName, String fileName, int var4, boolean var5) {
+      int var6 = var1.getGroupId(groupName);
+      int var7 = var1.getFileId(var6, fileName);
       class214.field1129 = 1;
       class214.field1130 = var1;
       class30.musicTrackGroupId = var6;
@@ -243,7 +243,7 @@ public final class Canvas extends java.awt.Canvas {
 
          if (var0.hitpoints == 0) {
             if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
-               ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905);
+               ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905);
                var0.remove();
             }
          } else {
@@ -252,7 +252,7 @@ public final class Canvas extends java.awt.Canvas {
             }
 
             if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) {
-               ParamDefinition.method4933(var0.level, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908);
+               ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908);
                var0.delay = -1;
                if (var0.field903 == var0.id && var0.field903 == -1) {
                   var0.remove();
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index c56d7b18e7..a82d79c56d 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -80,7 +80,8 @@ public class ChatChannel {
       signature = "(CI)Z",
       garbageValue = "-1857344803"
    )
-   public static boolean method2238(char var0) {
+   @Export("isCharPrintable")
+   public static boolean isCharPrintable(char var0) {
       return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376);
    }
 
@@ -317,7 +318,7 @@ public class ChatChannel {
 
       if (var0.isIf3) {
          if (Client.isSpellSelected) {
-            if (WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
+            if (GrandExchangeOfferWorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
                Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id);
             }
          } else {
diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java
index 7f18f32635..8128276a66 100644
--- a/runescape-client/src/main/java/ClanChat.java
+++ b/runescape-client/src/main/java/ClanChat.java
@@ -165,7 +165,7 @@ public class ClanChat extends UserList {
          }
 
          var6 = (ClanMate)this.getByCurrentUsername(var2);
-         if (var6 != null && var6.world() == var3) {
+         if (var6 != null && var6.getWorld() == var3) {
             this.remove(var6);
          }
       } else {
@@ -218,7 +218,7 @@ public class ClanChat extends UserList {
       garbageValue = "-128608554"
    )
    final void method79(ClanMate var1) {
-      if (var1.username().equals(this.localUser.username())) {
+      if (var1.getUsername().equals(this.localUser.username())) {
          this.rank = var1.rank;
       }
 
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index baf085d3fa..0888815189 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -55,7 +55,7 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsFriend")
    void fillIsFriend() {
-      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false;
+      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("w")
@@ -89,6 +89,6 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsIgnored")
    void fillIsIgnored() {
-      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0) ? TriBool.TriBool_true : TriBool.TriBool_false;
+      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index be5ea4273e..77c7b0767f 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -524,7 +524,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lbj;"
    )
-   static OwnWorldComparator field159;
+   @Export("geOwnWorldComparator")
+   static GrandExchangeOfferOwnWorldComparator geOwnWorldComparator;
    @ObfuscatedName("pv")
    static int[] field160;
    @ObfuscatedName("w")
@@ -572,7 +573,8 @@ public final class Client extends GameShell implements Usernamed {
    @Export("clientType")
    static int clientType;
    @ObfuscatedName("bl")
-   static boolean field162;
+   @Export("onMobile")
+   static boolean onMobile;
    @ObfuscatedName("br")
    @ObfuscatedGetter(
       intValue = 244995961
@@ -926,7 +928,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 351193663
    )
-   static int field197;
+   @Export("oculusOrbSlowedSpeed")
+   static int oculusOrbSlowedSpeed;
    @ObfuscatedName("il")
    @ObfuscatedGetter(
       intValue = -1063713523
@@ -1291,7 +1294,7 @@ public final class Client extends GameShell implements Usernamed {
          displayFps = true;
       }
 
-      GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode);
+      GroundItem.setWindowedMode(ReflectionCheck.clientPreferences.windowMode);
       WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType);
    }
 
@@ -1361,11 +1364,11 @@ public final class Client extends GameShell implements Usernamed {
 
       if (gameState == 0) {
          class171.method3497();
-         class11.method145();
+         GrandExchangeOfferNameComparator.method145();
       } else if (gameState == 5) {
          class54.method1092(this);
          class171.method3497();
-         class11.method145();
+         GrandExchangeOfferNameComparator.method145();
       } else if (gameState != 10 && gameState != 11) {
          if (gameState == 20) {
             class54.method1092(this);
@@ -2194,7 +2197,7 @@ public final class Client extends GameShell implements Usernamed {
                   BufferedSink.method3603();
                   var65 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher);
                   packetWriter.method241(var65);
-                  class11.method145();
+                  GrandExchangeOfferNameComparator.method145();
                }
             }
          }
@@ -2262,7 +2265,7 @@ public final class Client extends GameShell implements Usernamed {
       }
 
       if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) {
-         GroundItem.method2095(SpotAnimationDefinition.method4822());
+         GroundItem.setWindowedMode(SpotAnimationDefinition.getWindowedMode());
       }
 
       int var3;
@@ -2825,10 +2828,10 @@ public final class Client extends GameShell implements Usernamed {
                            var13 = NetCache.NetCache_responseHeaderBuffer.readInt();
                            long var18 = (long)(var12 + (var11 << 16));
                            NetFileRequest var20 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var18);
-                           WorldComparator.field988 = true;
+                           GrandExchangeOfferWorldComparator.field988 = true;
                            if (var20 == null) {
                               var20 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var18);
-                              WorldComparator.field988 = false;
+                              GrandExchangeOfferWorldComparator.field988 = false;
                            }
 
                            if (var20 == null) {
@@ -2905,11 +2908,11 @@ public final class Client extends GameShell implements Usernamed {
 
                               NetCache.NetCache_crcMismatches = 0;
                               NetCache.NetCache_ioExceptions = 0;
-                              ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.field988);
+                              ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988);
                            }
 
                            ModelData0.NetCache_currentResponse.remove();
-                           if (WorldComparator.field988) {
+                           if (GrandExchangeOfferWorldComparator.field988) {
                               --NetCache.NetCache_pendingPriorityResponsesCount;
                            } else {
                               --NetCache.NetCache_pendingResponsesCount;
@@ -3482,7 +3485,7 @@ public final class Client extends GameShell implements Usernamed {
                   ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
                   timer.method332();
                   WorldMapSection1.method808();
-                  class11.updatePlayer(var2);
+                  GrandExchangeOfferNameComparator.updatePlayer(var2);
                   GameObject.field359 = -1;
                   class50.loadRegions(false, var2);
                   packetWriter.serverPacket0 = null;
@@ -3575,7 +3578,7 @@ public final class Client extends GameShell implements Usernamed {
                      }
 
                      AbstractByteArrayCopier.method4024();
-                     class11.updatePlayer(var2);
+                     GrandExchangeOfferNameComparator.updatePlayer(var2);
                      if (var5 != var2.index) {
                         throw new RuntimeException();
                      }
@@ -4022,8 +4025,8 @@ public final class Client extends GameShell implements Usernamed {
                                                    } else if (menuOptionsCount > 0) {
                                                       var4 = field205;
                                                       var9 = field206;
-                                                      WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var4, var9);
-                                                      UnitPriceComparator.tempMenuAction = null;
+                                                      WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var4, var9);
+                                                      GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
                                                    }
 
                                                    field203 = 10;
@@ -4116,17 +4119,17 @@ public final class Client extends GameShell implements Usernamed {
                                                    }
                                                 }
 
-                                                if (class11.cameraZ < var9) {
-                                                   class11.cameraZ = (var9 - class11.cameraZ) * class30.field1148 / 1000 + class11.cameraZ + ClientPacket.field221;
-                                                   if (class11.cameraZ > var9) {
-                                                      class11.cameraZ = var9;
+                                                if (GrandExchangeOfferNameComparator.cameraZ < var9) {
+                                                   GrandExchangeOfferNameComparator.cameraZ = (var9 - GrandExchangeOfferNameComparator.cameraZ) * class30.field1148 / 1000 + GrandExchangeOfferNameComparator.cameraZ + ClientPacket.field221;
+                                                   if (GrandExchangeOfferNameComparator.cameraZ > var9) {
+                                                      GrandExchangeOfferNameComparator.cameraZ = var9;
                                                    }
                                                 }
 
-                                                if (class11.cameraZ > var9) {
-                                                   class11.cameraZ -= class30.field1148 * (class11.cameraZ - var9) / 1000 + ClientPacket.field221;
-                                                   if (class11.cameraZ < var9) {
-                                                      class11.cameraZ = var9;
+                                                if (GrandExchangeOfferNameComparator.cameraZ > var9) {
+                                                   GrandExchangeOfferNameComparator.cameraZ -= class30.field1148 * (GrandExchangeOfferNameComparator.cameraZ - var9) / 1000 + ClientPacket.field221;
+                                                   if (GrandExchangeOfferNameComparator.cameraZ < var9) {
+                                                      GrandExchangeOfferNameComparator.cameraZ = var9;
                                                    }
                                                 }
 
@@ -4135,7 +4138,7 @@ public final class Client extends GameShell implements Usernamed {
                                                 var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410;
                                                 var11 = var4 - WorldMapSection1.cameraX;
                                                 var12 = var10 - GrandExchangeEvents.cameraY;
-                                                var13 = var9 - class11.cameraZ;
+                                                var13 = var9 - GrandExchangeOfferNameComparator.cameraZ;
                                                 var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
                                                 var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047;
                                                 var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047;
@@ -4291,7 +4294,7 @@ public final class Client extends GameShell implements Usernamed {
       if (ReflectionCheck.clientPreferences != null) {
          try {
             Client var3 = TextureProvider.client;
-            Object[] var4 = new Object[]{SpotAnimationDefinition.method4822()};
+            Object[] var4 = new Object[]{SpotAnimationDefinition.getWindowedMode()};
             JSObject.getWindow(var3).call("resize", var4);
          } catch (Throwable var5) {
          }
@@ -4583,8 +4586,8 @@ public final class Client extends GameShell implements Usernamed {
                class30.field1148 = var3.readUnsignedByte();
                if (class30.field1148 >= 100) {
                   WorldMapSection1.cameraX = class3.field1146 * 128 + 64;
-                  class11.cameraZ = MusicPatchPcmStream.field602 * 128 + 64;
-                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
+                  GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64;
+                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
                }
 
                var1.serverPacket0 = null;
@@ -4716,7 +4719,7 @@ public final class Client extends GameShell implements Usernamed {
                   class22.method295(var8);
                }
 
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
@@ -4806,7 +4809,7 @@ public final class Client extends GameShell implements Usernamed {
             }
 
             if (ServerPacket.field849 == var1.serverPacket0) {
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                runEnergy = var3.readUnsignedByte();
                field124 = cycleCntr;
                var1.serverPacket0 = null;
@@ -5119,7 +5122,7 @@ public final class Client extends GameShell implements Usernamed {
                   }
                }
 
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                field123 += 32;
                var1.serverPacket0 = null;
                return true;
@@ -5159,7 +5162,7 @@ public final class Client extends GameShell implements Usernamed {
                   class22.method295(var8);
                }
 
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
@@ -5330,7 +5333,7 @@ public final class Client extends GameShell implements Usernamed {
                }
 
                for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) {
-                  if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.level == SoundSystem.plane) {
+                  if (var46.x >= WorldMapSection3.field1089 && var46.x < WorldMapSection3.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) {
                      var46.hitpoints = 0;
                   }
                }
@@ -5449,7 +5452,7 @@ public final class Client extends GameShell implements Usernamed {
                   var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410;
                   var10 = var38 - WorldMapSection1.cameraX;
                   var11 = var5 - GrandExchangeEvents.cameraY;
-                  var12 = var6 - class11.cameraZ;
+                  var12 = var6 - GrandExchangeOfferNameComparator.cameraZ;
                   var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
                   WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047;
                   MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047;
@@ -5508,7 +5511,7 @@ public final class Client extends GameShell implements Usernamed {
             }
 
             if (ServerPacket.field811 == var1.serverPacket0) {
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                var38 = var3.method71();
                var6 = var3.readUnsignedByteNegate();
                var5 = var3.readUnsignedByte();
@@ -5542,7 +5545,7 @@ public final class Client extends GameShell implements Usernamed {
             }
 
             if (ServerPacket.field860 == var1.serverPacket0) {
-               class12.method159();
+               GrandExchangeOfferAgeComparator.method159();
                weight = var3.method44();
                field124 = cycleCntr;
                var1.serverPacket0 = null;
@@ -5979,8 +5982,8 @@ public final class Client extends GameShell implements Usernamed {
             if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
                var11 = field205;
                var7 = field206;
-               WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var11, var7);
-               UnitPriceComparator.tempMenuAction = null;
+               WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var11, var7);
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
             }
 
             field207 = false;
@@ -5994,12 +5997,12 @@ public final class Client extends GameShell implements Usernamed {
             field205 = MouseHandler.MouseHandler_lastPressedX;
             field206 = MouseHandler.MouseHandler_lastPressedY;
             if (var2 >= 0) {
-               UnitPriceComparator.tempMenuAction = new MenuAction();
-               UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
-               UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
-               UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
-               UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
-               UnitPriceComparator.tempMenuAction.action = menuActions[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction();
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2];
             }
 
             class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
@@ -6214,8 +6217,8 @@ public final class Client extends GameShell implements Usernamed {
             } else if (menuOptionsCount > 0) {
                int var10 = widgetClickX + field110;
                var9 = widgetClickY + field111;
-               WorldMapDecorationType.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var9);
-               UnitPriceComparator.tempMenuAction = null;
+               WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var10, var9);
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
             }
 
             clickedWidget = null;
@@ -6271,7 +6274,7 @@ public final class Client extends GameShell implements Usernamed {
       isLowDetail = false;
       language = 0;
       clientType = -1;
-      field162 = false;
+      onMobile = false;
       gameState = 0;
       isLoading = true;
       cycle = 0;
@@ -6343,7 +6346,7 @@ public final class Client extends GameShell implements Usernamed {
       field195 = 0;
       field196 = 0;
       oculusOrbNormalSpeed = 12;
-      field197 = 6;
+      oculusOrbSlowedSpeed = 6;
       field198 = 0;
       field199 = false;
       field200 = 0;
@@ -6530,7 +6533,7 @@ public final class Client extends GameShell implements Usernamed {
       field120 = -1;
       platformInfoProvider = new DesktopPlatformInfoProvider();
       grandExchangeOffers = new GrandExchangeOffer[8];
-      field159 = new OwnWorldComparator();
+      geOwnWorldComparator = new GrandExchangeOfferOwnWorldComparator();
       field104 = -1;
       archiveLoaders = new ArrayList(10);
       archiveLoaderArchive = 0;
diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java
index b7e3bb5c1a..b50902a475 100644
--- a/runescape-client/src/main/java/Coord.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -67,8 +67,8 @@ public class Coord {
       signature = "(Lhu;B)Z",
       garbageValue = "-1"
    )
-   @Export("equals0")
-   boolean equals0(Coord other) {
+   @Export("equalsCoord")
+   boolean equalsCoord(Coord other) {
       return this.plane != other.plane ? false : (this.x != other.x ? false : this.y == other.y);
    }
 
@@ -77,23 +77,20 @@ public class Coord {
       signature = "(Ljava/lang/String;I)Ljava/lang/String;",
       garbageValue = "997364398"
    )
-   @Export("toString0")
-   String toString0(String separator) {
+   @Export("toString")
+   String toString(String separator) {
       return this.plane + separator + (this.x >> 6) + separator + (this.y >> 6) + separator + (this.x & 63) + separator + (this.y & 63);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method326(Object var1) {
-      return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equals0((Coord)var1));
+   public boolean equals(Object var1) {
+      return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1));
    }
 
-   @ObfuscatedName("hashCode")
-   public int method327() {
+   public int hashCode() {
       return this.packed();
    }
 
-   @ObfuscatedName("toString")
-   public String method328() {
-      return this.toString0(",");
+   public String toString() {
+      return this.toString(",");
    }
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index e85a8da5ee..4ced5dafce 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -184,7 +184,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
                   if (var1 != -1412584499 && !var10.isScrollBar) {
                      class279.field1145 = var0;
                      class54.field1161 = var6;
-                     class157.field1114 = var7;
+                     BuddyRankComparator.field1114 = var7;
                      continue;
                   }
 
@@ -344,7 +344,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
 
                   if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) {
                      if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
-                        class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+                        GrandExchangeOfferNameComparator.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
                      }
 
                      if (var10.type != 1) {
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index 6c1b90c9e2..ad287bbc64 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -237,7 +237,7 @@ public class DynamicObject extends Entity {
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             PacketBufferNode var12 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher);
-            var12.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
+            var12.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var3) + 2);
             var12.packetBuffer.writeStringCp1252NullTerminated(var3);
             var12.packetBuffer.writeByte(var4 - 1);
             var12.packetBuffer.writeByte(var5);
@@ -446,7 +446,7 @@ public class DynamicObject extends Entity {
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
                      var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var5);
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.method161(var5);
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
                      var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
@@ -628,7 +628,7 @@ public class DynamicObject extends Entity {
          Client.soundEffectCount = 0;
          Client.isCameraLocked = false;
          WorldMapSection1.cameraX -= var5 << 7;
-         class11.cameraZ -= var6 << 7;
+         GrandExchangeOfferNameComparator.cameraZ -= var6 << 7;
          MouseHandler.oculusOrbFocalPointX -= var5 << 7;
          ScriptEvent.oculusOrbFocalPointY -= var6 << 7;
          Client.field125 = -1;
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index 865938be90..a2cfb61b8c 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -41,7 +41,7 @@ public class FaceNormal {
       garbageValue = "-1788849120"
    )
    static Script method3236(int var0, int var1, int var2) {
-      int var3 = UnitPriceComparator.method125(var1, var0);
+      int var3 = GrandExchangeOfferUnitPriceComparator.method125(var1, var0);
       Script var4 = InterfaceParent.method1175(var3, var0);
       if (var4 != null) {
          return var4;
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 0fdb4f9aff..b942a26fd2 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -85,7 +85,7 @@ public class FontName {
    )
    static final void method5638(String var0, int var1) {
       PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher);
-      var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1);
+      var2.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0) + 1);
       var2.packetBuffer.writeStringCp1252NullTerminated(var0);
       var2.packetBuffer.writeByte(var1);
       Client.packetWriter.method241(var2);
@@ -113,8 +113,8 @@ public class FontName {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
                Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.name();
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.previousName();
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getName();
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousName();
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -124,7 +124,7 @@ public class FontName {
          } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0;
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world;
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
             }
@@ -186,7 +186,7 @@ public class FontName {
             } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).getUsername().getName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
@@ -195,7 +195,7 @@ public class FontName {
             } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world();
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).getWorld();
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
@@ -215,7 +215,7 @@ public class FontName {
                return 1;
             } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
                var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               ArchiveDiskActionHandler.method4655(var4);
+               ArchiveDiskActionHandler.clanKickUser(var4);
                return 1;
             } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0;
@@ -225,7 +225,7 @@ public class FontName {
                class31.method574(var4);
                return 1;
             } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
-               class12.method158();
+               GrandExchangeOfferAgeComparator.method158();
                return 1;
             } else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
                if (!WorldMapArea.friendSystem.method99()) {
@@ -239,8 +239,8 @@ public class FontName {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
                   Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.name();
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.previousName();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getName();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getPreviousName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -254,7 +254,7 @@ public class FontName {
                return 1;
             } else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).getUsername().equals(Canvas.localPlayer.username)) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -425,12 +425,12 @@ public class FontName {
                      return 1;
                   } else if (var0 == 3656) {
                      var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new class157(var5));
+                     WorldMapArea.friendSystem.friendsList.addComparator(new BuddyRankComparator(var5));
                      return 1;
                   } else if (var0 == 3657) {
                      var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                      if (PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new class157(var5));
+                        PacketWriter.clanChat.addComparator(new BuddyRankComparator(var5));
                      }
 
                      return 1;
@@ -471,11 +471,11 @@ public class FontName {
       VarpDefinition.VarpDefinition_cached.clear();
       GrandExchangeEvents.method69();
       Buffer.clearHealthbarCaches();
-      StructDefinition.field886.clear();
+      StructDefinition.StructDefinition_cached.clear();
       InvDefinition.method4754();
       Projectile.method2089();
       PlayerAppearance.PlayerAppearance_cachedModels.clear();
-      class157.method3382();
+      BuddyRankComparator.method3382();
       ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear();
       Script.Script_cached.clear();
       AbstractArchive.archive0.method8();
diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java
index 82103defdf..e70709cc5a 100644
--- a/runescape-client/src/main/java/Formatting.java
+++ b/runescape-client/src/main/java/Formatting.java
@@ -22,7 +22,7 @@ public class Formatting {
       garbageValue = "1654486766"
    )
    static int method2023(int var0, Script var1, boolean var2) {
-      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
          return 1;
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index f1014670d3..4203d642d2 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -20,9 +20,9 @@ public class Friend extends Buddy {
       signature = "(Lkq;I)I",
       garbageValue = "-1559116693"
    )
-   @Export("compareTo00")
-   int compareTo00(Friend other) {
-      return super.world0 == Client.worldId && Client.worldId != other.world0 ? -1 : (Client.worldId == other.world0 && super.world0 != Client.worldId ? 1 : (super.world0 != 0 && other.world0 == 0 ? -1 : (other.world0 != 0 && super.world0 == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world0 != 0 ? super.int2 - other.int2 : other.int2 - super.int2))))))));
+   @Export("compareToFriend")
+   int compareToFriend(Friend other) {
+      return super.world == Client.worldId && Client.worldId != other.world ? -1 : (Client.worldId == other.world && super.world != Client.worldId ? 1 : (super.world != 0 && other.world == 0 ? -1 : (other.world != 0 && super.world == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world != 0 ? super.int2 - other.int2 : other.int2 - super.int2))))))));
    }
 
    @ObfuscatedName("aj")
@@ -30,12 +30,12 @@ public class Friend extends Buddy {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   public int compareTo0(User var1) {
-      return this.compareTo00((Friend)var1);
+   @Export("compareToUser")
+   public int compareToUser(User var1) {
+      return this.compareToFriend((Friend)var1);
    }
 
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo00((Friend)var1);
+      return this.compareToFriend((Friend)var1);
    }
 }
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index aa0076fd7f..c4d48244db 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -161,7 +161,7 @@ public class FriendSystem {
                   WorldMapIcon1.addGameMessage(30, "", var4);
                } else {
                   PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher);
-                  var6.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+                  var6.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1));
                   var6.packetBuffer.writeStringCp1252NullTerminated(var1);
                   Client.packetWriter.method241(var6);
                }
@@ -214,7 +214,7 @@ public class FriendSystem {
                   WorldMapIcon1.addGameMessage(30, "", var4);
                } else {
                   var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher);
-                  var5.packetBuffer.writeByte(WorldMapRegion.method550(var1));
+                  var5.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1));
                   var5.packetBuffer.writeStringCp1252NullTerminated(var1);
                   Client.packetWriter.method241(var5);
                }
@@ -247,7 +247,7 @@ public class FriendSystem {
             if (this.friendsList.removeByUsername(var2)) {
                WorldMapManager.method668();
                PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(name));
+               var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name));
                var3.packetBuffer.writeStringCp1252NullTerminated(name);
                Client.packetWriter.method241(var3);
             }
@@ -271,7 +271,7 @@ public class FriendSystem {
             if (this.ignoreList.removeByUsername(var2)) {
                WorldMapManager.method668();
                PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(name));
+               var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name));
                var3.packetBuffer.writeStringCp1252NullTerminated(name);
                Client.packetWriter.method241(var3);
             }
@@ -304,18 +304,18 @@ public class FriendSystem {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
          if (Interpreter.field425 >= 10) {
             throw new RuntimeException();
-         } else if (var3.field975 == null) {
+         } else if (var3.onResize == null) {
             return 0;
          } else {
             ScriptEvent var4 = new ScriptEvent();
             var4.widget = var3;
-            var4.args0 = var3.field975;
+            var4.args0 = var3.onResize;
             var4.field772 = Interpreter.field425 + 1;
             Client.scriptEvents.addFirst(var4);
             return 1;
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index 61a36b680b..c9fbb3601f 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -63,7 +63,7 @@ public class FriendsList extends UserList {
    @Export("isFriended")
    public boolean isFriended(Username var1, boolean var2) {
       Friend var3 = (Friend)this.getByUsername(var1);
-      return var3 != null && (!var2 || var3.world0 != 0);
+      return var3 != null && (!var2 || var3.world != 0);
    }
 
    @ObfuscatedName("x")
@@ -105,7 +105,7 @@ public class FriendsList extends UserList {
 
                if (var11 != null) {
                   this.changeName(var11, var4, var5);
-                  if (var6 != var11.world0) {
+                  if (var6 != var11.world) {
                      boolean var14 = true;
 
                      for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) {
@@ -132,13 +132,13 @@ public class FriendsList extends UserList {
                   var11 = (Friend)this.addLast(var4, var5);
                }
 
-               if (var6 != var11.world0) {
+               if (var6 != var11.world) {
                   var11.int2 = ++this.field358 - 1;
-                  if (var11.world0 == -1 && var6 == 0) {
+                  if (var11.world == -1 && var6 == 0) {
                      var11.int2 = -(var11.int2 * -1377538447) * 120689297;
                   }
 
-                  var11.world0 = var6;
+                  var11.world = var6;
                }
 
                var11.rank = var7;
diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java
index 5bc595148e..4ca3e00005 100644
--- a/runescape-client/src/main/java/GameShell.java
+++ b/runescape-client/src/main/java/GameShell.java
@@ -869,8 +869,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    protected abstract void vmethod114();
 
-   @ObfuscatedName("destroy")
-   public final void method115() {
+   public final void destroy() {
       if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs();
          class203.method4010(5000L);
@@ -879,8 +878,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
    }
 
-   @Export("paint")
-   @ObfuscatedName("paint")
    public final synchronized void paint(Graphics var1) {
       if (this == gameShell && !isKilled) {
          this.field369 = true;
@@ -894,8 +891,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
          if (TaskHandler.javaVendor != null) {
@@ -909,7 +904,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
                if (var2.startsWith("1.6.0_")) {
                   int var3;
-                  for (var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) {
+                  for (var3 = 6; var3 < var2.length() && class159.isCharDigit(var2.charAt(var3)); ++var3) {
                   }
 
                   String var4 = var2.substring(6, var3);
@@ -954,76 +949,53 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       this.kill();
    }
 
-   @ObfuscatedName("start")
-   public final void method116() {
+   public final void start() {
       if (this == gameShell && !isKilled) {
          stopTimeMs = 0L;
       }
 
    }
 
-   @Export("update")
-   @ObfuscatedName("update")
    public final void update(Graphics var1) {
       this.paint(var1);
    }
 
-   @Export("focusGained")
-   @ObfuscatedName("focusGained")
    public final void focusGained(FocusEvent var1) {
       hasFocus = true;
       this.field369 = true;
    }
 
-   @Export("windowActivated")
-   @ObfuscatedName("windowActivated")
    public final void windowActivated(WindowEvent var1) {
    }
 
-   @Export("windowClosed")
-   @ObfuscatedName("windowClosed")
    public final void windowClosed(WindowEvent var1) {
    }
 
-   @Export("windowClosing")
-   @ObfuscatedName("windowClosing")
    public final void windowClosing(WindowEvent var1) {
-      this.method115();
+      this.destroy();
    }
 
-   @Export("windowDeiconified")
-   @ObfuscatedName("windowDeiconified")
    public final void windowDeiconified(WindowEvent var1) {
    }
 
-   @Export("windowOpened")
-   @ObfuscatedName("windowOpened")
    public final void windowOpened(WindowEvent var1) {
    }
 
-   @ObfuscatedName("postDecode")
    public abstract void init();
 
-   @ObfuscatedName("stop")
-   public final void method118() {
+   public final void stop() {
       if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs() + 4000L;
       }
 
    }
 
-   @Export("windowIconified")
-   @ObfuscatedName("windowIconified")
    public final void windowIconified(WindowEvent var1) {
    }
 
-   @Export("windowDeactivated")
-   @ObfuscatedName("windowDeactivated")
    public final void windowDeactivated(WindowEvent var1) {
    }
 
-   @Export("focusLost")
-   @ObfuscatedName("focusLost")
    public final void focusLost(FocusEvent var1) {
       hasFocus = false;
    }
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index 4c177ca8ea..14ad28bf74 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -26,18 +26,18 @@ public class GrandExchangeEvent {
    @Export("grandExchangeOffer")
    public final GrandExchangeOffer grandExchangeOffer;
    @ObfuscatedName("w")
-   @Export("string1")
-   String string1;
+   @Export("offerName")
+   String offerName;
    @ObfuscatedName("o")
-   @Export("string2")
-   String string2;
+   @Export("previousOfferName")
+   String previousOfferName;
 
    @ObfuscatedSignature(
       signature = "(Lgr;BI)V"
    )
    GrandExchangeEvent(Buffer var1, byte var2, int var3) {
-      this.string1 = var1.readStringCp1252NullTerminated();
-      this.string2 = var1.readStringCp1252NullTerminated();
+      this.offerName = var1.readStringCp1252NullTerminated();
+      this.previousOfferName = var1.readStringCp1252NullTerminated();
       this.world = var1.readUnsignedShort();
       this.field370 = var1.readLong();
       int var4 = var1.readInt();
@@ -57,8 +57,9 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "1672323214"
    )
-   public String method119() {
-      return this.string1;
+   @Export("getOfferName")
+   public String getOfferName() {
+      return this.offerName;
    }
 
    @ObfuscatedName("f")
@@ -66,8 +67,9 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "-271438207"
    )
-   public String method120() {
-      return this.string2;
+   @Export("getPreviousOfferName")
+   public String getPreviousOfferName() {
+      return this.previousOfferName;
    }
 
    @ObfuscatedName("f")
@@ -80,7 +82,7 @@ public class GrandExchangeEvent {
       Object[] var2 = scriptEvent.args0;
       Script var3;
       int var4;
-      if (class12.method162(scriptEvent.type0)) {
+      if (GrandExchangeOfferAgeComparator.method162(scriptEvent.type0)) {
          class15.worldMapEvent = (WorldMapEvent)var2[0];
          WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
          var3 = FaceNormal.method3236(scriptEvent.type0, var5.field1020, var5.category);
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index 4399ec11f2..8043c86470 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -13,13 +13,17 @@ import net.runelite.rs.ScriptOpcodes;
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
    @ObfuscatedName("f")
-   public static Comparator field371;
+   @Export("geAgeComparator")
+   public static Comparator geAgeComparator;
    @ObfuscatedName("q")
-   public static Comparator field372;
+   @Export("geUnitPriceComparator")
+   public static Comparator geUnitPriceComparator;
    @ObfuscatedName("w")
-   public static Comparator field373;
+   @Export("geItemNameComparator")
+   public static Comparator geItemNameComparator;
    @ObfuscatedName("o")
-   public static Comparator field374;
+   @Export("geTotalQuantityComparator")
+   public static Comparator geTotalQuantityComparator;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1605454211
@@ -173,10 +177,10 @@ public class GrandExchangeEvents {
    }
 
    static {
-      field371 = new class12();
-      new WorldComparator();
-      field372 = new UnitPriceComparator();
-      field373 = new class11();
-      field374 = new TotalQuantityComparator();
+      geAgeComparator = new GrandExchangeOfferAgeComparator();
+      new GrandExchangeOfferWorldComparator();
+      geUnitPriceComparator = new GrandExchangeOfferUnitPriceComparator();
+      geItemNameComparator = new GrandExchangeOfferNameComparator();
+      geTotalQuantityComparator = new GrandExchangeOfferTotalQuantityComparator();
    }
 }
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
similarity index 91%
rename from runescape-client/src/main/java/class12.java
rename to runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
index dbe1615663..6a0f456579 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -1,9 +1,12 @@
 import java.util.Comparator;
+import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("n")
-final class class12 implements Comparator {
+@Implements("GrandExchangeOfferAgeComparator")
+final class GrandExchangeOfferAgeComparator implements Comparator {
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -15,7 +18,8 @@ final class class12 implements Comparator {
       signature = "(Ll;Ll;B)I",
       garbageValue = "-86"
    )
-   int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
       return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1);
    }
 
@@ -24,7 +28,7 @@ final class class12 implements Comparator {
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method149((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("m")
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
similarity index 95%
rename from runescape-client/src/main/java/class11.java
rename to runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
index 71ec0bf799..41dae69c39 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -1,12 +1,14 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("k")
-final class class11 implements Comparator {
+@Implements("GrandExchangeOfferNameComparator")
+final class GrandExchangeOfferNameComparator implements Comparator {
    @ObfuscatedName("hl")
    @ObfuscatedGetter(
       intValue = -1945589829
@@ -19,8 +21,9 @@ final class class11 implements Comparator {
       signature = "(Ll;Ll;B)I",
       garbageValue = "1"
    )
-   int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.method119().compareTo(var2.method119());
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.getOfferName().compareTo(var2.getOfferName());
    }
 
    public boolean equals(Object var1) {
@@ -28,7 +31,7 @@ final class class11 implements Comparator {
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method138((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("m")
@@ -88,7 +91,7 @@ final class class11 implements Comparator {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -181,7 +184,7 @@ final class class11 implements Comparator {
             return 2;
          }
 
-         var3.field975 = var8;
+         var3.onResize = var8;
       }
 
       var3.hasListener = true;
diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
similarity index 84%
rename from runescape-client/src/main/java/OwnWorldComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
index 6066ee60cd..b7a541aaf0 100644
--- a/runescape-client/src/main/java/OwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -6,21 +6,23 @@ import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("bj")
-@Implements("OwnWorldComparator")
-public class OwnWorldComparator implements Comparator {
+@Implements("GrandExchangeOfferOwnWorldComparator")
+public class GrandExchangeOfferOwnWorldComparator implements Comparator {
    @ObfuscatedName("m")
-   boolean field666;
+   @Export("compareOwnWorld")
+   boolean compareOwnWorld;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;B)I",
       garbageValue = "21"
    )
-   int method234(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
       if (var2.world == var1.world) {
          return 0;
       } else {
-         if (this.field666) {
+         if (this.compareOwnWorld) {
             if (Client.worldId == var1.world) {
                return -1;
             }
@@ -34,15 +36,12 @@ public class OwnWorldComparator implements Comparator {
       }
    }
 
-   @ObfuscatedName("equals")
-   public boolean method235(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method234((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("al")
diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
similarity index 95%
rename from runescape-client/src/main/java/TotalQuantityComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
index db2a9b6f2d..4b32d87fec 100644
--- a/runescape-client/src/main/java/TotalQuantityComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -5,25 +5,23 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("e")
-@Implements("TotalQuantityComparator")
-final class TotalQuantityComparator implements Comparator {
+@Implements("GrandExchangeOfferTotalQuantityComparator")
+final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;I)I",
       garbageValue = "-573736433"
    )
-   int method335(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
       return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method335((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method336(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
similarity index 91%
rename from runescape-client/src/main/java/UnitPriceComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
index 1ebfa9ecc5..924dc0bdbc 100644
--- a/runescape-client/src/main/java/UnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("d")
-@Implements("UnitPriceComparator")
-final class UnitPriceComparator implements Comparator {
+@Implements("GrandExchangeOfferUnitPriceComparator")
+final class GrandExchangeOfferUnitPriceComparator implements Comparator {
    @ObfuscatedName("gz")
    @ObfuscatedSignature(
       signature = "Lln;"
@@ -25,18 +25,16 @@ final class UnitPriceComparator implements Comparator {
       signature = "(Ll;Ll;I)I",
       garbageValue = "-120071238"
    )
-   int method337(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
       return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method337((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method338(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
@@ -45,7 +43,8 @@ final class UnitPriceComparator implements Comparator {
       signature = "(Lir;B)V",
       garbageValue = "23"
    )
-   public static void method135(AbstractArchive var0) {
+   @Export("setVarbitDefinitionArchive")
+   public static void setVarbitDefinitionArchive(AbstractArchive var0) {
       VarbitDefinition.VarbitDefinition_archive = var0;
    }
 
@@ -85,7 +84,7 @@ final class UnitPriceComparator implements Comparator {
             }
 
             int var3 = WorldMapSection1.cameraX >> 7;
-            int var4 = class11.cameraZ >> 7;
+            int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7;
             if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
                return SoundSystem.plane;
             }
diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
similarity index 95%
rename from runescape-client/src/main/java/WorldComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
index 5a9fd666ae..fe2abac0ab 100644
--- a/runescape-client/src/main/java/WorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -6,8 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
 import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("u")
-@Implements("WorldComparator")
-final class WorldComparator implements Comparator {
+@Implements("GrandExchangeOfferWorldComparator")
+final class GrandExchangeOfferWorldComparator implements Comparator {
    @ObfuscatedName("n")
    public static boolean field988;
 
@@ -16,18 +16,16 @@ final class WorldComparator implements Comparator {
       signature = "(Ll;Ll;I)I",
       garbageValue = "707844889"
    )
-   int method358(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
       return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method358((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method359(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java
index 076a89f0e3..a54b76c5bd 100644
--- a/runescape-client/src/main/java/GroundItem.java
+++ b/runescape-client/src/main/java/GroundItem.java
@@ -47,7 +47,8 @@ public final class GroundItem extends Entity {
       signature = "(II)V",
       garbageValue = "411352848"
    )
-   static void method2095(int var0) {
+   @Export("setWindowedMode")
+   static void setWindowedMode(int var0) {
       Client.field99 = 0L;
       if (var0 >= 2) {
          Client.isResizable = true;
@@ -55,7 +56,7 @@ public final class GroundItem extends Entity {
          Client.isResizable = false;
       }
 
-      if (SpotAnimationDefinition.method4822() == 1) {
+      if (SpotAnimationDefinition.getWindowedMode() == 1) {
          TextureProvider.client.setMaxCanvasSize(765, 503);
       } else {
          TextureProvider.client.setMaxCanvasSize(7680, 2160);
diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java
index f44d3f8c94..2907038b9f 100644
--- a/runescape-client/src/main/java/GzipDecompressor.java
+++ b/runescape-client/src/main/java/GzipDecompressor.java
@@ -55,19 +55,20 @@ public class GzipDecompressor {
       signature = "(II)Ljq;",
       garbageValue = "-1060388349"
    )
-   public static StructDefinition method3702(int var0) {
-      StructDefinition var1 = (StructDefinition)StructDefinition.field886.get((long)var0);
+   @Export("getStructDefinition")
+   public static StructDefinition getStructDefinition(int var0) {
+      StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
       if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = StructDefinition.field885.takeFile(34, var0);
+         byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
          var1 = new StructDefinition();
          if (var2 != null) {
             var1.decode(new Buffer(var2));
          }
 
          var1.postDecode();
-         StructDefinition.field886.put(var1, (long)var0);
+         StructDefinition.StructDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index fef97e5777..b716e2a1c0 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -21,8 +21,8 @@ public class Ignored extends User {
       signature = "(Lks;I)I",
       garbageValue = "-842469150"
    )
-   @Export("compareTo00")
-   int compareTo00(Ignored other) {
+   @Export("compareToIgnored")
+   int compareToIgnored(Ignored other) {
       return this.id - other.id;
    }
 
@@ -31,13 +31,13 @@ public class Ignored extends User {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   public int compareTo0(User var1) {
-      return this.compareTo00((Ignored)var1);
+   @Export("compareToUser")
+   public int compareToUser(User var1) {
+      return this.compareToIgnored((Ignored)var1);
    }
 
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo00((Ignored)var1);
+      return this.compareToIgnored((Ignored)var1);
    }
 
    @ObfuscatedName("fv")
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 328d7db1b9..26455786ac 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -191,7 +191,7 @@ public class Interpreter {
          class279.field1145 = null;
          DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7);
          if (class279.field1145 != null) {
-            DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, class157.field1114, var7);
+            DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, var1, var2, var3, var4, class54.field1161, BuddyRankComparator.field1114, var7);
             class279.field1145 = null;
          }
       } else if (var7 != -1) {
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index 032efe9275..b7c0bfef42 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -263,7 +263,7 @@ public final class IsaacCipher {
       } else if (var0 == 5) {
          Login.field467 = 2;
          class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
-      } else if (var0 != 68 && (Client.field162 || var0 != 6)) {
+      } else if (var0 != 68 && (Client.onMobile || var0 != 6)) {
          if (var0 == 7) {
             class54.method1089("This world is full.", "Please use a different world.", "");
          } else if (var0 == 8) {
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index 75aa7d03e9..ef1fbe61a1 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -205,8 +205,8 @@ public class Login {
       if (ReflectionCheck.clientPreferences.roofsHidden) {
          return SoundSystem.plane;
       } else {
-         int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane);
-         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
+         int var0 = class32.getTileHeight(WorldMapSection1.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane);
+         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
       }
    }
 
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index bf939fbb2d..6171060b16 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -510,7 +510,7 @@ public class LoginScreenAnimation {
       Varps.method4400(var5);
       var5.writeLong(var3.nextLong());
       var5.encryptRsa(class80.field1163, class80.field1164);
-      var7 = WorldMapRegion.method550(var2);
+      var7 = WorldMapRegion.stringCp1252NullTerminatedByteSize(var2);
       if (var7 % 8 != 0) {
          var7 += 8 - var7 % 8;
       }
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index b7bff3b2b6..88c8325bc5 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -73,8 +72,6 @@ public class LoginType {
       this.field489 = var4;
    }
 
-   @ObfuscatedName("toString")
-   @Export("toString")
    public String toString() {
       return this.field489;
    }
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index 8ecb60c956..e7abdefd73 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -233,6 +233,7 @@ public class MidiPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("e")
+   @Export("fill")
    protected synchronized void fill(int[] var1, int var2, int var3) {
       if (this.midiFile.isReady()) {
          int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
@@ -281,6 +282,7 @@ public class MidiPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("d")
+   @Export("skip")
    protected synchronized void skip(int var1) {
       if (this.midiFile.isReady()) {
          int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 179481d4be..99f0dff651 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -49,8 +49,6 @@ public class MouseRecorder implements Runnable {
       this.millis = new long[500];
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       for (; this.isRunning; class203.method4010(50L)) {
          Object var1 = this.lock;
@@ -73,7 +71,7 @@ public class MouseRecorder implements Runnable {
    )
    @Export("drawObject")
    static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-      long var5 = class65.scene.method290(var0, var1, var2);
+      long var5 = class65.scene.getBoundaryObjectTag(var0, var1, var2);
       int var7;
       int var8;
       int var9;
@@ -170,7 +168,7 @@ public class MouseRecorder implements Runnable {
          }
       }
 
-      var5 = class65.scene.method292(var0, var1, var2);
+      var5 = class65.scene.getGameObjectTag(var0, var1, var2);
       ObjectDefinition var19;
       IndexedSprite var21;
       int var22;
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index 7b349d936c..f8cd4f1e2c 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -152,6 +152,7 @@ public class MusicPatchPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("e")
+   @Export("fill")
    protected void fill(int[] var1, int var2, int var3) {
       this.mixer.fill(var1, var2, var3);
 
@@ -177,6 +178,7 @@ public class MusicPatchPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("d")
+   @Export("skip")
    protected void skip(int var1) {
       this.mixer.skip(var1);
 
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index 4eafb433fe..2907e27c90 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -221,8 +221,6 @@ public final class NetSocket extends AbstractSocket implements Runnable {
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
          while (true) {
diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java
index 7b4dce8d3b..dc7c2c46d0 100644
--- a/runescape-client/src/main/java/ParamDefinition.java
+++ b/runescape-client/src/main/java/ParamDefinition.java
@@ -11,7 +11,8 @@ public class ParamDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractArchive field679;
+   @Export("ParamDefinition_archive")
+   public static AbstractArchive ParamDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -98,9 +99,10 @@ public class ParamDefinition extends DualNode {
       signature = "(IIIIIIII)V",
       garbageValue = "-904254947"
    )
-   static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
-         if (Client.isLowDetail && var0 != SoundSystem.plane) {
+   @Export("addPendingSpawnToScene")
+   static final void addPendingSpawnToScene(int plane, int objectType, int x, int y, int id, int orientation, int var6) {
+      if (x >= 1 && y >= 1 && x <= 102 && y <= 102) {
+         if (Client.isLowDetail && plane != SoundSystem.plane) {
             return;
          }
 
@@ -108,74 +110,74 @@ public class ParamDefinition extends DualNode {
          boolean var9 = true;
          boolean var10 = false;
          boolean var11 = false;
-         if (var1 == 0) {
-            var7 = class65.scene.method290(var0, var2, var3);
+         if (objectType == 0) {
+            var7 = class65.scene.getBoundaryObjectTag(plane, x, y);
          }
 
-         if (var1 == 1) {
-            var7 = class65.scene.method291(var0, var2, var3);
+         if (objectType == 1) {
+            var7 = class65.scene.getWallDecorationTag(plane, x, y);
          }
 
-         if (var1 == 2) {
-            var7 = class65.scene.method292(var0, var2, var3);
+         if (objectType == 2) {
+            var7 = class65.scene.getGameObjectTag(plane, x, y);
          }
 
-         if (var1 == 3) {
-            var7 = class65.scene.getFloorDecorationTag(var0, var2, var3);
+         if (objectType == 3) {
+            var7 = class65.scene.getFloorDecorationTag(plane, x, y);
          }
 
          int var12;
          if (0L != var7) {
-            var12 = class65.scene.getObjectFlags(var0, var2, var3, var7);
+            var12 = class65.scene.getObjectFlags(plane, x, y, var7);
             int var13 = HitSplatDefinition.method4972(var7);
             int var14 = var12 & 31;
             int var15 = var12 >> 6 & 3;
             ObjectDefinition var16;
-            if (var1 == 0) {
-               class65.scene.removeBoundaryObject(var0, var2, var3);
+            if (objectType == 0) {
+               class65.scene.removeBoundaryObject(plane, x, y);
                var16 = class50.getObjectDefinition(var13);
                if (var16.interactType != 0) {
-                  Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1);
+                  Client.collisionMaps[plane].method95(x, y, var14, var15, var16.boolean1);
                }
             }
 
-            if (var1 == 1) {
-               class65.scene.removeWallDecoration(var0, var2, var3);
+            if (objectType == 1) {
+               class65.scene.removeWallDecoration(plane, x, y);
             }
 
-            if (var1 == 2) {
-               class65.scene.method288(var0, var2, var3);
+            if (objectType == 2) {
+               class65.scene.method288(plane, x, y);
                var16 = class50.getObjectDefinition(var13);
-               if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) {
+               if (x + var16.sizeX > 103 || y + var16.sizeX > 103 || x + var16.sizeY > 103 || y + var16.sizeY > 103) {
                   return;
                }
 
                if (var16.interactType != 0) {
-                  Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1);
+                  Client.collisionMaps[plane].method96(x, y, var16.sizeX, var16.sizeY, var15, var16.boolean1);
                }
             }
 
-            if (var1 == 3) {
-               class65.scene.removeFloorDecoration(var0, var2, var3);
+            if (objectType == 3) {
+               class65.scene.removeFloorDecoration(plane, x, y);
                var16 = class50.getObjectDefinition(var13);
                if (var16.interactType == 1) {
-                  Client.collisionMaps[var0].method98(var2, var3);
+                  Client.collisionMaps[plane].method98(x, y);
                }
             }
          }
 
-         if (var4 >= 0) {
-            var12 = var0;
-            if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-               var12 = var0 + 1;
+         if (id >= 0) {
+            var12 = plane;
+            if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) {
+               var12 = plane + 1;
             }
 
             Scene var36 = class65.scene;
-            CollisionMap var37 = Client.collisionMaps[var0];
-            ObjectDefinition var38 = class50.getObjectDefinition(var4);
+            CollisionMap var37 = Client.collisionMaps[plane];
+            ObjectDefinition var38 = class50.getObjectDefinition(id);
             int var17;
             int var39;
-            if (var5 != 1 && var5 != 3) {
+            if (orientation != 1 && orientation != 3) {
                var17 = var38.sizeX;
                var39 = var38.sizeY;
             } else {
@@ -185,30 +187,30 @@ public class ParamDefinition extends DualNode {
 
             int var18;
             int var19;
-            if (var17 + var2 <= 104) {
-               var18 = (var17 >> 1) + var2;
-               var19 = var2 + (var17 + 1 >> 1);
+            if (var17 + x <= 104) {
+               var18 = (var17 >> 1) + x;
+               var19 = x + (var17 + 1 >> 1);
             } else {
-               var18 = var2;
-               var19 = var2 + 1;
+               var18 = x;
+               var19 = x + 1;
             }
 
             int var20;
             int var21;
-            if (var3 + var39 <= 104) {
-               var20 = var3 + (var39 >> 1);
-               var21 = var3 + (var39 + 1 >> 1);
+            if (y + var39 <= 104) {
+               var20 = y + (var39 >> 1);
+               var21 = y + (var39 + 1 >> 1);
             } else {
-               var20 = var3;
-               var21 = var3 + 1;
+               var20 = y;
+               var21 = y + 1;
             }
 
             int[][] var22 = Tiles.Tiles_heights[var12];
             int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
-            int var24 = (var2 << 7) + (var17 << 6);
-            int var25 = (var3 << 7) + (var39 << 6);
-            long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4);
-            int var28 = (var5 << 6) + var6;
+            int var24 = (x << 7) + (var17 << 6);
+            int var25 = (y << 7) + (var39 << 6);
+            long var26 = FontName.calculateTag(x, y, 2, var38.int1 == 0, id);
+            int var28 = (orientation << 6) + var6;
             if (var38.int3 == 1) {
                var28 += 256;
             }
@@ -216,173 +218,173 @@ public class ParamDefinition extends DualNode {
             Object var29;
             if (var6 == 22) {
                if (var38.animationId == -1 && var38.transforms == null) {
-                  var29 = var38.getModel(22, var5, var22, var24, var23, var25);
+                  var29 = var38.getModel(22, orientation, var22, var24, var23, var25);
                } else {
-                  var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                  var29 = new DynamicObject(id, 22, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                }
 
-               var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
+               var36.newFloorDecoration(plane, x, y, var23, (Entity)var29, var26, var28);
                if (var38.interactType == 1) {
-                  var37.method93(var2, var3);
+                  var37.method93(x, y);
                }
             } else if (var6 != 10 && var6 != 11) {
                if (var6 >= 12) {
                   if (var38.animationId == -1 && var38.transforms == null) {
-                     var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
+                     var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                   }
 
-                  var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                  var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
                   if (var38.interactType != 0) {
-                     var37.method91(var2, var3, var17, var39, var38.boolean1);
+                     var37.method91(x, y, var17, var39, var38.boolean1);
                   }
                } else if (var6 == 0) {
                   if (var38.animationId == -1 && var38.transforms == null) {
-                     var29 = var38.getModel(0, var5, var22, var24, var23, var25);
+                     var29 = var38.getModel(0, orientation, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(id, 0, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                   }
 
-                  var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28);
+                  var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, var26, var28);
                   if (var38.interactType != 0) {
-                     var37.method90(var2, var3, var6, var5, var38.boolean1);
+                     var37.method90(x, y, var6, orientation, var38.boolean1);
                   }
                } else if (var6 == 1) {
                   if (var38.animationId == -1 && var38.transforms == null) {
-                     var29 = var38.getModel(1, var5, var22, var24, var23, var25);
+                     var29 = var38.getModel(1, orientation, var22, var24, var23, var25);
                   } else {
-                     var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                     var29 = new DynamicObject(id, 1, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                   }
 
-                  var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
+                  var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
                   if (var38.interactType != 0) {
-                     var37.method90(var2, var3, var6, var5, var38.boolean1);
+                     var37.method90(x, y, var6, orientation, var38.boolean1);
                   }
                } else {
                   int var30;
                   Object var31;
                   if (var6 == 2) {
-                     var30 = var5 + 1 & 3;
+                     var30 = orientation + 1 & 3;
                      Object var32;
                      if (var38.animationId == -1 && var38.transforms == null) {
-                        var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25);
+                        var31 = var38.getModel(2, orientation + 4, var22, var24, var23, var25);
                         var32 = var38.getModel(2, var30, var22, var24, var23, var25);
                      } else {
-                        var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
-                        var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null);
+                        var31 = new DynamicObject(id, 2, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                        var32 = new DynamicObject(id, 2, var30, var12, x, y, var38.animationId, true, (Entity)null);
                      }
 
-                     var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28);
+                     var36.newBoundaryObject(plane, x, y, var23, (Entity)var31, (Entity)var32, Tiles.field911[orientation], Tiles.field911[var30], var26, var28);
                      if (var38.interactType != 0) {
-                        var37.method90(var2, var3, var6, var5, var38.boolean1);
+                        var37.method90(x, y, var6, orientation, var38.boolean1);
                      }
                   } else if (var6 == 3) {
                      if (var38.animationId == -1 && var38.transforms == null) {
-                        var29 = var38.getModel(3, var5, var22, var24, var23, var25);
+                        var29 = var38.getModel(3, orientation, var22, var24, var23, var25);
                      } else {
-                        var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                        var29 = new DynamicObject(id, 3, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                      }
 
-                     var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
+                     var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
                      if (var38.interactType != 0) {
-                        var37.method90(var2, var3, var6, var5, var38.boolean1);
+                        var37.method90(x, y, var6, orientation, var38.boolean1);
                      }
                   } else if (var6 == 9) {
                      if (var38.animationId == -1 && var38.transforms == null) {
-                        var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
+                        var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
                      } else {
-                        var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                        var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                      }
 
-                     var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                     var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
                      if (var38.interactType != 0) {
-                        var37.method91(var2, var3, var17, var39, var38.boolean1);
+                        var37.method91(x, y, var17, var39, var38.boolean1);
                      }
                   } else if (var6 == 4) {
                      if (var38.animationId == -1 && var38.transforms == null) {
-                        var29 = var38.getModel(4, var5, var22, var24, var23, var25);
+                        var29 = var38.getModel(4, orientation, var22, var24, var23, var25);
                      } else {
-                        var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                        var29 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                      }
 
-                     var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28);
+                     var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, 0, 0, var26, var28);
                   } else {
                      long var40;
                      if (var6 == 5) {
                         var30 = 16;
-                        var40 = var36.method290(var0, var2, var3);
+                        var40 = var36.getBoundaryObjectTag(plane, x, y);
                         if (var40 != 0L) {
                            var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2;
                         }
 
                         if (var38.animationId == -1 && var38.transforms == null) {
-                           var31 = var38.getModel(4, var5, var22, var24, var23, var25);
+                           var31 = var38.getModel(4, orientation, var22, var24, var23, var25);
                         } else {
-                           var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                           var31 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                         }
 
-                        var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28);
+                        var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, Tiles.field911[orientation], 0, var30 * Tiles.field913[orientation], var30 * Tiles.field914[orientation], var26, var28);
                      } else if (var6 == 6) {
                         var30 = 8;
-                        var40 = var36.method290(var0, var2, var3);
+                        var40 = var36.getBoundaryObjectTag(plane, x, y);
                         if (var40 != 0L) {
                            var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
                         }
 
                         if (var38.animationId == -1 && var38.transforms == null) {
-                           var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
+                           var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
                         } else {
-                           var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                           var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
                         }
 
-                        var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
+                        var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
                      } else {
                         int var34;
                         if (var6 == 7) {
-                           var34 = var5 + 2 & 3;
+                           var34 = orientation + 2 & 3;
                            if (var38.animationId == -1 && var38.transforms == null) {
                               var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
                            } else {
-                              var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                              var29 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
                            }
 
-                           var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
+                           var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
                         } else if (var6 == 8) {
                            var30 = 8;
-                           var40 = var36.method290(var0, var2, var3);
+                           var40 = var36.getBoundaryObjectTag(plane, x, y);
                            if (var40 != 0L) {
                               var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
                            }
 
-                           var34 = var5 + 2 & 3;
+                           var34 = orientation + 2 & 3;
                            Object var35;
                            if (var38.animationId == -1 && var38.transforms == null) {
-                              var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
+                              var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
                               var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
                            } else {
-                              var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
-                              var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
+                              var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                              var35 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
                            }
 
-                           var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
+                           var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)var35, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
                         }
                      }
                   }
                }
             } else {
                if (var38.animationId == -1 && var38.transforms == null) {
-                  var29 = var38.getModel(10, var5, var22, var24, var23, var25);
+                  var29 = var38.getModel(10, orientation, var22, var24, var23, var25);
                } else {
-                  var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
+                  var29 = new DynamicObject(id, 10, orientation, var12, x, y, var38.animationId, true, (Entity)null);
                }
 
                if (var29 != null) {
-                  var36.method284(var0, var2, var3, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
+                  var36.method284(plane, x, y, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
                }
 
                if (var38.interactType != 0) {
-                  var37.method91(var2, var3, var17, var39, var38.boolean1);
+                  var37.method91(x, y, var17, var39, var38.boolean1);
                }
             }
          }
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index ece01a9aeb..ef333e2f0f 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -17,8 +17,8 @@ public class PcmPlayer {
    @ObfuscatedSignature(
       signature = "Ldc;"
    )
-   @Export("stream0")
-   PcmStream stream0;
+   @Export("stream")
+   PcmStream stream;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1125788887
@@ -164,7 +164,7 @@ public class PcmPlayer {
    )
    @Export("setStream")
    public final synchronized void setStream(PcmStream stream) {
-      this.stream0 = stream;
+      this.stream = stream;
    }
 
    @ObfuscatedName("ar")
@@ -330,8 +330,8 @@ public class PcmPlayer {
          this.field686 = 0;
       }
 
-      if (this.stream0 != null) {
-         this.stream0.skip(length);
+      if (this.stream != null) {
+         this.stream.skip(length);
       }
 
    }
@@ -346,10 +346,10 @@ public class PcmPlayer {
 
       class212.clearIntArray(buffer, 0, var3);
       this.field686 -= length;
-      if (this.stream0 != null && this.field686 <= 0) {
+      if (this.stream != null && this.field686 <= 0) {
          this.field686 += class309.PcmPlayer_sampleRate >> 4;
-         MidiPcmStream.PcmStream_disable(this.stream0);
-         this.method243(this.stream0, this.stream0.vmethod282());
+         MidiPcmStream.PcmStream_disable(this.stream);
+         this.method243(this.stream, this.stream.vmethod282());
          int var4 = 0;
          int var5 = 255;
 
@@ -443,8 +443,8 @@ public class PcmPlayer {
          this.field686 = 0;
       }
 
-      if (this.stream0 != null) {
-         this.stream0.fill(buffer, 0, length);
+      if (this.stream != null) {
+         this.stream.fill(buffer, 0, length);
       }
 
       this.timeMs = class203.currentTimeMs();
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index 29e659a256..95c0469546 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -113,6 +113,7 @@ public class PcmStreamMixer extends PcmStream {
    }
 
    @ObfuscatedName("e")
+   @Export("fill")
    public final synchronized void fill(int[] var1, int var2, int var3) {
       do {
          if (this.field692 < 0) {
@@ -157,6 +158,7 @@ public class PcmStreamMixer extends PcmStream {
    }
 
    @ObfuscatedName("d")
+   @Export("skip")
    public final synchronized void skip(int var1) {
       do {
          if (this.field692 < 0) {
diff --git a/runescape-client/src/main/java/PendingSpawn.java b/runescape-client/src/main/java/PendingSpawn.java
index b37305c175..c3b1a86330 100644
--- a/runescape-client/src/main/java/PendingSpawn.java
+++ b/runescape-client/src/main/java/PendingSpawn.java
@@ -11,8 +11,8 @@ public final class PendingSpawn extends Node {
    @ObfuscatedGetter(
       intValue = 1439936951
    )
-   @Export("level")
-   int level;
+   @Export("plane")
+   int plane;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1471611383
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index cde1fbee52..031248e6ca 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -154,12 +154,12 @@ public class Players {
          Client.isDraggingWidget = false;
          int var3 = Client.menuOptionsCount - 1;
          if (var3 != -1) {
-            UnitPriceComparator.tempMenuAction = new MenuAction();
-            UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
-            UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
-            UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
-            UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
-            UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction();
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
          }
       }
 
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 391846e881..54a3b4136d 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -101,6 +101,7 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("e")
+   @Export("fill")
    public synchronized void fill(int[] var1, int var2, int var3) {
       if (this.field746 == 0 && this.field752 == 0) {
          this.skip(var3);
@@ -290,6 +291,7 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("d")
+   @Export("skip")
    public synchronized void skip(int var1) {
       if (this.field752 > 0) {
          if (var1 >= this.field752) {
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index fc9b08f46c..e07ebe99e3 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -754,20 +754,23 @@ public class Scene {
    }
 
    @ObfuscatedName("ar")
-   public long method290(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
+   @Export("getBoundaryObjectTag")
+   public long getBoundaryObjectTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
       return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L;
    }
 
    @ObfuscatedName("ac")
-   public long method291(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
+   @Export("getWallDecorationTag")
+   public long getWallDecorationTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
       return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L;
    }
 
    @ObfuscatedName("ay")
-   public long method292(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
+   @Export("getGameObjectTag")
+   public long getGameObjectTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
       if (var4 == null) {
          return 0L;
       } else {
@@ -776,7 +779,7 @@ public class Scene {
             long var7 = var6.tag;
             int var9 = (int)(var7 >>> 14 & 3L);
             boolean var10 = var9 == 2;
-            if (var10 && var2 == var6.startX && var3 == var6.startY) {
+            if (var10 && x == var6.startX && y == var6.startY) {
                return var6.tag;
             }
          }
@@ -794,19 +797,19 @@ public class Scene {
 
    @ObfuscatedName("ak")
    @Export("getObjectFlags")
-   public int getObjectFlags(int plane, int x, int y, long var4) {
+   public int getObjectFlags(int plane, int x, int y, long tag) {
       Tile var6 = this.tiles[plane][x][y];
       if (var6 == null) {
          return -1;
-      } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
+      } else if (var6.boundaryObject != null && var6.boundaryObject.tag == tag) {
          return var6.boundaryObject.flags & 255;
-      } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
+      } else if (var6.wallDecoration != null && var6.wallDecoration.tag == tag) {
          return var6.wallDecoration.flags & 255;
-      } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
+      } else if (var6.floorDecoration != null && var6.floorDecoration.tag == tag) {
          return var6.floorDecoration.flags & 255;
       } else {
          for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
-            if (var6.gameObjects[var7].tag == var4) {
+            if (var6.gameObjects[var7].tag == tag) {
                return var6.gameObjects[var7].flags & 255;
             }
          }
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index 41de47a2e5..6e2d40c75f 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -113,7 +113,7 @@ public class ScriptEvent extends Node {
       garbageValue = "0"
    )
    static int method1185(int var0, Script var1, boolean var2) {
-      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
          return 1;
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index 201dcdb11a..38b8eeb3f6 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -24,8 +24,6 @@ public class SoundSystem implements Runnable {
       this.players = new PcmPlayer[2];
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
          for (int var1 = 0; var1 < 2; ++var1) {
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index 7bc1f44bd8..3d7668daf8 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -230,7 +230,8 @@ public class SpotAnimationDefinition extends DualNode {
       signature = "(B)I",
       garbageValue = "95"
    )
-   static int method4822() {
+   @Export("getWindowedMode")
+   static int getWindowedMode() {
       return Client.isResizable ? 2 : 1;
    }
 
diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java
index fac6e90ef1..7fcc7dcf5e 100644
--- a/runescape-client/src/main/java/StructDefinition.java
+++ b/runescape-client/src/main/java/StructDefinition.java
@@ -11,12 +11,14 @@ public class StructDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractArchive field885;
+   @Export("StructDefinition_archive")
+   public static AbstractArchive StructDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable field886;
+   @Export("StructDefinition_cached")
+   public static EvictingDualNodeHashTable StructDefinition_cached;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -109,7 +111,7 @@ public class StructDefinition extends DualNode {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          var4 = Huffman.getWidget(var3);
       } else {
-         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) {
@@ -286,6 +288,6 @@ public class StructDefinition extends DualNode {
    }
 
    static {
-      field886 = new EvictingDualNodeHashTable(64);
+      StructDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index 5a6c3f2bf9..ebebc5f6dd 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -124,8 +124,6 @@ public class TaskHandler implements Runnable {
       return this.newTask(2, var2, 0, var1);
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public final void run() {
       while (true) {
          Task var1;
diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java
index c911d6c9be..838bd46cd2 100644
--- a/runescape-client/src/main/java/UrlRequest.java
+++ b/runescape-client/src/main/java/UrlRequest.java
@@ -52,7 +52,8 @@ public class UrlRequest {
       signature = "(CI)Z",
       garbageValue = "-476632347"
    )
-   public static boolean method3271(char var0) {
+   @Export("isCharAlphabetic")
+   public static boolean isCharAlphabetic(char var0) {
       return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
    }
 }
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index 3abe3aa985..4d4eca1bb3 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -76,8 +76,6 @@ public class UrlRequester implements Runnable {
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       while (!this.isClosed) {
          try {
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index 1032dbeab6..9ce76ff9e5 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -10,8 +10,8 @@ public class User implements Comparable {
    @ObfuscatedSignature(
       signature = "Lkp;"
    )
-   @Export("username0")
-   Username username0;
+   @Export("username")
+   Username username;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lkp;"
@@ -24,9 +24,9 @@ public class User implements Comparable {
       signature = "(I)Lkp;",
       garbageValue = "1922393088"
    )
-   @Export("username")
-   public Username username() {
-      return this.username0;
+   @Export("getUsername")
+   public Username getUsername() {
+      return this.username;
    }
 
    @ObfuscatedName("v")
@@ -34,9 +34,9 @@ public class User implements Comparable {
       signature = "(B)Ljava/lang/String;",
       garbageValue = "-60"
    )
-   @Export("name")
-   public String name() {
-      return this.username0 == null ? "" : this.username0.getName();
+   @Export("getName")
+   public String getName() {
+      return this.username == null ? "" : this.username.getName();
    }
 
    @ObfuscatedName("ag")
@@ -44,8 +44,8 @@ public class User implements Comparable {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "1204003359"
    )
-   @Export("previousName")
-   public String previousName() {
+   @Export("getPreviousName")
+   public String getPreviousName() {
       return this.previousUsername == null ? "" : this.previousUsername.getName();
    }
 
@@ -59,7 +59,7 @@ public class User implements Comparable {
       if (username == null) {
          throw new NullPointerException();
       } else {
-         this.username0 = username;
+         this.username = username;
          this.previousUsername = previousUsername;
       }
    }
@@ -69,14 +69,12 @@ public class User implements Comparable {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   @Export("compareTo0")
-   public int compareTo0(User other) {
-      return this.username0.compareTo0(other.username0);
+   @Export("compareToUser")
+   public int compareToUser(User other) {
+      return this.username.compareToTyped(other.username);
    }
 
-   @Export("compareTo")
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo0((User)var1);
+      return this.compareToUser((User)var1);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index 2adcca3189..39effa29a3 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator1")
 public class UserComparator1 implements Comparator {
    @ObfuscatedName("m")
-   final boolean field931;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator1(boolean var1) {
-      this.field931 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +20,16 @@ public class UserComparator1 implements Comparator {
       signature = "(Ljs;Ljs;B)I",
       garbageValue = "68"
    )
-   int method339(User var1, User var2) {
-      return this.field931 ? var1.compareTo0(var2) : var2.compareTo0(var1);
+   @Export("compareUser")
+   int compareUser(User var1, User var2) {
+      return this.reversed ? var1.compareToUser(var2) : var2.compareToUser(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method339((User)var1, (User)var2);
+      return this.compareUser((User)var1, (User)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean method340(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index e1fdf2f164..d6aee1b8e3 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator10")
 public class UserComparator10 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean field932;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator10(boolean var1) {
-      this.field932 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +20,13 @@ public class UserComparator10 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-15"
    )
-   int method341(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field932 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method341((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("hn")
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index 44a97180b0..a7b3995ba0 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
    @ObfuscatedName("m")
-   final boolean field933;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator2(boolean var1) {
-      this.field933 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +20,16 @@ public class UserComparator2 implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-2069683911"
    )
-   int method342(User var1, User var2) {
-      return this.field933 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username());
+   @Export("compareTyped")
+   int compareTyped(User var1, User var2) {
+      return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername());
    }
 
-   @ObfuscatedName("equals")
-   public boolean method343(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method342((User)var1, (User)var2);
+      return this.compareTyped((User)var1, (User)var2);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index 193ca517ab..469ffc770c 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -19,10 +19,11 @@ public class UserComparator3 extends AbstractUserComparator {
    @Export("socketTask")
    static Task socketTask;
    @ObfuscatedName("m")
-   final boolean field934;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator3(boolean var1) {
-      this.field934 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -30,14 +31,13 @@ public class UserComparator3 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-1157645406"
    )
-   int method344(Buddy var1, Buddy var2) {
-      return var2.world0 != var1.world0 ? (this.field934 ? var1.world0 - var2.world0 : var2.world0 - var1.world0) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var2.world != var1.world ? (this.reversed ? var1.world - var2.world : var2.world - var1.world) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method344((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("o")
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index 0f5758bf29..63b67c7ca4 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -16,10 +16,11 @@ public class UserComparator4 implements Comparator {
    @Export("WorldMapElement_count")
    public static int WorldMapElement_count;
    @ObfuscatedName("m")
-   final boolean field935;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator4(boolean var1) {
-      this.field935 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -27,19 +28,17 @@ public class UserComparator4 implements Comparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "950234237"
    )
-   int method345(Buddy var1, Buddy var2) {
-      return this.field935 ? var1.int2 - var2.int2 : var2.int2 - var1.int2;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2;
    }
 
-   @ObfuscatedName("equals")
-   public boolean method346(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method345((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
@@ -58,14 +57,14 @@ public class UserComparator4 implements Comparator {
    )
    static int method3335(int var0, Script var1, boolean var2) {
       if (var0 == ScriptOpcodes.GETWINDOWMODE) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822();
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode();
          return 1;
       } else {
          int var3;
          if (var0 == ScriptOpcodes.SETWINDOWMODE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             if (var3 == 1 || var3 == 2) {
-               GroundItem.method2095(var3);
+               GroundItem.setWindowedMode(var3);
             }
 
             return 1;
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index 49da2bb4f8..d6631df263 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator5")
 public class UserComparator5 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean field936;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator5(boolean var1) {
-      this.field936 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +19,21 @@ public class UserComparator5 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-22"
    )
-   int method347(Buddy var1, Buddy var2) {
-      if (var1.world0 != 0) {
-         if (var2.world0 == 0) {
-            return this.field936 ? -1 : 1;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      if (var1.world != 0) {
+         if (var2.world == 0) {
+            return this.reversed ? -1 : 1;
          }
-      } else if (var2.world0 != 0) {
-         return this.field936 ? 1 : -1;
+      } else if (var2.world != 0) {
+         return this.reversed ? 1 : -1;
       }
 
-      return this.method12(var1, var2);
+      return this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method347((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("jk")
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index 58325e9817..2ce3abcc8f 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -18,10 +18,11 @@ public class UserComparator6 extends AbstractUserComparator {
    )
    static Widget field937;
    @ObfuscatedName("m")
-   final boolean field938;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator6(boolean var1) {
-      this.field938 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -29,14 +30,13 @@ public class UserComparator6 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "750521759"
    )
-   int method348(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0 ? (this.field938 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method348((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index 72f05177c9..a0c6b7e792 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -10,10 +10,11 @@ import net.runelite.rs.Reflection;
 @Implements("UserComparator7")
 public class UserComparator7 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean field939;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator7(boolean var1) {
-      this.field939 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -21,14 +22,13 @@ public class UserComparator7 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-9252550"
    )
-   int method349(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0 ? (this.field939 ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method349((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("q")
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index a5a40b8595..f997c45574 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean field940;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator8(boolean var1) {
-      this.field940 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +19,21 @@ public class UserComparator8 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "0"
    )
-   int method350(Buddy var1, Buddy var2) {
-      if (Client.worldId == var1.world0) {
-         if (var2.world0 != Client.worldId) {
-            return this.field940 ? -1 : 1;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      if (Client.worldId == var1.world) {
+         if (var2.world != Client.worldId) {
+            return this.reversed ? -1 : 1;
          }
-      } else if (var2.world0 == Client.worldId) {
-         return this.field940 ? 1 : -1;
+      } else if (var2.world == Client.worldId) {
+         return this.reversed ? 1 : -1;
       }
 
-      return this.method12(var1, var2);
+      return this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method350((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("ke")
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index 7ccd37d150..fedabeaa4c 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator9")
 public class UserComparator9 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean field941;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator9(boolean var1) {
-      this.field941 = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +20,13 @@ public class UserComparator9 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "1966780392"
    )
-   int method351(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId ? (this.field941 ? var1.username().compareTo0(var2.username()) : var2.username().compareTo0(var1.username())) : this.method12(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.method351((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("m")
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index d8672c62b7..1db071698b 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -283,7 +283,7 @@ public abstract class UserList {
    )
    @Export("mapPut")
    final void mapPut(User user) {
-      this.usernamesMap.put(user.username0, user);
+      this.usernamesMap.put(user.username, user);
       if (user.previousUsername != null) {
          User var2 = (User)this.previousUsernamesMap.put(user.previousUsername, user);
          if (var2 != null && var2 != user) {
@@ -327,7 +327,7 @@ public abstract class UserList {
       if (this.comparator == null) {
          this.comparator = var1;
       } else if (this.comparator instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.comparator).method11(var1);
+         ((AbstractUserComparator)this.comparator).addComparator(var1);
       }
 
    }
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index 0f56c052da..e9d4e0cf48 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -10,8 +10,8 @@ public class Username implements Comparable {
    @Export("Interpreter_intLocals")
    static int[] Interpreter_intLocals;
    @ObfuscatedName("m")
-   @Export("name0")
-   String name0;
+   @Export("name")
+   String name;
    @ObfuscatedName("f")
    @Export("cleanName")
    String cleanName;
@@ -20,7 +20,7 @@ public class Username implements Comparable {
       signature = "(Ljava/lang/String;Llx;)V"
    )
    public Username(String var1, LoginType var2) {
-      this.name0 = var1;
+      this.name = var1;
       this.cleanName = Message.method1229(var1, var2);
    }
 
@@ -31,7 +31,7 @@ public class Username implements Comparable {
    )
    @Export("getName")
    public String getName() {
-      return this.name0;
+      return this.name;
    }
 
    @ObfuscatedName("f")
@@ -49,39 +49,33 @@ public class Username implements Comparable {
       signature = "(Lkp;B)I",
       garbageValue = "8"
    )
-   @Export("compareTo0")
-   public int compareTo0(Username other) {
+   @Export("compareToTyped")
+   public int compareToTyped(Username other) {
       return this.cleanName == null ? (other.cleanName == null ? 0 : 1) : (other.cleanName == null ? -1 : this.cleanName.compareTo(other.cleanName));
    }
 
-   @Export("equals")
-   @ObfuscatedName("equals")
    public boolean equals(Object var1) {
       if (var1 instanceof Username) {
          Username var2 = (Username)var1;
          if (this.cleanName == null) {
             return var2.cleanName == null;
          } else {
-            return var2.cleanName != null && this.method352() == var2.method352() && this.cleanName.equals(var2.cleanName);
+            return var2.cleanName != null && this.hashCode() == var2.hashCode() && this.cleanName.equals(var2.cleanName);
          }
       } else {
          return false;
       }
    }
 
-   @ObfuscatedName("hashCode")
-   public int method352() {
+   public int hashCode() {
       return this.cleanName == null ? 0 : this.cleanName.hashCode();
    }
 
-   @ObfuscatedName("toString")
-   public String method353() {
+   public String toString() {
       return this.getName();
    }
 
-   @Export("compareTo")
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo0((Username)var1);
+      return this.compareToTyped((Username)var1);
    }
 }
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index 416de63972..6a64bd9e0d 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -171,7 +171,7 @@ public class Varcs {
                if (var7 instanceof Integer) {
                   var2 += 4;
                } else if (var7 instanceof String) {
-                  var2 += WorldMapRegion.method550((String)var7);
+                  var2 += WorldMapRegion.stringCp1252NullTerminatedByteSize((String)var7);
                }
 
                ++var3;
@@ -392,7 +392,7 @@ public class Varcs {
       for (var6 = 0; var6 < 4; ++var6) {
          for (var7 = 0; var7 < 64; ++var7) {
             for (int var11 = 0; var11 < 64; ++var11) {
-               TotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0);
+               GrandExchangeOfferTotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0);
             }
          }
       }
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index d4f7ddae7e..11fb4c6deb 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -582,7 +582,8 @@ public class Widget extends Node {
    @Export("onSubChange")
    public Object[] onSubChange;
    @ObfuscatedName("ee")
-   public Object[] field975;
+   @Export("onResize")
+   public Object[] onResize;
    @ObfuscatedName("eq")
    @Export("onStockTransmit")
    public Object[] onStockTransmit;
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index e18f167bf5..2de1441c4f 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -158,8 +158,8 @@ public class WorldMap {
    )
    int field994;
    @ObfuscatedName("ah")
-   @Export("perpetualFlash0")
-   boolean perpetualFlash0;
+   @Export("perpetualFlash")
+   boolean perpetualFlash;
    @ObfuscatedName("ak")
    @Export("flashingElements")
    HashSet flashingElements;
@@ -282,7 +282,7 @@ public class WorldMap {
       this.worldMapDisplayY = -1;
       this.field993 = 3;
       this.field994 = 50;
-      this.perpetualFlash0 = false;
+      this.perpetualFlash = false;
       this.flashingElements = null;
       this.field995 = -1;
       this.field996 = -1;
@@ -374,7 +374,7 @@ public class WorldMap {
                var13 = (AbstractWorldMapIcon)var12.next();
                var11.add(var13);
                var14 = new ScriptEvent();
-               var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2);
+               var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
                var14.setArgs(new Object[]{var15, var1, var2});
                if (this.field1010.contains(var13)) {
                   var14.setType(17);
@@ -389,7 +389,7 @@ public class WorldMap {
                var13 = (AbstractWorldMapIcon)var12.next();
                if (!var11.contains(var13)) {
                   var14 = new ScriptEvent();
-                  var15 = new WorldMapEvent(var13.element(), var13.coord1, var13.coord2);
+                  var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
                   var14.setArgs(new Object[]{var15, var1, var2});
                   var14.setType(16);
                   AbstractArchive.runScript(var14);
@@ -438,8 +438,8 @@ public class WorldMap {
    @ObfuscatedName("o")
    void method362(int var1, int var2, boolean var3, long var4) {
       if (this.currentMapArea != null) {
-         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.method377() * this.zoom / 2.0F) / this.zoom);
-         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.method378() * this.zoom / 2.0F) / this.zoom);
+         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom);
+         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom);
          this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64);
          if (this.mouseCoord != null && var3) {
             int var8;
@@ -746,7 +746,7 @@ public class WorldMap {
                ++this.field995;
             }
 
-            if (this.field995 >= this.field993 && !this.perpetualFlash0) {
+            if (this.field995 >= this.field993 && !this.perpetualFlash) {
                this.flashingElements = null;
             }
          }
@@ -800,8 +800,8 @@ public class WorldMap {
          float var10 = 1.0F;
          var8 = (int)((float)var8 / var10);
          var9 = (int)((float)var9 / var10);
-         int var11 = this.method374() - var5 / 2 - var7;
-         int var12 = this.method375() - var6 / 2 - var7;
+         int var11 = this.getDisplayX() - var5 / 2 - var7;
+         int var12 = this.getDisplayY() - var6 / 2 - var7;
          int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050;
          int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013));
          if (this.method368(var8, var9, var13, var14, var3, var4)) {
@@ -811,8 +811,8 @@ public class WorldMap {
                this.sprite = new Sprite(var8, var9);
             }
 
-            this.field1012 = this.method374() - var5 / 2 - var7;
-            this.field1013 = this.method375() - var6 / 2 - var7;
+            this.field1012 = this.getDisplayX() - var5 / 2 - var7;
+            this.field1013 = this.getDisplayY() - var6 / 2 - var7;
             this.field1011 = this.worldMapManager.field1050;
             ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10);
             this.field1014 = Client.field104;
@@ -942,10 +942,10 @@ public class WorldMap {
       garbageValue = "1820000123"
    )
    @Export("setWorldMapPositionTarget")
-   public void setWorldMapPositionTarget(int var1, int var2) {
-      if (this.currentMapArea != null && this.currentMapArea.containsPosition(var1, var2)) {
-         this.worldMapTargetX = var1 - this.currentMapArea.minX() * 64;
-         this.worldMapTargetY = var2 - this.currentMapArea.minY() * 64;
+   public void setWorldMapPositionTarget(int x, int y) {
+      if (this.currentMapArea != null && this.currentMapArea.containsPosition(x, y)) {
+         this.worldMapTargetX = x - this.currentMapArea.minX() * 64;
+         this.worldMapTargetY = y - this.currentMapArea.minY() * 64;
       }
 
    }
@@ -955,9 +955,10 @@ public class WorldMap {
       signature = "(III)V",
       garbageValue = "-2147142500"
    )
-   public void method371(int var1, int var2) {
+   @Export("setWorldMapPositionTargetInstant")
+   public void setWorldMapPositionTargetInstant(int x, int y) {
       if (this.currentMapArea != null) {
-         this.setWorldMapPosition(var1 - this.currentMapArea.minX() * 64, var2 - this.currentMapArea.minY() * 64, true);
+         this.setWorldMapPosition(x - this.currentMapArea.minX() * 64, y - this.currentMapArea.minY() * 64, true);
          this.worldMapTargetX = -1;
          this.worldMapTargetY = -1;
       }
@@ -969,9 +970,10 @@ public class WorldMap {
       signature = "(IIIB)V",
       garbageValue = "-40"
    )
-   public void method372(int var1, int var2, int var3) {
+   @Export("jumpToSourceCoord")
+   public void jumpToSourceCoord(int plane, int x, int y) {
       if (this.currentMapArea != null) {
-         int[] var4 = this.currentMapArea.position(var1, var2, var3);
+         int[] var4 = this.currentMapArea.position(plane, x, y);
          if (var4 != null) {
             this.setWorldMapPositionTarget(var4[0], var4[1]);
          }
@@ -984,11 +986,12 @@ public class WorldMap {
       signature = "(IIII)V",
       garbageValue = "1808854561"
    )
-   public void method373(int var1, int var2, int var3) {
+   @Export("jumpToSourceCoordInstant")
+   public void jumpToSourceCoordInstant(int plane, int x, int y) {
       if (this.currentMapArea != null) {
-         int[] var4 = this.currentMapArea.position(var1, var2, var3);
+         int[] var4 = this.currentMapArea.position(plane, x, y);
          if (var4 != null) {
-            this.method371(var4[0], var4[1]);
+            this.setWorldMapPositionTargetInstant(var4[0], var4[1]);
          }
       }
 
@@ -999,7 +1002,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-659556919"
    )
-   public int method374() {
+   @Export("getDisplayX")
+   public int getDisplayX() {
       return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64;
    }
 
@@ -1008,7 +1012,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "1893257871"
    )
-   public int method375() {
+   @Export("getDisplayY")
+   public int getDisplayY() {
       return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64;
    }
 
@@ -1017,8 +1022,9 @@ public class WorldMap {
       signature = "(I)Lhu;",
       garbageValue = "-2005824064"
    )
-   public Coord method376() {
-      return this.currentMapArea == null ? null : this.currentMapArea.coord(this.method374(), this.method375());
+   @Export("getDisplayCoord")
+   public Coord getDisplayCoord() {
+      return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY());
    }
 
    @ObfuscatedName("ap")
@@ -1026,7 +1032,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "442119278"
    )
-   public int method377() {
+   @Export("getDisplayWith")
+   public int getDisplayWith() {
       return this.worldMapDisplayWidth;
    }
 
@@ -1035,7 +1042,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-2065910749"
    )
-   public int method378() {
+   @Export("getDisplayHeight")
+   public int getDisplayHeight() {
       return this.worldMapDisplayHeight;
    }
 
@@ -1086,9 +1094,9 @@ public class WorldMap {
       signature = "(ZI)V",
       garbageValue = "1025207933"
    )
-   @Export("perpetualFlash")
-   public void perpetualFlash(boolean var1) {
-      this.perpetualFlash0 = var1;
+   @Export("setPerpetualFlash")
+   public void setPerpetualFlash(boolean var1) {
+      this.perpetualFlash = var1;
    }
 
    @ObfuscatedName("aa")
@@ -1247,12 +1255,12 @@ public class WorldMap {
                }
 
                AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next();
-               WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element());
+               WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement());
                var11 = false;
 
                for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) {
                   if (var13.strings[var14] != null) {
-                     Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.element(), var12.coord1.packed(), var12.coord2.packed());
+                     Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.getElement(), var12.coord1.packed(), var12.coord2.packed());
                      var11 = true;
                   }
                }
@@ -1381,7 +1389,7 @@ public class WorldMap {
             }
 
             var1 = (AbstractWorldMapIcon)this.iconIterator.next();
-         } while(var1.element() == -1);
+         } while(var1.getElement() == -1);
 
          return var1;
       }
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index 6aa284a9ff..4c259a1f69 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -132,7 +132,7 @@ public class WorldMapAreaData extends WorldMapArea {
          var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          var3 = false;
       } else {
-         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       int var5;
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index e5977c7fd7..fa307bd627 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -11,7 +11,8 @@ public class WorldMapElement extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractArchive field1019;
+   @Export("WorldMapElement_archive")
+   public static AbstractArchive WorldMapElement_archive;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -272,7 +273,7 @@ public class WorldMapElement extends DualNode {
          if (var2 != null) {
             return var2;
          } else {
-            var2 = class322.readSprite(field1019, var1, 0);
+            var2 = class322.readSprite(WorldMapElement_archive, var1, 0);
             if (var2 != null) {
                WorldMapElement_cachedSprites.put(var2, (long)var1);
             }
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index 40e3e92b0d..77adb62209 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -47,7 +47,7 @@ public class WorldMapEvent {
       garbageValue = "-782761258"
    )
    public static int method780(int var0) {
-      return UnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]);
+      return GrandExchangeOfferUnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]);
    }
 
    @ObfuscatedName("iy")
@@ -69,10 +69,10 @@ public class WorldMapEvent {
          int var9 = ViewportMouse.ViewportMouse_entityCount;
          if (var8 >= var9) {
             if (-1L != var4) {
-               var8 = UnitPriceComparator.method134(var4);
+               var8 = GrandExchangeOfferUnitPriceComparator.method134(var4);
                int var29 = (int)(var4 >>> 7 & 127L);
                Player var11 = Client.players[Client.combatTargetPlayerIndex];
-               TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29);
+               GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29);
             }
 
             return;
@@ -164,7 +164,7 @@ public class WorldMapEvent {
                      for (var30 = 0; var30 < var31; ++var30) {
                         var34 = Client.players[var22[var30]];
                         if (var34 != null && var34.x == var23.x && var34.y == var23.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
+                           GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
                         }
                      }
                   }
@@ -192,13 +192,13 @@ public class WorldMapEvent {
                      for (var30 = 0; var30 < var31; ++var30) {
                         var34 = Client.players[var22[var30]];
                         if (var34 != null && var34 != var33 && var34.x == var33.x && var34.y == var33.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
+                           GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
                         }
                      }
                   }
 
                   if (var17 != Client.combatTargetPlayerIndex) {
-                     TotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15);
+                     GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15);
                   } else {
                      var4 = var10;
                   }
diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java
index fb95ef0345..002ffe1a56 100644
--- a/runescape-client/src/main/java/WorldMapIcon1.java
+++ b/runescape-client/src/main/java/WorldMapIcon1.java
@@ -32,13 +32,14 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -1722323621
    )
-   final int field1031;
+   @Export("element")
+   final int element;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Laj;"
    )
-   @Export("label0")
-   final WorldMapLabel label0;
+   @Export("label")
+   final WorldMapLabel label;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 364253793
@@ -55,9 +56,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    )
    WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
       super(var1, var2);
-      this.field1031 = var3;
-      this.label0 = var4;
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.element());
+      this.element = var3;
+      this.label = var4;
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.getElement());
       Sprite var6 = var5.getSprite(false);
       if (var6 != null) {
          this.field1032 = var6.subWidth;
@@ -74,8 +75,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int element() {
-      return this.field1031;
+   @Export("getElement")
+   public int getElement() {
+      return this.element;
    }
 
    @ObfuscatedName("f")
@@ -83,8 +85,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel label() {
-      return this.label0;
+   @Export("getLabel")
+   WorldMapLabel getLabel() {
+      return this.label;
    }
 
    @ObfuscatedName("q")
diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java
index 342b053130..7138ead64f 100644
--- a/runescape-client/src/main/java/WorldMapIcon2.java
+++ b/runescape-client/src/main/java/WorldMapIcon2.java
@@ -23,13 +23,14 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -25914375
    )
-   int field1036;
+   @Export("element")
+   int element;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Laj;"
    )
-   @Export("label0")
-   WorldMapLabel label0;
+   @Export("label")
+   WorldMapLabel label;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 927871683
@@ -56,8 +57,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int element() {
-      return this.field1036;
+   @Export("getElement")
+   public int getElement() {
+      return this.element;
    }
 
    @ObfuscatedName("f")
@@ -65,8 +67,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel label() {
-      return this.label0;
+   @Export("getLabel")
+   WorldMapLabel getLabel() {
+      return this.label;
    }
 
    @ObfuscatedName("q")
@@ -93,9 +96,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       garbageValue = "-806344204"
    )
    void method399() {
-      this.field1036 = class50.getObjectDefinition(this.field1034).transform().mapIconId;
-      this.label0 = this.field1035.method420(ViewportMouse.getWorldMapElement(this.field1036));
-      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.element());
+      this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId;
+      this.label = this.field1035.method420(ViewportMouse.getWorldMapElement(this.element));
+      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement());
       Sprite var2 = var1.getSprite(false);
       if (var2 != null) {
          this.field1037 = var2.subWidth;
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 525708dfec..1d30cddb90 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -200,11 +200,11 @@ public class WorldMapLabel {
       garbageValue = "1459100828"
    )
    @Export("compareWorlds")
-   static int compareWorlds(World var0, World var1, int mode, boolean var3) {
+   static int compareWorlds(World var0, World var1, int mode, boolean reversed) {
       if (mode == 1) {
          int var4 = var0.population;
          int var5 = var1.population;
-         if (!var3) {
+         if (!reversed) {
             if (var4 == -1) {
                var4 = 2001;
             }
@@ -216,7 +216,7 @@ public class WorldMapLabel {
 
          return var4 - var5;
       } else {
-         return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (var3 ? -1 : 1)) : (var1.activity.equals("-") ? (var3 ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id)))));
+         return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (reversed ? -1 : 1)) : (var1.activity.equals("-") ? (reversed ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id)))));
       }
    }
 
@@ -241,7 +241,7 @@ public class WorldMapLabel {
          int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
          var0 -= WorldMapSection1.cameraX;
          var3 -= GrandExchangeEvents.cameraY;
-         var1 -= class11.cameraZ;
+         var1 -= GrandExchangeOfferNameComparator.cameraZ;
          int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch];
          int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon1.cameraPitch];
          int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode.cameraYaw];
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index 46b9863c80..3c3c0f055c 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -421,7 +421,7 @@ public final class WorldMapManager {
             while (var4.hasNext()) {
                AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
                if (var5.method19()) {
-                  int var6 = var5.element();
+                  int var6 = var5.getElement();
                   if (!this.icons.containsKey(var6)) {
                      LinkedList var7 = new LinkedList();
                      var7.add(var5);
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index e1f8f315aa..dbc5e24dfa 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -221,7 +221,7 @@ public class WorldMapRegion {
       while (var2.hasNext()) {
          WorldMapIcon1 var3 = (WorldMapIcon1)var2.next();
          if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) {
-            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.field1031, this.method419(var3.field1031));
+            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.element, this.method419(var3.element));
             this.iconsList.add(var4);
          }
       }
@@ -348,7 +348,7 @@ public class WorldMapRegion {
       while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
          if (var5.method19()) {
-            int var6 = var5.element();
+            int var6 = var5.getElement();
             if (var1.contains(var6)) {
                WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6);
                this.method414(var7, var5.field5, var5.field6, var2, var3);
@@ -761,7 +761,7 @@ public class WorldMapRegion {
          if (var12 != null && var12.method19()) {
             var12.field5 = var10;
             var12.field6 = var11;
-            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.element());
+            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement());
             if (!var3.contains(var13.method390())) {
                this.method415(var12, var10, var11, var5);
             }
@@ -781,7 +781,7 @@ public class WorldMapRegion {
       while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
          if (var5.method19()) {
-            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.element());
+            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement());
             if (var6 != null && var1.contains(var6.method390())) {
                this.method414(var6, var5.field5, var5.field6, var2, var3);
             }
@@ -813,7 +813,7 @@ public class WorldMapRegion {
       garbageValue = "-1283733783"
    )
    void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.element());
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.getElement());
       this.method416(var5, var2, var3);
       this.method417(var1, var5, var2, var3, var4);
    }
@@ -839,7 +839,7 @@ public class WorldMapRegion {
       garbageValue = "-1237576843"
    )
    void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
-      WorldMapLabel var6 = var1.label();
+      WorldMapLabel var6 = var1.getLabel();
       if (var6 != null && var6.size.method400(var5)) {
          Font var7 = (Font)this.fonts.get(var6.size);
          var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2);
@@ -863,7 +863,7 @@ public class WorldMapRegion {
             int var9 = var7.coord2.y % 64;
             var7.field5 = (int)((float)var8 * var5 + (float)var1);
             var7.field6 = (int)(var5 * (float)(63 - var9) + (float)var2);
-            if (!var3.contains(var7.element())) {
+            if (!var3.contains(var7.getElement())) {
                this.method415(var7, var7.field5, var7.field6, var5);
             }
          }
@@ -1040,7 +1040,8 @@ public class WorldMapRegion {
       signature = "(Ljava/lang/String;I)I",
       garbageValue = "1877870965"
    )
-   public static int method550(String var0) {
+   @Export("stringCp1252NullTerminatedByteSize")
+   public static int stringCp1252NullTerminatedByteSize(String var0) {
       return var0.length() + 1;
    }
 
diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java
index d5bdacfad1..3122fa5e65 100644
--- a/runescape-client/src/main/java/WorldMapSection3.java
+++ b/runescape-client/src/main/java/WorldMapSection3.java
@@ -253,10 +253,10 @@ public class WorldMapSection3 implements WorldMapSection {
          Client.viewportWidget = component;
       }
 
-      if (var3 && component.field975 != null && (var4 != component.width || var5 != component.height)) {
+      if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) {
          ScriptEvent var6 = new ScriptEvent();
          var6.widget = component;
-         var6.args0 = component.field975;
+         var6.args0 = component.onResize;
          Client.scriptEvents.addFirst(var6);
       }
 
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index d0e2ea0201..f22ace252c 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -87,9 +87,10 @@ public enum WorldMapSectionType implements Enumerated {
       signature = "(IZIZI)V",
       garbageValue = "2102950996"
    )
-   static void method248(int var0, boolean var1, int var2, boolean var3) {
+   @Export("sortWorlds")
+   static void sortWorlds(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
       if (ItemContainer.worlds != null) {
-         class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3);
+         class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
       }
 
    }
@@ -100,7 +101,7 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "-1520594673"
    )
    static int method253(int var0, Script var1, boolean var2) {
-      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       if (var0 == ScriptOpcodes.CC_GETX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
          return 1;
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index 38525130c7..7a52970d1d 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -84,7 +84,7 @@ final class class1 implements class0 {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          var4 = Huffman.getWidget(var3);
       } else {
-         var4 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       if (var0 == ScriptOpcodes.CC_SETPOSITION) {
@@ -124,7 +124,7 @@ final class class1 implements class0 {
       } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
          var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
-      } else if (var0 == 1006) {
+      } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
          var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
       } else {
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index 4706aa5295..fb13bb6aae 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -57,23 +57,23 @@ public class class13 {
       int var4 = 0;
       int var5 = 0;
       if (var0.type == 0) {
-         var1 = class65.scene.method290(var0.level, var0.x, var0.y);
+         var1 = class65.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
       }
 
       if (var0.type == 1) {
-         var1 = class65.scene.method291(var0.level, var0.x, var0.y);
+         var1 = class65.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
       }
 
       if (var0.type == 2) {
-         var1 = class65.scene.method292(var0.level, var0.x, var0.y);
+         var1 = class65.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
       }
 
       if (var0.type == 3) {
-         var1 = class65.scene.getFloorDecorationTag(var0.level, var0.x, var0.y);
+         var1 = class65.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
       }
 
       if (var1 != 0L) {
-         int var6 = class65.scene.getObjectFlags(var0.level, var0.x, var0.y, var1);
+         int var6 = class65.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
          var3 = HitSplatDefinition.method4972(var1);
          var4 = var6 & 31;
          var5 = var6 >> 6 & 3;
diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java
index 658ded8e00..58d72f6461 100644
--- a/runescape-client/src/main/java/class159.java
+++ b/runescape-client/src/main/java/class159.java
@@ -35,11 +35,12 @@ public enum class159 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 458308007
    )
-   final int field1981;
+   @Export("id")
+   final int id;
 
    private class159(int var3, int var4) {
       this.field1984 = var3;
-      this.field1981 = var4;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -49,7 +50,7 @@ public enum class159 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field1981;
+      return this.id;
    }
 
    @ObfuscatedName("d")
@@ -57,7 +58,8 @@ public enum class159 implements Enumerated {
       signature = "(CI)Z",
       garbageValue = "1176730001"
    )
-   public static boolean method3394(char var0) {
+   @Export("isCharDigit")
+   public static boolean isCharDigit(char var0) {
       return var0 >= '0' && var0 <= '9';
    }
 }
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index 58cc3cb806..6b30dbe49d 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -62,7 +62,7 @@ public class class16 {
       garbageValue = "1394688825"
    )
    static int method188(int var0, Script var1, boolean var2) {
-      Widget var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3));
          return 1;
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
index e5cc8b1886..51e80c8a4b 100644
--- a/runescape-client/src/main/java/class171.java
+++ b/runescape-client/src/main/java/class171.java
@@ -234,7 +234,7 @@ public class class171 {
                   RectangleMode.method6028(ObjectSound.archive2, class40.archive7, Client.isLowDetail);
                   IsaacCipher.method4082(ObjectSound.archive2, class40.archive7);
                   var30 = ObjectSound.archive2;
-                  StructDefinition.field885 = var30;
+                  StructDefinition.StructDefinition_archive = var30;
                   Archive var5 = ObjectSound.archive2;
                   Archive var6 = class40.archive7;
                   boolean var7 = Client.isMembersWorld;
@@ -254,7 +254,7 @@ public class class171 {
                   Archive var13 = class40.archive7;
                   SpotAnimationDefinition.SpotAnimationDefinition_archive = var12;
                   SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13;
-                  UnitPriceComparator.method135(ObjectSound.archive2);
+                  GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2);
                   Archive var14 = ObjectSound.archive2;
                   VarpDefinition.field943 = var14;
                   VarpDefinition.field944 = VarpDefinition.field943.method4(16);
@@ -274,7 +274,7 @@ public class class171 {
                   EnumDefinition.EnumDefinition_archive = var20;
                   Frames.method3241(ObjectSound.archive2);
                   Archive var21 = ObjectSound.archive2;
-                  ParamDefinition.field679 = var21;
+                  ParamDefinition.ParamDefinition_archive = var21;
                   class196.varcs = new Varcs();
                   class60.method1172(ObjectSound.archive2, WorldMapSection3.archive8, ByteArrayPool.archive13);
                   Archive var22 = ObjectSound.archive2;
@@ -283,7 +283,7 @@ public class class171 {
                   HealthBarDefinition.field380 = var23;
                   Archive var24 = ObjectSound.archive2;
                   Archive var25 = WorldMapSection3.archive8;
-                  WorldMapElement.field1019 = var25;
+                  WorldMapElement.WorldMapElement_archive = var25;
                   if (var24.method2()) {
                      UserComparator4.WorldMapElement_count = var24.method4(35);
                      Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count];
@@ -304,8 +304,8 @@ public class class171 {
                }
             } else if (Client.titleLoadingStage == 80) {
                var0 = 0;
-               if (UnitPriceComparator.compass == null) {
-                  UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0);
+               if (GrandExchangeOfferUnitPriceComparator.compass == null) {
+                  GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection3.archive8, class211.spriteIds.field878, 0);
                } else {
                   ++var0;
                }
diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java
index 64d8241dc3..5931b7aa83 100644
--- a/runescape-client/src/main/java/class196.java
+++ b/runescape-client/src/main/java/class196.java
@@ -18,7 +18,7 @@ public class class196 {
       garbageValue = "125"
    )
    static int method3736(int var0, Script var1, boolean var2) {
-      return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? class11.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? class11.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? class11.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? WorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? OwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2))))))))))))))))))))))))))))))))))));
+      return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? class211.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2))))))))))))))))))))))))))))))))))));
    }
 
    @ObfuscatedName("u")
diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java
index c122f6cba3..fe7e8011c0 100644
--- a/runescape-client/src/main/java/class204.java
+++ b/runescape-client/src/main/java/class204.java
@@ -73,9 +73,9 @@ public class class204 {
                      var17 = var14;
                   }
 
-                  TotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7);
+                  GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7);
                } else {
-                  TotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0);
+                  GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0);
                }
             }
          }
diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/class211.java
index 7832a23c92..b017a4cdb1 100644
--- a/runescape-client/src/main/java/class211.java
+++ b/runescape-client/src/main/java/class211.java
@@ -125,7 +125,7 @@ public class class211 {
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) {
                      var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var7) ? 1 : 0;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.isCharPrintable((char)var7) ? 1 : 0;
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) {
                      var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
@@ -133,11 +133,11 @@ public class class211 {
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) {
                      var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var7) ? 1 : 0;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.isCharAlphabetic((char)var7) ? 1 : 0;
                      return 1;
                   } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) {
                      var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var7) ? 1 : 0;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.isCharDigit((char)var7) ? 1 : 0;
                      return 1;
                   } else if (var0 == ScriptOpcodes.STRING_LENGTH) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@@ -185,7 +185,7 @@ public class class211 {
                      var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8);
                      return 1;
-                  } else if (var0 == 4122) {
+                  } else if (var0 == ScriptOpcodes.UPPERCASE) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase();
                      return 1;
diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/class22.java
index ea8a07849e..59bb98f81f 100644
--- a/runescape-client/src/main/java/class22.java
+++ b/runescape-client/src/main/java/class22.java
@@ -112,7 +112,7 @@ public final class class22 {
       SpriteMask var4 = var0.getSpriteMask(false);
       if (var4 != null) {
          if (Client.minimapState < 3) {
-            UnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
+            GrandExchangeOfferUnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
          } else {
             Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
          }
diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java
index b1772ff91e..b42c492b72 100644
--- a/runescape-client/src/main/java/class227.java
+++ b/runescape-client/src/main/java/class227.java
@@ -299,7 +299,7 @@ public class class227 {
                      long var33;
                      if (var5 == 5) {
                         var25 = 16;
-                        var33 = var6.method290(var0, var1, var2);
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
                         if (var33 != 0L) {
                            var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2;
                         }
@@ -313,7 +313,7 @@ public class class227 {
                         var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21);
                      } else if (var5 == 6) {
                         var25 = 8;
-                        var33 = var6.method290(var0, var1, var2);
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
                         if (var33 != 0L) {
                            var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2;
                         }
@@ -336,7 +336,7 @@ public class class227 {
                         var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, 256, var22, 0, 0, var19, var21);
                      } else if (var5 == 8) {
                         var25 = 8;
-                        var33 = var6.method290(var0, var1, var2);
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
                         if (var33 != 0L) {
                            var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2;
                         }
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
index 05806fa845..45b2567226 100644
--- a/runescape-client/src/main/java/class229.java
+++ b/runescape-client/src/main/java/class229.java
@@ -19,7 +19,7 @@ public class class229 {
       if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = ParamDefinition.field679.takeFile(11, var0);
+         byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0);
          var1 = new ParamDefinition();
          if (var2 != null) {
             var1.decode(new Buffer(var2));
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
index f3e00fb049..83ad2b9478 100644
--- a/runescape-client/src/main/java/class248.java
+++ b/runescape-client/src/main/java/class248.java
@@ -243,14 +243,14 @@ public class class248 {
             if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
                var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                if (FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field373, var5);
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geItemNameComparator, var5);
                }
 
                return 1;
             } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
                var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                if (FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field372, var5);
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geUnitPriceComparator, var5);
                }
 
                return 1;
@@ -259,22 +259,22 @@ public class class248 {
                var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1;
                boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
                if (FloorDecoration.grandExchangeEvents != null) {
-                  Client.field159.field666 = var13;
-                  FloorDecoration.grandExchangeEvents.sort(Client.field159, var5);
+                  Client.geOwnWorldComparator.compareOwnWorld = var13;
+                  FloorDecoration.grandExchangeEvents.sort(Client.geOwnWorldComparator, var5);
                }
 
                return 1;
             } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
                var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                if (FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field371, var5);
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geAgeComparator, var5);
                }
 
                return 1;
             } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
                var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                if (FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.field374, var5);
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geTotalQuantityComparator, var5);
                }
 
                return 1;
@@ -291,12 +291,12 @@ public class class248 {
                } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method119();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getOfferName();
                   return 1;
                } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.method120();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousOfferName();
                   return 1;
                } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/class249.java
index 5693e89cd6..dc09ff3081 100644
--- a/runescape-client/src/main/java/class249.java
+++ b/runescape-client/src/main/java/class249.java
@@ -30,11 +30,12 @@ public enum class249 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 1686539261
    )
-   final int field3276;
+   @Export("id")
+   final int id;
 
    private class249(int var3, int var4) {
       this.field3275 = var3;
-      this.field3276 = var4;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -44,6 +45,6 @@ public enum class249 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field3276;
+      return this.id;
    }
 }
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
index cf4d55d817..c020bc70dd 100644
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -42,7 +42,7 @@ public class class258 {
       PendingSpawn var9 = null;
 
       for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) {
-         if (var0 == var10.level && var10.x == var1 && var2 == var10.y && var3 == var10.type) {
+         if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) {
             var9 = var10;
             break;
          }
@@ -50,7 +50,7 @@ public class class258 {
 
       if (var9 == null) {
          var9 = new PendingSpawn();
-         var9.level = var0;
+         var9.plane = var0;
          var9.type = var3;
          var9.x = var1;
          var9.y = var2;
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/class266.java
index 530e82e647..275ac90a19 100644
--- a/runescape-client/src/main/java/class266.java
+++ b/runescape-client/src/main/java/class266.java
@@ -33,11 +33,12 @@ public enum class266 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -1327532101
    )
-   final int field3530;
+   @Export("id")
+   final int id;
 
    private class266(int var3, int var4) {
       this.field3528 = var3;
-      this.field3530 = var4;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -47,7 +48,7 @@ public enum class266 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field3530;
+      return this.id;
    }
 
    @ObfuscatedName("ft")
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index 70a71e1b02..98d7e65ec0 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -116,29 +116,30 @@ public class class3 implements Enumerated {
       signature = "(IIIZIZI)V",
       garbageValue = "653716649"
    )
-   static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-      if (var0 < var1) {
-         int var6 = (var0 + var1) / 2;
-         int var7 = var0;
+   @Export("doWorldSorting")
+   static void doWorldSorting(int lowestUnsorted, int highestUnsorted, int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
+      if (lowestUnsorted < highestUnsorted) {
+         int var6 = (lowestUnsorted + highestUnsorted) / 2;
+         int var7 = lowestUnsorted;
          World var8 = ItemContainer.worlds[var6];
-         ItemContainer.worlds[var6] = ItemContainer.worlds[var1];
-         ItemContainer.worlds[var1] = var8;
+         ItemContainer.worlds[var6] = ItemContainer.worlds[highestUnsorted];
+         ItemContainer.worlds[highestUnsorted] = var8;
 
-         for (int var9 = var0; var9 < var1; ++var9) {
+         for (int var9 = lowestUnsorted; var9 < highestUnsorted; ++var9) {
             World var10 = ItemContainer.worlds[var9];
-            int var11 = WorldMapLabel.compareWorlds(var10, var8, var2, var3);
+            int var11 = WorldMapLabel.compareWorlds(var10, var8, primaryMode, primaryReversed);
             int var12;
             if (var11 != 0) {
-               if (var3) {
+               if (primaryReversed) {
                   var12 = -var11;
                } else {
                   var12 = var11;
                }
-            } else if (var4 == -1) {
+            } else if (secondaryMode == -1) {
                var12 = 0;
             } else {
-               int var13 = WorldMapLabel.compareWorlds(var10, var8, var4, var5);
-               if (var5) {
+               int var13 = WorldMapLabel.compareWorlds(var10, var8, secondaryMode, secondaryReversed);
+               if (secondaryReversed) {
                   var12 = -var13;
                } else {
                   var12 = var13;
@@ -152,10 +153,10 @@ public class class3 implements Enumerated {
             }
          }
 
-         ItemContainer.worlds[var1] = ItemContainer.worlds[var7];
+         ItemContainer.worlds[highestUnsorted] = ItemContainer.worlds[var7];
          ItemContainer.worlds[var7] = var8;
-         method42(var0, var7 - 1, var2, var3, var4, var5);
-         method42(var7 + 1, var1, var2, var3, var4, var5);
+         doWorldSorting(lowestUnsorted, var7 - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
+         doWorldSorting(var7 + 1, highestUnsorted, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
       }
 
    }
@@ -299,7 +300,7 @@ public class class3 implements Enumerated {
          }
 
          var1.exportIndex();
-         WorldComparator.method67(var1);
+         GrandExchangeOfferWorldComparator.method67(var1);
 
          for (var13 = 0; var13 < Client.field211; ++var13) {
             var3 = Client.field212[var13];
diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java
index 4d678dc0bb..ad52fd4fdb 100644
--- a/runescape-client/src/main/java/class31.java
+++ b/runescape-client/src/main/java/class31.java
@@ -137,9 +137,9 @@ public class class31 {
                boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
                var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
                boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
-               WorldMapSectionType.method248(var6, var9, var5, var10);
+               WorldMapSectionType.sortWorlds(var6, var9, var5, var10);
                return 1;
-            } else if (var0 != 6511) {
+            } else if (var0 != ScriptOpcodes.GETWORLDINFO) {
                if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
                   Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
@@ -188,14 +188,14 @@ public class class31 {
                      var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                      var8 = class229.getParamDefinition(var7);
                      if (var8.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var6).getStringParam(var7, var8.defaultStr);
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getStringParam(var7, var8.defaultStr);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var6).getIntParam(var7, var8.defaultInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getIntParam(var7, var8.defaultInt);
                      }
 
                      return 1;
                   } else if (var0 == ScriptOpcodes.ON_MOBILE) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field162 ? 1 : 0;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
                      return 1;
                   } else if (var0 == ScriptOpcodes.CLIENTTYPE) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3;
@@ -258,7 +258,7 @@ public class class31 {
    static final void method574(String var0) {
       if (!var0.equals("")) {
          PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
-         var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
+         var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0));
          var1.packetBuffer.writeStringCp1252NullTerminated(var0);
          Client.packetWriter.method241(var1);
       }
diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java
index d0224db34b..5bce438bb1 100644
--- a/runescape-client/src/main/java/class32.java
+++ b/runescape-client/src/main/java/class32.java
@@ -25,7 +25,7 @@ public class class32 {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       class22.method295(var3);
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index 4d9ae2fc98..b23775676d 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -124,7 +124,7 @@ final class class4 implements class0 {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-               Widget var12 = var2 ? WorldMapIcon1.field1030 : class12.field1111;
+               Widget var12 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
                Players.clickWidget(var12, var7, var4);
                return 1;
             } else if (var0 == ScriptOpcodes.MOUSECAM) {
@@ -161,7 +161,7 @@ final class class4 implements class0 {
                      return 1;
                   } else {
                      PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher);
-                     var10.packetBuffer.writeShort(1 + WorldMapRegion.method550(var6) + WorldMapRegion.method550(var9));
+                     var10.packetBuffer.writeShort(1 + WorldMapRegion.stringCp1252NullTerminatedByteSize(var6) + WorldMapRegion.stringCp1252NullTerminatedByteSize(var9));
                      var10.packetBuffer.writeStringCp1252NullTerminated(var6);
                      var10.packetBuffer.writeByte(var7);
                      var10.packetBuffer.writeStringCp1252NullTerminated(var9);
@@ -224,10 +224,10 @@ final class class4 implements class0 {
                } else if (var0 == ScriptOpcodes.GETTAPTODROP) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0;
                   return 1;
-               } else if (var0 == 3129) {
+               } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  Client.field197 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                  Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                   return 1;
                } else if (var0 == 3130) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
@@ -263,7 +263,7 @@ final class class4 implements class0 {
                   return 1;
                } else if (var0 == 3140) {
                   Client.field151 = 3;
-                  Client.field153 = var2 ? WorldMapIcon1.field1030.id : class12.field1111.id;
+                  Client.field153 = var2 ? WorldMapIcon1.field1030.id : GrandExchangeOfferAgeComparator.field1111.id;
                   return 1;
                } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
                   var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
@@ -287,7 +287,7 @@ final class class4 implements class0 {
                   return 1;
                } else if (var0 == 3145) {
                   return 1;
-               } else if (var0 == 3146) {
+               } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) {
                   var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
                      ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
@@ -295,7 +295,7 @@ final class class4 implements class0 {
                   }
 
                   return 1;
-               } else if (var0 == 3147) {
+               } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled ? 0 : 1;
                   return 1;
                } else if (var0 == 3148) {
diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java
index 2352c15295..5e353ec340 100644
--- a/runescape-client/src/main/java/class40.java
+++ b/runescape-client/src/main/java/class40.java
@@ -757,7 +757,7 @@ public class class40 {
 
          WorldMapSection1.cameraX = var6 - var11;
          GrandExchangeEvents.cameraY = var14 - var12;
-         class11.cameraZ = var15 - var16;
+         GrandExchangeOfferNameComparator.cameraZ = var15 - var16;
          WorldMapIcon1.cameraPitch = var4;
          MusicPatchNode.cameraYaw = var13;
          if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
@@ -774,14 +774,14 @@ public class class40 {
       }
 
       if (!Client.isCameraLocked) {
-         var4 = UnitPriceComparator.method131();
+         var4 = GrandExchangeOfferUnitPriceComparator.method131();
       } else {
          var4 = Login.method2061();
       }
 
       var13 = WorldMapSection1.cameraX;
       var6 = GrandExchangeEvents.cameraY;
-      var14 = class11.cameraZ;
+      var14 = GrandExchangeOfferNameComparator.cameraZ;
       var15 = WorldMapIcon1.cameraPitch;
       var22 = MusicPatchNode.cameraYaw;
 
@@ -797,7 +797,7 @@ public class class40 {
             }
 
             if (var24 == 2) {
-               class11.cameraZ += var9;
+               GrandExchangeOfferNameComparator.cameraZ += var9;
             }
 
             if (var24 == 3) {
@@ -842,12 +842,12 @@ public class class40 {
       class13.playPcmPlayers();
       var10 = Rasterizer3D.Rasterizer3D_zoom;
       Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
-      class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, class11.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4);
+      class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4);
       Rasterizer3D.Rasterizer3D_zoom = var10;
       class13.playPcmPlayers();
       class65.scene.clearTempGameObjects();
       UrlRequester.method3258(var0, var1, var2, var3);
-      UnitPriceComparator.method136(var0, var1);
+      GrandExchangeOfferUnitPriceComparator.method136(var0, var1);
       ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183);
       Client.field208 = 0;
       var11 = (Canvas.localPlayer.x >> 7) + class50.baseX;
@@ -866,7 +866,7 @@ public class class40 {
 
       WorldMapSection1.cameraX = var13;
       GrandExchangeEvents.cameraY = var6;
-      class11.cameraZ = var14;
+      GrandExchangeOfferNameComparator.cameraZ = var14;
       WorldMapIcon1.cameraPitch = var15;
       MusicPatchNode.cameraYaw = var22;
       if (Client.isLoading) {
diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java
index f57969ae3a..7519252f20 100644
--- a/runescape-client/src/main/java/class54.java
+++ b/runescape-client/src/main/java/class54.java
@@ -672,19 +672,19 @@ public final class class54 {
                return 1;
             } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
                var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().method371(var5.x, var5.y);
+               BufferedFile.worldMap().setWorldMapPositionTargetInstant(var5.x, var5.y);
                return 1;
             } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
                var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().method372(var5.plane, var5.x, var5.y);
+               BufferedFile.worldMap().jumpToSourceCoord(var5.plane, var5.x, var5.y);
                return 1;
             } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
                var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().method373(var5.plane, var5.x, var5.y);
+               BufferedFile.worldMap().jumpToSourceCoordInstant(var5.plane, var5.x, var5.y);
                return 1;
             } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method374();
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method375();
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayX();
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayY();
                return 1;
             } else {
                WorldMapArea var6;
@@ -737,7 +737,7 @@ public final class class54 {
 
                   return 1;
                } else if (var0 == 6615) {
-                  var5 = BufferedFile.worldMap().method376();
+                  var5 = BufferedFile.worldMap().getDisplayCoord();
                   if (var5 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
@@ -794,13 +794,13 @@ public final class class54 {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                         var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var8, false);
+                        GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, false);
                         return 1;
                      } else if (var0 == 6620) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                         var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var8, true);
+                        GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, true);
                         return 1;
                      } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
@@ -815,8 +815,8 @@ public final class class54 {
                            return 1;
                         }
                      } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method377();
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().method378();
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayWith();
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayHeight();
                         return 1;
                      } else if (var0 == 6623) {
                         var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
@@ -844,7 +844,7 @@ public final class class54 {
                         boolean var9;
                         if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
                            var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                           BufferedFile.worldMap().perpetualFlash(var9);
+                           BufferedFile.worldMap().setPerpetualFlash(var9);
                            return 1;
                         } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
                            var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
@@ -906,7 +906,7 @@ public final class class54 {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement();
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
@@ -917,7 +917,7 @@ public final class class54 {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.element();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement();
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
@@ -1097,7 +1097,7 @@ public final class class54 {
 
          var2 = 0;
          if (var11 >= 0 || var10 != 0) {
-            var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.field197 : Client.oculusOrbNormalSpeed;
+            var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed;
             var2 *= 16;
             Client.field195 = var11;
             Client.field196 = var10;
diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
index 8e3084a0a7..1c6980a8b4 100644
--- a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
+++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
@@ -42,6 +42,7 @@ public class ScriptOpcodes {
    public static final int CC_SETSIZE = 1001;
    public static final int CC_SETHIDE = 1003;
    public static final int CC_SETNOCLICKTHROUGH = 1005;
+   public static final int CC_SETNOSCROLLTHROUGH = 1006;
    public static final int CC_SETSCROLLPOS = 1100;
    public static final int CC_SETCOLOUR = 1101;
    public static final int CC_SETFILL = 1102;
@@ -251,11 +252,14 @@ public class ScriptOpcodes {
    public static final int SETSHOWLOADINGMESSAGES = 3126;
    public static final int SETTAPTODROP = 3127;
    public static final int GETTAPTODROP = 3128;
+   public static final int SETOCULUSORBSPEED = 3129;
    public static final int GETCANVASSIZE = 3132;
    public static final int SETHIDEUSERNAME = 3141;
    public static final int GETHIDEUSERNAME = 3142;
    public static final int SETREMEMBERUSERNAME = 3143;
    public static final int GETREMEMBERUSERNAME = 3144;
+   public static final int SETTITLEMUSICENABLED = 3146;
+   public static final int GETTITLEMUSICENABLED = 3147;
    public static final int SOUND_SYNTH = 3200;
    public static final int SOUND_SONG = 3201;
    public static final int SOUND_JINGLE = 3202;
@@ -375,6 +379,7 @@ public class ScriptOpcodes {
    public static final int REMOVETAGS = 4119;
    public static final int STRING_INDEXOF_CHAR = 4120;
    public static final int STRING_INDEXOF_STRING = 4121;
+   public static final int UPPERCASE = 4122;
    public static final int OC_NAME = 4200;
    public static final int OC_OP = 4201;
    public static final int OC_IOP = 4202;
@@ -425,6 +430,7 @@ public class ScriptOpcodes {
    public static final int WORLDLIST_NEXT = 6502;
    public static final int WORLDLIST_SPECIFIC = 6506;
    public static final int WORLDLIST_SORT = 6507;
+   public static final int GETWORLDINFO = 6511;
    public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
    public static final int NC_PARAM = 6513;
    public static final int LC_PARAM = 6514;