diff --git a/client/src/main/java/BufferedFile.java b/client/src/main/java/BufferedFile.java
index a522d06..ce82cea 100644
--- a/client/src/main/java/BufferedFile.java
+++ b/client/src/main/java/BufferedFile.java
@@ -10,280 +10,280 @@ import org.openrs2.deob.annotation.Pc;
 public final class BufferedFile {
 
 	@OriginalMember(owner = "client!en", name = "m", descriptor = "J")
-	private long aLong67;
+	private long physicalPosition;
 
 	@OriginalMember(owner = "client!en", name = "v", descriptor = "I")
-	private int anInt1906;
+	private int readLen;
 
 	@OriginalMember(owner = "client!en", name = "p", descriptor = "J")
-	private long aLong68 = -1L;
+	private long writePosition = -1L;
 
 	@OriginalMember(owner = "client!en", name = "g", descriptor = "I")
-	private int anInt1899 = 0;
+	private int writeLen = 0;
 
 	@OriginalMember(owner = "client!en", name = "w", descriptor = "J")
-	private long aLong69 = -1L;
+	private long readPosition = -1L;
 
 	@OriginalMember(owner = "client!en", name = "s", descriptor = "Lsignlink!qm;")
-	private final FileOnDisk aClass214_1;
+	private final FileOnDisk file;
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "J")
-	private long aLong64;
+	private long physicalLength;
 
 	@OriginalMember(owner = "client!en", name = "j", descriptor = "J")
-	private long aLong65;
+	private long virtualLength;
 
 	@OriginalMember(owner = "client!en", name = "q", descriptor = "[B")
-	private final byte[] aByteArray20;
+	private final byte[] writeBuffer;
 
 	@OriginalMember(owner = "client!en", name = "b", descriptor = "[B")
-	private final byte[] aByteArray19;
+	private final byte[] readBuffer;
 
 	@OriginalMember(owner = "client!en", name = "k", descriptor = "J")
-	private long aLong66;
+	private long virtualPosition;
 
 	@OriginalMember(owner = "client!en", name = "<init>", descriptor = "(Lsignlink!qm;II)V")
-	public BufferedFile(@OriginalArg(0) FileOnDisk arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) throws IOException {
-		this.aClass214_1 = arg0;
-		this.aLong65 = this.aLong64 = arg0.length();
-		this.aByteArray20 = new byte[arg2];
-		this.aByteArray19 = new byte[arg1];
-		this.aLong66 = 0L;
+	public BufferedFile(@OriginalArg(0) FileOnDisk file, @OriginalArg(1) int readBufferSize, @OriginalArg(2) int writeBufferSize) throws IOException {
+		this.file = file;
+		this.virtualLength = this.physicalLength = file.length();
+		this.writeBuffer = new byte[writeBufferSize];
+		this.readBuffer = new byte[readBufferSize];
+		this.virtualPosition = 0L;
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(B)V")
-	private void method1450() throws IOException {
-		if (this.aLong68 == -1L) {
+	private void flush() throws IOException {
+		if (this.writePosition == -1L) {
 			return;
 		}
-		if (this.aLong68 != this.aLong67) {
-			this.aClass214_1.seek(this.aLong68);
-			this.aLong67 = this.aLong68;
+		if (this.writePosition != this.physicalPosition) {
+			this.file.seek(this.writePosition);
+			this.physicalPosition = this.writePosition;
 		}
-		this.aClass214_1.write(this.aByteArray20, this.anInt1899, 0);
-		@Pc(45) long local45 = -1L;
-		if (this.aLong69 <= this.aLong68 && this.aLong69 + (long) this.anInt1906 > this.aLong68) {
-			local45 = this.aLong68;
-		} else if (this.aLong68 <= this.aLong69 && this.aLong69 < this.aLong68 + (long) this.anInt1899) {
-			local45 = this.aLong69;
+		this.file.write(this.writeBuffer, this.writeLen, 0);
+		@Pc(45) long start = -1L;
+		if (this.readPosition <= this.writePosition && this.readPosition + (long) this.readLen > this.writePosition) {
+			start = this.writePosition;
+		} else if (this.writePosition <= this.readPosition && this.readPosition < this.writePosition + (long) this.writeLen) {
+			start = this.readPosition;
 		}
-		this.aLong67 += this.anInt1899;
-		if (this.aLong64 < this.aLong67) {
-			this.aLong64 = this.aLong67;
+		this.physicalPosition += this.writeLen;
+		if (this.physicalLength < this.physicalPosition) {
+			this.physicalLength = this.physicalPosition;
 		}
-		@Pc(118) long local118 = -1L;
-		if (this.aLong69 < this.aLong68 + (long) this.anInt1899 && (long) this.anInt1906 + this.aLong69 >= (long) this.anInt1899 + this.aLong68) {
-			local118 = this.aLong68 + (long) this.anInt1899;
-		} else if (this.aLong69 + (long) this.anInt1906 > this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) this.anInt1906 + this.aLong69) {
-			local118 = (long) this.anInt1906 + this.aLong69;
+		@Pc(118) long end = -1L;
+		if (this.readPosition < this.writePosition + (long) this.writeLen && (long) this.readLen + this.readPosition >= (long) this.writeLen + this.writePosition) {
+			end = this.writePosition + (long) this.writeLen;
+		} else if (this.readPosition + (long) this.readLen > this.writePosition && (long) this.writeLen + this.writePosition >= (long) this.readLen + this.readPosition) {
+			end = (long) this.readLen + this.readPosition;
 		}
-		if (local45 > -1L && local118 > local45) {
-			@Pc(208) int local208 = (int) (local118 - local45);
-			Static289.method2612(this.aByteArray20, (int) (local45 - this.aLong68), this.aByteArray19, (int) (local45 - this.aLong69), local208);
+		if (start > -1L && end > start) {
+			@Pc(208) int copyLen = (int) (end - start);
+			Static289.copy(this.writeBuffer, (int) (start - this.writePosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
 		}
-		this.anInt1899 = 0;
-		this.aLong68 = -1L;
+		this.writeLen = 0;
+		this.writePosition = -1L;
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(I)J")
-	public final long method1451() {
-		return this.aLong65;
+	public final long length() {
+		return this.virtualLength;
 	}
 
 	@OriginalMember(owner = "client!en", name = "b", descriptor = "(I)Ljava/io/File;")
-	private File method1452() {
-		return this.aClass214_1.getFile();
+	private File getFile() {
+		return this.file.getFile();
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(I[BII)V")
-	public final void method1453(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2) throws IOException {
+	public final void read(@OriginalArg(0) int off, @OriginalArg(1) byte[] b, @OriginalArg(2) int len) throws IOException {
 		try {
-			if (arg2 > arg1.length) {
-				throw new ArrayIndexOutOfBoundsException(arg2 - arg1.length);
+			if (len > b.length) {
+				throw new ArrayIndexOutOfBoundsException(len - b.length);
 			}
-			if (this.aLong68 != -1L && this.aLong66 >= this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) arg2 + this.aLong66) {
-				Static289.method2612(this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg1, 0, arg2);
-				this.aLong66 += arg2;
+			if (this.writePosition != -1L && this.virtualPosition >= this.writePosition && (long) this.writeLen + this.writePosition >= (long) len + this.virtualPosition) {
+				Static289.copy(this.writeBuffer, (int) (this.virtualPosition - this.writePosition), b, 0, len);
+				this.virtualPosition += len;
 				return;
 			}
-			@Pc(71) long local71 = this.aLong66;
-			@Pc(75) int local75 = arg2;
-			@Pc(102) int local102;
-			if (this.aLong69 <= this.aLong66 && this.aLong69 + (long) this.anInt1906 > this.aLong66) {
-				local102 = (int) ((long) this.anInt1906 + this.aLong69 - this.aLong66);
-				if (local102 > arg2) {
-					local102 = arg2;
+			@Pc(71) long originalPosition = this.virtualPosition;
+			@Pc(75) int originalLen = len;
+			@Pc(102) int n;
+			if (this.readPosition <= this.virtualPosition && this.readPosition + (long) this.readLen > this.virtualPosition) {
+				n = (int) ((long) this.readLen + this.readPosition - this.virtualPosition);
+				if (n > len) {
+					n = len;
 				}
-				Static289.method2612(this.aByteArray19, (int) (this.aLong66 - this.aLong69), arg1, 0, local102);
-				arg0 = local102;
-				arg2 -= local102;
-				this.aLong66 += local102;
+				Static289.copy(this.readBuffer, (int) (this.virtualPosition - this.readPosition), b, 0, n);
+				off = n;
+				len -= n;
+				this.virtualPosition += n;
 			}
-			if (this.aByteArray19.length < arg2) {
-				this.aClass214_1.seek(this.aLong66);
-				this.aLong67 = this.aLong66;
-				while (arg2 > 0) {
-					local102 = this.aClass214_1.read(arg0, arg2, arg1);
-					if (local102 == -1) {
+			if (this.readBuffer.length < len) {
+				this.file.seek(this.virtualPosition);
+				this.physicalPosition = this.virtualPosition;
+				while (len > 0) {
+					n = this.file.read(off, len, b);
+					if (n == -1) {
 						break;
 					}
-					this.aLong67 += local102;
-					arg2 -= local102;
-					arg0 += local102;
-					this.aLong66 += local102;
+					this.physicalPosition += n;
+					len -= n;
+					off += n;
+					this.virtualPosition += n;
 				}
-			} else if (arg2 > 0) {
-				this.method1456();
-				local102 = arg2;
-				if (arg2 > this.anInt1906) {
-					local102 = this.anInt1906;
+			} else if (len > 0) {
+				this.fill();
+				n = len;
+				if (len > this.readLen) {
+					n = this.readLen;
 				}
-				Static289.method2612(this.aByteArray19, 0, arg1, arg0, local102);
-				arg2 -= local102;
-				arg0 += local102;
-				this.aLong66 += local102;
+				Static289.copy(this.readBuffer, 0, b, off, n);
+				len -= n;
+				off += n;
+				this.virtualPosition += n;
 			}
-			if (this.aLong68 != -1L) {
-				if (this.aLong66 < this.aLong68 && arg2 > 0) {
-					local102 = (int) (this.aLong68 - this.aLong66) + arg0;
-					if (arg0 + arg2 < local102) {
-						local102 = arg0 + arg2;
+			if (this.writePosition != -1L) {
+				if (this.virtualPosition < this.writePosition && len > 0) {
+					n = (int) (this.writePosition - this.virtualPosition) + off;
+					if (off + len < n) {
+						n = off + len;
 					}
-					while (arg0 < local102) {
-						arg1[arg0++] = 0;
-						this.aLong66++;
-						arg2--;
+					while (off < n) {
+						b[off++] = 0;
+						this.virtualPosition++;
+						len--;
 					}
 				}
-				@Pc(298) long local298 = -1L;
-				@Pc(300) long local300 = -1L;
-				if ((long) this.anInt1899 + this.aLong68 > local71 && (long) local75 + local71 >= (long) this.anInt1899 + this.aLong68) {
-					local300 = (long) this.anInt1899 + this.aLong68;
-				} else if (this.aLong68 < (long) local75 + local71 && (long) this.anInt1899 + this.aLong68 >= (long) local75 + local71) {
-					local300 = (long) local75 + local71;
+				@Pc(298) long end = -1L;
+				@Pc(300) long start = -1L;
+				if ((long) this.writeLen + this.writePosition > originalPosition && (long) originalLen + originalPosition >= (long) this.writeLen + this.writePosition) {
+					start = (long) this.writeLen + this.writePosition;
+				} else if (this.writePosition < (long) originalLen + originalPosition && (long) this.writeLen + this.writePosition >= (long) originalLen + originalPosition) {
+					start = (long) originalLen + originalPosition;
 				}
-				if (local71 <= this.aLong68 && local71 + (long) local75 > this.aLong68) {
-					local298 = this.aLong68;
-				} else if (local71 >= this.aLong68 && local71 < (long) this.anInt1899 + this.aLong68) {
-					local298 = local71;
+				if (originalPosition <= this.writePosition && originalPosition + (long) originalLen > this.writePosition) {
+					end = this.writePosition;
+				} else if (originalPosition >= this.writePosition && originalPosition < (long) this.writeLen + this.writePosition) {
+					end = originalPosition;
 				}
-				if (local298 > -1L && local300 > local298) {
-					@Pc(426) int local426 = (int) (local300 - local298);
-					Static289.method2612(this.aByteArray20, (int) (local298 - this.aLong68), arg1, (int) (local298 - local71), local426);
-					if (this.aLong66 < local300) {
-						arg2 = (int) ((long) arg2 + this.aLong66 - local300);
-						this.aLong66 = local300;
+				if (end > -1L && start > end) {
+					@Pc(426) int copyLen = (int) (start - end);
+					Static289.copy(this.writeBuffer, (int) (end - this.writePosition), b, (int) (end - originalPosition), copyLen);
+					if (this.virtualPosition < start) {
+						len = (int) ((long) len + this.virtualPosition - start);
+						this.virtualPosition = start;
 					}
 				}
 			}
-		} catch (@Pc(464) IOException local464) {
-			this.aLong67 = -1L;
-			throw local464;
+		} catch (@Pc(464) IOException ex) {
+			this.physicalPosition = -1L;
+			throw ex;
 		}
-		if (arg2 > 0) {
+		if (len > 0) {
 			throw new EOFException();
 		}
 	}
 
 	@OriginalMember(owner = "client!en", name = "b", descriptor = "(Z)V")
 	public final void method1455() throws IOException {
-		this.method1450();
-		this.aClass214_1.close();
+		this.flush();
+		this.file.close();
 	}
 
 	@OriginalMember(owner = "client!en", name = "c", descriptor = "(I)V")
-	private void method1456() throws IOException {
-		this.anInt1906 = 0;
-		if (this.aLong67 != this.aLong66) {
-			this.aClass214_1.seek(this.aLong66);
-			this.aLong67 = this.aLong66;
+	private void fill() throws IOException {
+		this.readLen = 0;
+		if (this.physicalPosition != this.virtualPosition) {
+			this.file.seek(this.virtualPosition);
+			this.physicalPosition = this.virtualPosition;
 		}
-		this.aLong69 = this.aLong66;
-		while (this.aByteArray19.length > this.anInt1906) {
-			@Pc(49) int local49 = this.aByteArray19.length - this.anInt1906;
-			if (local49 > 200000000) {
-				local49 = 200000000;
+		this.readPosition = this.virtualPosition;
+		while (this.readBuffer.length > this.readLen) {
+			@Pc(49) int len = this.readBuffer.length - this.readLen;
+			if (len > 200000000) {
+				len = 200000000;
 			}
-			@Pc(66) int local66 = this.aClass214_1.read(this.anInt1906, local49, this.aByteArray19);
-			if (local66 == -1) {
+			@Pc(66) int n = this.file.read(this.readLen, len, this.readBuffer);
+			if (n == -1) {
 				break;
 			}
-			this.aLong67 += local66;
-			this.anInt1906 += local66;
+			this.physicalPosition += n;
+			this.readLen += n;
 		}
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(Z[B)V")
-	public final void method1457(@OriginalArg(1) byte[] arg0) throws IOException {
-		this.method1453(0, arg0, arg0.length);
+	public final void read(@OriginalArg(1) byte[] b) throws IOException {
+		this.read(0, b, b.length);
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "([BIII)V")
-	public final void method1458(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) throws IOException {
+	public final void write(@OriginalArg(0) byte[] b, @OriginalArg(1) int off, @OriginalArg(3) int len) throws IOException {
 		try {
-			if (this.aLong65 < (long) arg2 + this.aLong66) {
-				this.aLong65 = (long) arg2 + this.aLong66;
+			if (this.virtualLength < (long) len + this.virtualPosition) {
+				this.virtualLength = (long) len + this.virtualPosition;
 			}
-			if (this.aLong68 != -1L && (this.aLong68 > this.aLong66 || this.aLong66 > (long) this.anInt1899 + this.aLong68)) {
-				this.method1450();
+			if (this.writePosition != -1L && (this.writePosition > this.virtualPosition || this.virtualPosition > (long) this.writeLen + this.writePosition)) {
+				this.flush();
 			}
-			if (this.aLong68 != -1L && (long) this.aByteArray20.length + this.aLong68 < (long) arg2 + this.aLong66) {
-				@Pc(90) int local90 = (int) ((long) this.aByteArray20.length + this.aLong68 - this.aLong66);
-				arg2 -= local90;
-				Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), local90);
-				this.aLong66 += local90;
-				this.anInt1899 = this.aByteArray20.length;
-				this.method1450();
-				arg1 += local90;
+			if (this.writePosition != -1L && (long) this.writeBuffer.length + this.writePosition < (long) len + this.virtualPosition) {
+				@Pc(90) int n = (int) ((long) this.writeBuffer.length + this.writePosition - this.virtualPosition);
+				len -= n;
+				Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), n);
+				this.virtualPosition += n;
+				this.writeLen = this.writeBuffer.length;
+				this.flush();
+				off += n;
 			}
-			if (this.aByteArray20.length < arg2) {
-				if (this.aLong66 != this.aLong67) {
-					this.aClass214_1.seek(this.aLong66);
-					this.aLong67 = this.aLong66;
+			if (this.writeBuffer.length < len) {
+				if (this.virtualPosition != this.physicalPosition) {
+					this.file.seek(this.virtualPosition);
+					this.physicalPosition = this.virtualPosition;
 				}
-				this.aClass214_1.write(arg0, arg2, arg1);
-				@Pc(165) long local165 = -1L;
-				if (this.aLong69 <= this.aLong66 && (long) this.anInt1906 + this.aLong69 > this.aLong66) {
-					local165 = this.aLong66;
-				} else if (this.aLong66 <= this.aLong69 && (long) arg2 + this.aLong66 > this.aLong69) {
-					local165 = this.aLong69;
+				this.file.write(b, len, off);
+				@Pc(165) long start = -1L;
+				if (this.readPosition <= this.virtualPosition && (long) this.readLen + this.readPosition > this.virtualPosition) {
+					start = this.virtualPosition;
+				} else if (this.virtualPosition <= this.readPosition && (long) len + this.virtualPosition > this.readPosition) {
+					start = this.readPosition;
 				}
-				this.aLong67 += arg2;
-				@Pc(226) long local226 = -1L;
-				if (this.aLong64 < this.aLong67) {
-					this.aLong64 = this.aLong67;
+				this.physicalPosition += len;
+				@Pc(226) long end = -1L;
+				if (this.physicalLength < this.physicalPosition) {
+					this.physicalLength = this.physicalPosition;
 				}
-				if (this.aLong66 + (long) arg2 > this.aLong69 && this.aLong66 + (long) arg2 <= this.aLong69 - -((long) this.anInt1906)) {
-					local226 = (long) arg2 + this.aLong66;
-				} else if (this.aLong69 + (long) this.anInt1906 > this.aLong66 && this.aLong66 + (long) arg2 >= (long) this.anInt1906 + this.aLong69) {
-					local226 = (long) this.anInt1906 + this.aLong69;
+				if (this.virtualPosition + (long) len > this.readPosition && this.virtualPosition + (long) len <= this.readPosition - -((long) this.readLen)) {
+					end = (long) len + this.virtualPosition;
+				} else if (this.readPosition + (long) this.readLen > this.virtualPosition && this.virtualPosition + (long) len >= (long) this.readLen + this.readPosition) {
+					end = (long) this.readLen + this.readPosition;
 				}
-				if (local165 > -1L && local226 > local165) {
-					@Pc(324) int local324 = (int) (local226 - local165);
-					Static289.method2612(arg0, (int) (local165 + (long) arg1 - this.aLong66), this.aByteArray19, (int) (local165 - this.aLong69), local324);
+				if (start > -1L && end > start) {
+					@Pc(324) int copyLen = (int) (end - start);
+					Static289.copy(b, (int) (start + (long) off - this.virtualPosition), this.readBuffer, (int) (start - this.readPosition), copyLen);
 				}
-				this.aLong66 += arg2;
-			} else if (arg2 > 0) {
-				if (this.aLong68 == -1L) {
-					this.aLong68 = this.aLong66;
+				this.virtualPosition += len;
+			} else if (len > 0) {
+				if (this.writePosition == -1L) {
+					this.writePosition = this.virtualPosition;
 				}
-				Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg2);
-				this.aLong66 += arg2;
-				if ((long) this.anInt1899 < this.aLong66 - this.aLong68) {
-					this.anInt1899 = (int) (this.aLong66 - this.aLong68);
+				Static289.copy(b, off, this.writeBuffer, (int) (this.virtualPosition - this.writePosition), len);
+				this.virtualPosition += len;
+				if ((long) this.writeLen < this.virtualPosition - this.writePosition) {
+					this.writeLen = (int) (this.virtualPosition - this.writePosition);
 				}
 			}
-		} catch (@Pc(414) IOException local414) {
-			this.aLong67 = -1L;
-			throw local414;
+		} catch (@Pc(414) IOException ex) {
+			this.physicalPosition = -1L;
+			throw ex;
 		}
 	}
 
 	@OriginalMember(owner = "client!en", name = "a", descriptor = "(IJ)V")
-	public final void method1459(@OriginalArg(1) long arg0) throws IOException {
-		if (arg0 < 0L) {
-			throw new IOException("Invalid seek to " + arg0 + " in file " + this.method1452());
+	public final void seek(@OriginalArg(1) long offset) throws IOException {
+		if (offset < 0L) {
+			throw new IOException("Invalid seek to " + offset + " in file " + this.getFile());
 		}
-		this.aLong66 = arg0;
+		this.virtualPosition = offset;
 	}
 }
diff --git a/client/src/main/java/BufferedImageFrameBuffer.java b/client/src/main/java/BufferedImageFrameBuffer.java
index 5a8cc86..153d580 100644
--- a/client/src/main/java/BufferedImageFrameBuffer.java
+++ b/client/src/main/java/BufferedImageFrameBuffer.java
@@ -16,34 +16,34 @@ import org.openrs2.deob.annotation.Pc;
 public final class BufferedImageFrameBuffer extends FrameBuffer {
 
 	@OriginalMember(owner = "client!ti", name = "p", descriptor = "Ljava/awt/Component;")
-	private Component aComponent1;
+	private Component component;
 
 	@OriginalMember(owner = "client!ti", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
 	@Override
-	public final void method4186(@OriginalArg(2) Graphics arg0) {
-		arg0.drawImage(this.anImage4, 0, 0, this.aComponent1);
+	public final void draw(@OriginalArg(2) Graphics graphics) {
+		graphics.drawImage(this.image, 0, 0, this.component);
 	}
 
 	@OriginalMember(owner = "client!ti", name = "a", descriptor = "(IZILjava/awt/Component;)V")
 	@Override
-	public final void method4192(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
-		this.anIntArray472 = new int[arg1 * arg0 + 1];
-		this.anInt5339 = arg0;
-		this.anInt5341 = arg1;
-		@Pc(22) DataBufferInt local22 = new DataBufferInt(this.anIntArray472, this.anIntArray472.length);
-		@Pc(30) DirectColorModel local30 = new DirectColorModel(32, 16711680, 65280, 255);
-		@Pc(40) WritableRaster local40 = Raster.createWritableRaster(local30.createCompatibleSampleModel(this.anInt5341, this.anInt5339), local22, null);
-		this.anImage4 = new BufferedImage(local30, local40, false, new Hashtable());
-		this.aComponent1 = arg2;
-		this.method4189();
+	public final void init(@OriginalArg(0) int height, @OriginalArg(2) int width, @OriginalArg(3) Component component) {
+		this.pixels = new int[width * height + 1];
+		this.height = height;
+		this.width = width;
+		@Pc(22) DataBufferInt buffer = new DataBufferInt(this.pixels, this.pixels.length);
+		@Pc(30) DirectColorModel model = new DirectColorModel(32, 16711680, 65280, 255);
+		@Pc(40) WritableRaster raster = Raster.createWritableRaster(model.createCompatibleSampleModel(this.width, this.height), buffer, null);
+		this.image = new BufferedImage(model, raster, false, new Hashtable());
+		this.component = component;
+		this.makeTarget();
 	}
 
 	@OriginalMember(owner = "client!ti", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")
 	@Override
-	public final void method4191(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Graphics arg3, @OriginalArg(5) int arg4) {
-		@Pc(2) Shape local2 = arg3.getClip();
-		arg3.clipRect(arg1, arg4, arg0, arg2);
-		arg3.drawImage(this.anImage4, 0, 0, this.aComponent1);
-		arg3.setClip(local2);
+	public final void method4191(@OriginalArg(0) int width, @OriginalArg(1) int x, @OriginalArg(3) int height, @OriginalArg(4) Graphics graphics, @OriginalArg(5) int y) {
+		@Pc(2) Shape clip = graphics.getClip();
+		graphics.clipRect(x, y, width, height);
+		graphics.drawImage(this.image, 0, 0, this.component);
+		graphics.setClip(clip);
 	}
 }
diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java
index bcbf11f..68951ed 100644
--- a/client/src/main/java/BufferedSocket.java
+++ b/client/src/main/java/BufferedSocket.java
@@ -12,43 +12,43 @@ import org.openrs2.deob.annotation.Pc;
 public final class BufferedSocket implements Runnable {
 
 	@OriginalMember(owner = "client!ma", name = "h", descriptor = "[B")
-	private byte[] aByteArray49;
+	private byte[] buffer;
 
 	@OriginalMember(owner = "client!ma", name = "n", descriptor = "Lsignlink!im;")
 	private PrivilegedRequest thread;
 
 	@OriginalMember(owner = "client!ma", name = "l", descriptor = "I")
-	private int anInt3596 = 0;
+	private int readPointer = 0;
 
 	@OriginalMember(owner = "client!ma", name = "b", descriptor = "I")
-	private int anInt3590 = 0;
+	private int writePointer = 0;
 
 	@OriginalMember(owner = "client!ma", name = "v", descriptor = "Z")
-	private boolean aBoolean177 = false;
+	private boolean closed = false;
 
 	@OriginalMember(owner = "client!ma", name = "y", descriptor = "Z")
-	private boolean aBoolean178 = false;
+	private boolean error = false;
 
 	@OriginalMember(owner = "client!ma", name = "r", descriptor = "Lsignlink!ll;")
-	private final SignLink aClass213_5;
+	private final SignLink signLink;
 
 	@OriginalMember(owner = "client!ma", name = "k", descriptor = "Ljava/net/Socket;")
-	private final Socket aSocket1;
+	private final Socket socket;
 
 	@OriginalMember(owner = "client!ma", name = "e", descriptor = "Ljava/io/InputStream;")
-	private InputStream anInputStream1;
+	private InputStream in;
 
 	@OriginalMember(owner = "client!ma", name = "c", descriptor = "Ljava/io/OutputStream;")
-	private OutputStream anOutputStream1;
+	private OutputStream out;
 
 	@OriginalMember(owner = "client!ma", name = "<init>", descriptor = "(Ljava/net/Socket;Lsignlink!ll;)V")
-	public BufferedSocket(@OriginalArg(0) Socket arg0, @OriginalArg(1) SignLink arg1) throws IOException {
-		this.aClass213_5 = arg1;
-		this.aSocket1 = arg0;
-		this.aSocket1.setSoTimeout(30000);
-		this.aSocket1.setTcpNoDelay(true);
-		this.anInputStream1 = this.aSocket1.getInputStream();
-		this.anOutputStream1 = this.aSocket1.getOutputStream();
+	public BufferedSocket(@OriginalArg(0) Socket socket, @OriginalArg(1) SignLink signLink) throws IOException {
+		this.signLink = signLink;
+		this.socket = socket;
+		this.socket.setSoTimeout(30000);
+		this.socket.setTcpNoDelay(true);
+		this.in = this.socket.getInputStream();
+		this.out = this.socket.getOutputStream();
 	}
 
 	@OriginalMember(owner = "client!ma", name = "run", descriptor = "()V")
@@ -56,107 +56,107 @@ public final class BufferedSocket implements Runnable {
 	public final void run() {
 		try {
 			while (true) {
-				@Pc(39) int var1;
-				@Pc(24) int var2;
-				label85: {
+				@Pc(39) int len;
+				@Pc(24) int off;
+				ready: {
 					synchronized (this) {
-						label86: {
-							if (this.anInt3590 == this.anInt3596) {
-								if (this.aBoolean177) {
-									break label86;
+						close: {
+							if (this.writePointer == this.readPointer) {
+								if (this.closed) {
+									break close;
 								}
 								try {
 									this.wait();
-								} catch (@Pc(21) InterruptedException local21) {
+								} catch (@Pc(21) InterruptedException ex) {
 								}
 							}
-							var2 = this.anInt3596;
-							if (this.anInt3596 > this.anInt3590) {
-								var1 = 5000 - this.anInt3596;
+							off = this.readPointer;
+							if (this.readPointer > this.writePointer) {
+								len = 5000 - this.readPointer;
 							} else {
-								var1 = this.anInt3590 - this.anInt3596;
+								len = this.writePointer - this.readPointer;
 							}
-							break label85;
+							break ready;
 						}
 					}
 					try {
-						if (this.anInputStream1 != null) {
-							this.anInputStream1.close();
+						if (this.in != null) {
+							this.in.close();
 						}
-						if (this.anOutputStream1 != null) {
-							this.anOutputStream1.close();
+						if (this.out != null) {
+							this.out.close();
 						}
-						if (this.aSocket1 != null) {
-							this.aSocket1.close();
+						if (this.socket != null) {
+							this.socket.close();
 						}
-					} catch (@Pc(119) IOException local119) {
+					} catch (@Pc(119) IOException ex) {
 					}
-					this.aByteArray49 = null;
+					this.buffer = null;
 					break;
 				}
-				if (var1 > 0) {
+				if (len > 0) {
 					try {
-						this.anOutputStream1.write(this.aByteArray49, var2, var1);
-					} catch (@Pc(67) IOException local67) {
-						this.aBoolean178 = true;
+						this.out.write(this.buffer, off, len);
+					} catch (@Pc(67) IOException ex) {
+						this.error = true;
 					}
-					this.anInt3596 = (var1 + this.anInt3596) % 5000;
+					this.readPointer = (len + this.readPointer) % 5000;
 					try {
-						if (this.anInt3590 == this.anInt3596) {
-							this.anOutputStream1.flush();
+						if (this.writePointer == this.readPointer) {
+							this.out.flush();
 						}
-					} catch (@Pc(92) IOException local92) {
-						this.aBoolean178 = true;
+					} catch (@Pc(92) IOException ex) {
+						this.error = true;
 					}
 				}
 			}
-		} catch (@Pc(124) Exception local124) {
-			Static89.report(null, local124);
+		} catch (@Pc(124) Exception ex) {
+			Static89.report(null, ex);
 		}
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(III[B)V")
-	public final void method2827(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) byte[] arg2) throws IOException {
-		if (this.aBoolean177) {
+	public final void read(@OriginalArg(0) int off, @OriginalArg(1) int len, @OriginalArg(3) byte[] b) throws IOException {
+		if (this.closed) {
 			return;
 		}
-		while (arg1 > 0) {
-			@Pc(23) int local23 = this.anInputStream1.read(arg2, arg0, arg1);
-			if (local23 <= 0) {
+		while (len > 0) {
+			@Pc(23) int n = this.in.read(b, off, len);
+			if (n <= 0) {
 				throw new EOFException();
 			}
-			arg0 += local23;
-			arg1 -= local23;
+			off += n;
+			len -= n;
 		}
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(I)I")
 	public final int read() throws IOException {
-		return this.aBoolean177 ? 0 : this.anInputStream1.read();
+		return this.closed ? 0 : this.in.read();
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(ZI[BI)V")
-	public final void write(@OriginalArg(2) byte[] arg0, @OriginalArg(3) int arg1) throws IOException {
-		if (this.aBoolean177) {
+	public final void write(@OriginalArg(2) byte[] src, @OriginalArg(3) int len) throws IOException {
+		if (this.closed) {
 			return;
 		}
-		if (this.aBoolean178) {
-			this.aBoolean178 = false;
+		if (this.error) {
+			this.error = false;
 			throw new IOException();
 		}
-		if (this.aByteArray49 == null) {
-			this.aByteArray49 = new byte[5000];
+		if (this.buffer == null) {
+			this.buffer = new byte[5000];
 		}
 		synchronized (this) {
-			for (@Pc(34) int local34 = 0; local34 < arg1; local34++) {
-				this.aByteArray49[this.anInt3590] = arg0[local34];
-				this.anInt3590 = (this.anInt3590 + 1) % 5000;
-				if (this.anInt3590 == (this.anInt3596 + 4900) % 5000) {
+			for (@Pc(34) int i = 0; i < len; i++) {
+				this.buffer[this.writePointer] = src[i];
+				this.writePointer = (this.writePointer + 1) % 5000;
+				if (this.writePointer == (this.readPointer + 4900) % 5000) {
 					throw new IOException();
 				}
 			}
 			if (this.thread == null) {
-				this.thread = this.aClass213_5.startThread(3, this);
+				this.thread = this.signLink.startThread(3, this);
 			}
 			this.notifyAll();
 		}
@@ -165,37 +165,37 @@ public final class BufferedSocket implements Runnable {
 	@OriginalMember(owner = "client!ma", name = "finalize", descriptor = "()V")
 	@Override
 	public final void finalize() {
-		this.method2834();
+		this.close();
 	}
 
 	@OriginalMember(owner = "client!ma", name = "c", descriptor = "(I)I")
 	public final int available() throws IOException {
-		return this.aBoolean177 ? 0 : this.anInputStream1.available();
+		return this.closed ? 0 : this.in.available();
 	}
 
 	@OriginalMember(owner = "client!ma", name = "d", descriptor = "(I)V")
-	public final void method2832() throws IOException {
-		if (!this.aBoolean177 && this.aBoolean178) {
-			this.aBoolean178 = false;
+	public final void checkError() throws IOException {
+		if (!this.closed && this.error) {
+			this.error = false;
 			throw new IOException();
 		}
 	}
 
 	@OriginalMember(owner = "client!ma", name = "a", descriptor = "(Z)V")
-	public final void method2833() {
-		if (!this.aBoolean177) {
-			this.anInputStream1 = new BrokenInputStream();
-			this.anOutputStream1 = new BrokenOutputStream();
+	public final void breakConnection() {
+		if (!this.closed) {
+			this.in = new BrokenInputStream();
+			this.out = new BrokenOutputStream();
 		}
 	}
 
 	@OriginalMember(owner = "client!ma", name = "e", descriptor = "(I)V")
-	public final void method2834() {
-		if (this.aBoolean177) {
+	public final void close() {
+		if (this.closed) {
 			return;
 		}
 		synchronized (this) {
-			this.aBoolean177 = true;
+			this.closed = true;
 			this.notifyAll();
 		}
 		if (this.thread != null) {
@@ -205,7 +205,7 @@ public final class BufferedSocket implements Runnable {
 			if (this.thread.status == 1) {
 				try {
 					((Thread) this.thread.result).join();
-				} catch (@Pc(59) InterruptedException local59) {
+				} catch (@Pc(59) InterruptedException ex) {
 				}
 			}
 		}
diff --git a/client/src/main/java/Cache.java b/client/src/main/java/Cache.java
index 6ab374e..d2429e7 100644
--- a/client/src/main/java/Cache.java
+++ b/client/src/main/java/Cache.java
@@ -55,18 +55,18 @@ public final class Cache {
 		synchronized (this.aClass38_1) {
 			try {
 				@Pc(27) Object local27;
-				if (this.aClass38_2.method1451() < (long) (arg0 * 6 + 6)) {
+				if (this.aClass38_2.length() < (long) (arg0 * 6 + 6)) {
 					local27 = null;
 					return (byte[]) local27;
 				}
-				this.aClass38_2.method1459((long) (arg0 * 6));
-				this.aClass38_2.method1453(0, Static271.aByteArray79, 6);
+				this.aClass38_2.seek((long) (arg0 * 6));
+				this.aClass38_2.read(0, Static271.aByteArray79, 6);
 				@Pc(69) int local69 = ((Static271.aByteArray79[3] & 0xFF) << 16) - (-((Static271.aByteArray79[4] & 0xFF) << 8) - (Static271.aByteArray79[5] & 0xFF));
 				@Pc(99) int local99 = (Static271.aByteArray79[2] & 0xFF) + ((Static271.aByteArray79[1] & 0xFF) << 8) + ((Static271.aByteArray79[0] & 0xFF) << 16);
 				if (local99 < 0 || this.anInt2156 < local99) {
 					local27 = null;
 					return (byte[]) local27;
-				} else if (local69 <= 0 || (long) local69 > this.aClass38_1.method1451() / 520L) {
+				} else if (local69 <= 0 || (long) local69 > this.aClass38_1.length() / 520L) {
 					local27 = null;
 					return (byte[]) local27;
 				} else {
@@ -79,11 +79,11 @@ public final class Cache {
 							return (byte[]) local27;
 						}
 						@Pc(157) int local157 = local99 - local136;
-						this.aClass38_1.method1459((long) (local69 * 520));
+						this.aClass38_1.seek((long) (local69 * 520));
 						if (local157 > 512) {
 							local157 = 512;
 						}
-						this.aClass38_1.method1453(0, Static271.aByteArray79, local157 + 8);
+						this.aClass38_1.read(0, Static271.aByteArray79, local157 + 8);
 						@Pc(197) int local197 = ((Static271.aByteArray79[0] & 0xFF) << 8) + (Static271.aByteArray79[1] & 0xFF);
 						@Pc(211) int local211 = (Static271.aByteArray79[3] & 0xFF) + ((Static271.aByteArray79[2] & 0xFF) << 8);
 						@Pc(217) int local217 = Static271.aByteArray79[7] & 0xFF;
@@ -92,7 +92,7 @@ public final class Cache {
 							local27 = null;
 							return (byte[]) local27;
 						}
-						if (local239 < 0 || (long) local239 > this.aClass38_1.method1451() / 520L) {
+						if (local239 < 0 || (long) local239 > this.aClass38_1.length() / 520L) {
 							local27 = null;
 							return (byte[]) local27;
 						}
@@ -119,19 +119,19 @@ public final class Cache {
 				@Pc(67) int local67;
 				@Pc(27) boolean local27;
 				if (arg3) {
-					if (this.aClass38_2.method1451() < (long) (arg1 * 6 + 6)) {
+					if (this.aClass38_2.length() < (long) (arg1 * 6 + 6)) {
 						local27 = false;
 						return local27;
 					}
-					this.aClass38_2.method1459((long) (arg1 * 6));
-					this.aClass38_2.method1453(0, Static271.aByteArray79, 6);
+					this.aClass38_2.seek((long) (arg1 * 6));
+					this.aClass38_2.read(0, Static271.aByteArray79, 6);
 					local67 = ((Static271.aByteArray79[3] & 0xFF) << 16) + (Static271.aByteArray79[4] << 8 & 0xFF00) + (Static271.aByteArray79[5] & 0xFF);
-					if (local67 <= 0 || this.aClass38_1.method1451() / 520L < (long) local67) {
+					if (local67 <= 0 || this.aClass38_1.length() / 520L < (long) local67) {
 						local27 = false;
 						return local27;
 					}
 				} else {
-					local67 = (int) ((this.aClass38_1.method1451() + 519L) / 520L);
+					local67 = (int) ((this.aClass38_1.length() + 519L) / 520L);
 					if (local67 == 0) {
 						local67 = 1;
 					}
@@ -144,17 +144,17 @@ public final class Cache {
 				Static271.aByteArray79[3] = (byte) (local67 >> 16);
 				@Pc(156) int local156 = 0;
 				Static271.aByteArray79[1] = (byte) (arg0 >> 8);
-				this.aClass38_2.method1459((long) (arg1 * 6));
-				this.aClass38_2.method1458(Static271.aByteArray79, 0, 6);
+				this.aClass38_2.seek((long) (arg1 * 6));
+				this.aClass38_2.write(Static271.aByteArray79, 0, 6);
 				while (true) {
 					if (local125 < arg0) {
 						label134: {
 							@Pc(189) int local189 = 0;
 							@Pc(248) int local248;
 							if (arg3) {
-								this.aClass38_1.method1459((long) (local67 * 520));
+								this.aClass38_1.seek((long) (local67 * 520));
 								try {
-									this.aClass38_1.method1453(0, Static271.aByteArray79, 8);
+									this.aClass38_1.read(0, Static271.aByteArray79, 8);
 								} catch (@Pc(209) EOFException local209) {
 									break label134;
 								}
@@ -166,7 +166,7 @@ public final class Cache {
 									local27 = false;
 									return local27;
 								}
-								if (local189 < 0 || (long) local189 > this.aClass38_1.method1451() / 520L) {
+								if (local189 < 0 || (long) local189 > this.aClass38_1.length() / 520L) {
 									local27 = false;
 									return local27;
 								}
@@ -174,7 +174,7 @@ public final class Cache {
 							local248 = arg0 - local125;
 							if (local189 == 0) {
 								arg3 = false;
-								local189 = (int) ((this.aClass38_1.method1451() + 519L) / 520L);
+								local189 = (int) ((this.aClass38_1.length() + 519L) / 520L);
 								if (local189 == 0) {
 									local189++;
 								}
@@ -197,10 +197,10 @@ public final class Cache {
 							Static271.aByteArray79[3] = (byte) local156;
 							local156++;
 							Static271.aByteArray79[5] = (byte) (local189 >> 8);
-							this.aClass38_1.method1459((long) (local67 * 520));
+							this.aClass38_1.seek((long) (local67 * 520));
 							local67 = local189;
-							this.aClass38_1.method1458(Static271.aByteArray79, 0, 8);
-							this.aClass38_1.method1458(arg2, local125, local248);
+							this.aClass38_1.write(Static271.aByteArray79, 0, 8);
+							this.aClass38_1.write(arg2, local125, local248);
 							local125 += local248;
 							continue;
 						}
diff --git a/client/src/main/java/FrameBuffer.java b/client/src/main/java/FrameBuffer.java
index 6636c52..d079ac9 100644
--- a/client/src/main/java/FrameBuffer.java
+++ b/client/src/main/java/FrameBuffer.java
@@ -9,28 +9,28 @@ import org.openrs2.deob.annotation.OriginalMember;
 public abstract class FrameBuffer {
 
 	@OriginalMember(owner = "client!vk", name = "e", descriptor = "[I")
-	protected int[] anIntArray472;
+	protected int[] pixels;
 
 	@OriginalMember(owner = "client!vk", name = "g", descriptor = "Ljava/awt/Image;")
-	protected Image anImage4;
+	protected Image image;
 
 	@OriginalMember(owner = "client!vk", name = "i", descriptor = "I")
-	protected int anInt5339;
+	protected int height;
 
 	@OriginalMember(owner = "client!vk", name = "k", descriptor = "I")
-	protected int anInt5341;
+	protected int width;
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
-	public abstract void method4186(@OriginalArg(2) Graphics arg0);
+	public abstract void draw(@OriginalArg(2) Graphics arg0);
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(I)V")
-	public final void method4189() {
-		Static129.method2491(this.anIntArray472, this.anInt5341, this.anInt5339);
+	public final void makeTarget() {
+		Static129.method2491(this.pixels, this.width, this.height);
 	}
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IIIILjava/awt/Graphics;I)V")
 	public abstract void method4191(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Graphics arg3, @OriginalArg(5) int arg4);
 
 	@OriginalMember(owner = "client!vk", name = "a", descriptor = "(IZILjava/awt/Component;)V")
-	public abstract void method4192(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2);
+	public abstract void init(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2);
 }
diff --git a/client/src/main/java/ImageProducerFrameBuffer.java b/client/src/main/java/ImageProducerFrameBuffer.java
index e321f3f..4166038 100644
--- a/client/src/main/java/ImageProducerFrameBuffer.java
+++ b/client/src/main/java/ImageProducerFrameBuffer.java
@@ -26,7 +26,7 @@ public final class ImageProducerFrameBuffer extends FrameBuffer implements Image
 	@Override
 	public final synchronized void addConsumer(@OriginalArg(0) ImageConsumer arg0) {
 		this.anImageConsumer1 = arg0;
-		arg0.setDimensions(this.anInt5341, this.anInt5339);
+		arg0.setDimensions(this.width, this.height);
 		arg0.setProperties(null);
 		arg0.setColorModel(this.aColorModel1);
 		arg0.setHints(14);
@@ -35,7 +35,7 @@ public final class ImageProducerFrameBuffer extends FrameBuffer implements Image
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IIIBI)V")
 	private synchronized void method1168(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) {
 		if (this.anImageConsumer1 != null) {
-			this.anImageConsumer1.setPixels(arg2, arg3, arg0, arg1, this.aColorModel1, this.anIntArray472, arg3 * this.anInt5341 + arg2, this.anInt5341);
+			this.anImageConsumer1.setPixels(arg2, arg3, arg0, arg1, this.aColorModel1, this.pixels, arg3 * this.width + arg2, this.width);
 			this.anImageConsumer1.imageComplete(2);
 		}
 	}
@@ -54,7 +54,7 @@ public final class ImageProducerFrameBuffer extends FrameBuffer implements Image
 		this.method1168(arg0, arg2, arg1, arg4);
 		@Pc(17) Shape local17 = arg3.getClip();
 		arg3.clipRect(arg1, arg4, arg0, arg2);
-		arg3.drawImage(this.anImage4, 0, 0, this);
+		arg3.drawImage(this.image, 0, 0, this);
 		arg3.setClip(local17);
 	}
 
@@ -67,7 +67,7 @@ public final class ImageProducerFrameBuffer extends FrameBuffer implements Image
 	@OriginalMember(owner = "client!di", name = "c", descriptor = "(I)V")
 	private synchronized void method1170() {
 		if (this.anImageConsumer1 != null) {
-			this.anImageConsumer1.setPixels(0, 0, this.anInt5341, this.anInt5339, this.aColorModel1, this.anIntArray472, 0, this.anInt5341);
+			this.anImageConsumer1.setPixels(0, 0, this.width, this.height, this.aColorModel1, this.pixels, 0, this.width);
 			this.anImageConsumer1.imageComplete(2);
 		}
 	}
@@ -80,26 +80,26 @@ public final class ImageProducerFrameBuffer extends FrameBuffer implements Image
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IILjava/awt/Graphics;I)V")
 	@Override
-	public final void method4186(@OriginalArg(2) Graphics arg0) {
+	public final void draw(@OriginalArg(2) Graphics arg0) {
 		this.method1170();
-		arg0.drawImage(this.anImage4, 0, 0, this);
+		arg0.drawImage(this.image, 0, 0, this);
 	}
 
 	@OriginalMember(owner = "client!di", name = "a", descriptor = "(IZILjava/awt/Component;)V")
 	@Override
-	public final void method4192(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
-		this.anInt5339 = arg0;
-		this.anIntArray472 = new int[arg1 * arg0 + 1];
-		this.anInt5341 = arg1;
+	public final void init(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component arg2) {
+		this.height = arg0;
+		this.pixels = new int[arg1 * arg0 + 1];
+		this.width = arg1;
 		this.aColorModel1 = new DirectColorModel(32, 16711680, 65280, 255);
-		this.anImage4 = arg2.createImage(this);
+		this.image = arg2.createImage(this);
 		this.method1170();
-		arg2.prepareImage(this.anImage4, this);
+		arg2.prepareImage(this.image, this);
 		this.method1170();
-		arg2.prepareImage(this.anImage4, this);
+		arg2.prepareImage(this.image, this);
 		this.method1170();
-		arg2.prepareImage(this.anImage4, this);
-		this.method4189();
+		arg2.prepareImage(this.image, this);
+		this.makeTarget();
 	}
 
 	@OriginalMember(owner = "client!di", name = "imageUpdate", descriptor = "(Ljava/awt/Image;IIIII)Z")
diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java
index 2bf0aa9..1ca3605 100644
--- a/client/src/main/java/JagString.java
+++ b/client/src/main/java/JagString.java
@@ -135,10 +135,10 @@ public final class JagString implements StringInterface {
 			for (local31 = 1; local31 < arg0.length + this.length; local31 += local31) {
 			}
 			@Pc(51) byte[] local51 = new byte[local31];
-			Static289.method2612(this.chars, 0, local51, 0, this.length);
+			Static289.copy(this.chars, 0, local51, 0, this.length);
 			this.chars = local51;
 		}
-		Static289.method2612(arg0.chars, 0, this.chars, this.length, arg0.length);
+		Static289.copy(arg0.chars, 0, this.chars, this.length, arg0.length);
 		this.length += arg0.length;
 		return this;
 	}
@@ -212,10 +212,10 @@ public final class JagString implements StringInterface {
 				for (local43 = 1; local43 < this.length + arg0.length; local43 += local43) {
 				}
 				@Pc(63) byte[] local63 = new byte[local43];
-				Static289.method2612(this.chars, 0, local63, 0, this.length);
+				Static289.copy(this.chars, 0, local63, 0, this.length);
 				this.chars = local63;
 			}
-			Static289.method2612(arg0.chars, arg1, this.chars, this.length, arg2 - arg1);
+			Static289.copy(arg0.chars, arg1, this.chars, this.length, arg2 - arg1);
 			this.length += arg2 - arg1;
 			return this;
 		} else {
@@ -329,7 +329,7 @@ public final class JagString implements StringInterface {
 		@Pc(23) JagString local23 = new JagString();
 		local23.chars = new byte[this.length + 1];
 		local23.length = this.length + 1;
-		Static289.method2612(this.chars, 0, local23.chars, 0, this.length);
+		Static289.copy(this.chars, 0, local23.chars, 0, this.length);
 		local23.chars[this.length] = (byte) arg0;
 		return local23;
 	}
@@ -381,7 +381,7 @@ public final class JagString implements StringInterface {
 				for (local30 = 1; local30 < arg0; local30 += local30) {
 				}
 				@Pc(45) byte[] local45 = new byte[local30];
-				Static289.method2612(this.chars, 0, local45, 0, this.length);
+				Static289.copy(this.chars, 0, local45, 0, this.length);
 				this.chars = local45;
 			}
 			for (local30 = this.length; local30 < arg0; local30++) {
@@ -424,7 +424,7 @@ public final class JagString implements StringInterface {
 		@Pc(7) JagString local7 = new JagString();
 		local7.length = arg0 - arg1;
 		local7.chars = new byte[arg0 - arg1];
-		Static289.method2612(this.chars, arg1, local7.chars, 0, local7.length);
+		Static289.copy(this.chars, arg1, local7.chars, 0, local7.length);
 		return local7;
 	}
 
@@ -683,7 +683,7 @@ public final class JagString implements StringInterface {
 	@OriginalMember(owner = "client!na", name = "i", descriptor = "(I)[B")
 	public final byte[] method3148() {
 		@Pc(7) byte[] local7 = new byte[this.length];
-		Static289.method2612(this.chars, 0, local7, 0, this.length);
+		Static289.copy(this.chars, 0, local7, 0, this.length);
 		return local7;
 	}
 
@@ -725,7 +725,7 @@ public final class JagString implements StringInterface {
 				for (local44 = 1; local44 <= this.length; local44 += local44) {
 				}
 				@Pc(61) byte[] local61 = new byte[local44];
-				Static289.method2612(this.chars, 0, local61, 0, this.length);
+				Static289.copy(this.chars, 0, local61, 0, this.length);
 				this.chars = local61;
 			}
 			this.chars[this.length++] = (byte) arg0;
@@ -769,7 +769,7 @@ public final class JagString implements StringInterface {
 		}
 		if (this.chars.length != this.length) {
 			@Pc(26) byte[] local26 = new byte[this.length];
-			Static289.method2612(this.chars, 0, local26, 0, this.length);
+			Static289.copy(this.chars, 0, local26, 0, this.length);
 			this.chars = local26;
 		}
 		return this;
@@ -814,7 +814,7 @@ public final class JagString implements StringInterface {
 
 	@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I")
 	public final int encodeString(@OriginalArg(1) byte[] arg0, @OriginalArg(2) int arg1, @OriginalArg(4) int arg2) {
-		Static289.method2612(this.chars, 0, arg0, arg1, arg2);
+		Static289.copy(this.chars, 0, arg0, arg1, arg2);
 		return arg2;
 	}
 }
diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java
index 88c8edc..5c2d224 100644
--- a/client/src/main/java/Js5.java
+++ b/client/src/main/java/Js5.java
@@ -326,7 +326,7 @@ public final class Js5 {
 					local320 = 0;
 					for (@Pc(322) int local322 = 0; local322 < local31; local322++) {
 						local320 += local233.g4();
-						Static289.method2612(local140, local250, local282[local322], local239[local322], local320);
+						Static289.copy(local140, local250, local282[local322], local239[local322], local320);
 						local250 += local320;
 						local239[local322] += local320;
 					}
diff --git a/client/src/main/java/Js5NetQueue.java b/client/src/main/java/Js5NetQueue.java
index 066b4fb..c15a34c 100644
--- a/client/src/main/java/Js5NetQueue.java
+++ b/client/src/main/java/Js5NetQueue.java
@@ -64,7 +64,7 @@ public final class Js5NetQueue {
 			this.anInt2962 += local19;
 			if (this.anInt2962 > 30000) {
 				try {
-					this.aClass95_1.method2834();
+					this.aClass95_1.close();
 				} catch (@Pc(43) Exception local43) {
 				}
 				this.aClass95_1 = null;
@@ -74,7 +74,7 @@ public final class Js5NetQueue {
 			return this.method2328() == 0 && this.method2321() == 0;
 		}
 		try {
-			this.aClass95_1.method2832();
+			this.aClass95_1.checkError();
 			@Pc(75) Js5NetRequest local75;
 			for (local75 = (Js5NetRequest) this.aClass16_2.method795(); local75 != null; local75 = (Js5NetRequest) this.aClass16_2.method797()) {
 				this.aClass3_Sub15_4.offset = 0;
@@ -117,7 +117,7 @@ public final class Js5NetQueue {
 					if (local235 > local19) {
 						local235 = local19;
 					}
-					this.aClass95_1.method2827(this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset, local235, this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data);
+					this.aClass95_1.read(this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset, local235, this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data);
 					if (this.aByte8 != 0) {
 						for (local283 = 0; local283 < local235; local283++) {
 							this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset + local283] = (byte) (this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.data[this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.offset + local283] ^ this.aByte8);
@@ -137,7 +137,7 @@ public final class Js5NetQueue {
 					if (local19 < local228) {
 						local228 = local19;
 					}
-					this.aClass95_1.method2827(this.aClass3_Sub15_5.offset, local228, this.aClass3_Sub15_5.data);
+					this.aClass95_1.read(this.aClass3_Sub15_5.offset, local228, this.aClass3_Sub15_5.data);
 					if (this.aByte8 != 0) {
 						for (local235 = 0; local235 < local228; local235++) {
 							this.aClass3_Sub15_5.data[local235 + this.aClass3_Sub15_5.offset] ^= this.aByte8;
@@ -186,7 +186,7 @@ public final class Js5NetQueue {
 			return true;
 		} catch (@Pc(644) IOException local644) {
 			try {
-				this.aClass95_1.method2834();
+				this.aClass95_1.close();
 			} catch (@Pc(650) Exception local650) {
 			}
 			this.response = -2;
@@ -208,7 +208,7 @@ public final class Js5NetQueue {
 			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(39) IOException local39) {
 			try {
-				this.aClass95_1.method2834();
+				this.aClass95_1.close();
 			} catch (@Pc(45) Exception local45) {
 			}
 			this.errors++;
@@ -234,7 +234,7 @@ public final class Js5NetQueue {
 			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(42) IOException local42) {
 			try {
-				this.aClass95_1.method2834();
+				this.aClass95_1.close();
 			} catch (@Pc(48) Exception local48) {
 			}
 			this.errors++;
@@ -246,7 +246,7 @@ public final class Js5NetQueue {
 	@OriginalMember(owner = "client!jb", name = "c", descriptor = "(I)V")
 	public final void method2323() {
 		if (this.aClass95_1 != null) {
-			this.aClass95_1.method2833();
+			this.aClass95_1.breakConnection();
 		}
 	}
 
@@ -254,7 +254,7 @@ public final class Js5NetQueue {
 	public final void loggedOut(@OriginalArg(0) boolean arg0, @OriginalArg(1) BufferedSocket arg1) {
 		if (this.aClass95_1 != null) {
 			try {
-				this.aClass95_1.method2834();
+				this.aClass95_1.close();
 			} catch (@Pc(14) Exception local14) {
 			}
 			this.aClass95_1 = null;
@@ -279,7 +279,7 @@ public final class Js5NetQueue {
 								this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 							} catch (@Pc(107) IOException local107) {
 								try {
-									this.aClass95_1.method2834();
+									this.aClass95_1.close();
 								} catch (@Pc(113) Exception local113) {
 								}
 								this.response = -2;
@@ -306,7 +306,7 @@ public final class Js5NetQueue {
 	@OriginalMember(owner = "client!jb", name = "d", descriptor = "(B)V")
 	public final void method2327() {
 		try {
-			this.aClass95_1.method2834();
+			this.aClass95_1.close();
 		} catch (@Pc(17) Exception local17) {
 		}
 		this.response = -1;
@@ -323,7 +323,7 @@ public final class Js5NetQueue {
 	@OriginalMember(owner = "client!jb", name = "b", descriptor = "(Z)V")
 	public final void method2329() {
 		if (this.aClass95_1 != null) {
-			this.aClass95_1.method2834();
+			this.aClass95_1.close();
 		}
 	}
 
@@ -359,7 +359,7 @@ public final class Js5NetQueue {
 			this.aClass95_1.write(this.aClass3_Sub15_4.data, 4);
 		} catch (@Pc(37) IOException local37) {
 			try {
-				this.aClass95_1.method2834();
+				this.aClass95_1.close();
 			} catch (@Pc(43) Exception local43) {
 			}
 			this.errors++;
diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java
index 8f7655d..88f69c5 100644
--- a/client/src/main/java/Static1.java
+++ b/client/src/main/java/Static1.java
@@ -557,7 +557,7 @@ public final class Static1 {
 			if (GlRenderer.enabled) {
 				Static129.anIntArray297 = null;
 			} else {
-				Static260.frameBuffer.method4189();
+				Static260.frameBuffer.makeTarget();
 			}
 		}
 		Static70.aClass3_Sub2_Sub1_2.method1415(arg0, arg3);
diff --git a/client/src/main/java/Static10.java b/client/src/main/java/Static10.java
index d56a4a1..1da171b 100644
--- a/client/src/main/java/Static10.java
+++ b/client/src/main/java/Static10.java
@@ -27,7 +27,7 @@ public final class Static10 {
 	@OriginalMember(owner = "client!an", name = "a", descriptor = "(BI)I")
 	public static int method347(@OriginalArg(1) int arg0) {
 		if (Static124.socket != null) {
-			Static124.socket.method2834();
+			Static124.socket.close();
 			Static124.socket = null;
 		}
 		Static127.anInt3132++;
diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java
index 63d07f2..38eb527 100644
--- a/client/src/main/java/Static114.java
+++ b/client/src/main/java/Static114.java
@@ -62,7 +62,7 @@ public final class Static114 {
 		} else {
 			try {
 				@Pc(159) Graphics local159 = GameShell.canvas.getGraphics();
-				Static260.frameBuffer.method4186(local159);
+				Static260.frameBuffer.draw(local159);
 			} catch (@Pc(167) Exception local167) {
 				GameShell.canvas.repaint();
 			}
diff --git a/client/src/main/java/Static118.java b/client/src/main/java/Static118.java
index 539fbfb..3f5852a 100644
--- a/client/src/main/java/Static118.java
+++ b/client/src/main/java/Static118.java
@@ -104,7 +104,7 @@ public final class Static118 {
 		@Pc(41) int local41 = 0;
 		for (@Pc(43) int local43 = 0; local43 < arg1; local43++) {
 			@Pc(52) JagString local52 = arg2[local43 + arg0];
-			Static289.method2612(local52.chars, 0, local39, local41, local52.length);
+			Static289.copy(local52.chars, 0, local39, local41, local52.length);
 			local41 += local52.length;
 		}
 		@Pc(71) JagString local71 = new JagString();
diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java
index c6ac8b0..f379690 100644
--- a/client/src/main/java/Static127.java
+++ b/client/src/main/java/Static127.java
@@ -288,7 +288,7 @@ public final class Static127 {
 			}
 			if (arg0.method3111(Static165.aClass100_775)) {
 				GameShell.signLink.breakConnection();
-				Static124.socket.method2833();
+				Static124.socket.breakConnection();
 				Static107.js5NetQueue.method2323();
 			}
 			if (arg0.method3111(Static114.aClass100_1100)) {
diff --git a/client/src/main/java/Static131.java b/client/src/main/java/Static131.java
index 9e116b3..781ec6e 100644
--- a/client/src/main/java/Static131.java
+++ b/client/src/main/java/Static131.java
@@ -137,11 +137,11 @@ public final class Static131 {
 		try {
 			@Pc(12) Class local12 = Class.forName("BufferedImageFrameBuffer");
 			@Pc(16) FrameBuffer local16 = (FrameBuffer) local12.getDeclaredConstructor().newInstance();
-			local16.method4192(arg0, arg1, arg2);
+			local16.init(arg0, arg1, arg2);
 			return local16;
 		} catch (@Pc(25) Throwable local25) {
 			@Pc(29) ImageProducerFrameBuffer local29 = new ImageProducerFrameBuffer();
-			local29.method4192(arg0, arg1, arg2);
+			local29.init(arg0, arg1, arg2);
 			return local29;
 		}
 	}
diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java
index 4b35a5c..c8a3f77 100644
--- a/client/src/main/java/Static137.java
+++ b/client/src/main/java/Static137.java
@@ -105,7 +105,7 @@ public final class Static137 {
 					if (GlRenderer.enabled) {
 						Static129.anIntArray297 = null;
 					} else {
-						Static260.frameBuffer.method4189();
+						Static260.frameBuffer.makeTarget();
 					}
 					return false;
 				}
@@ -113,7 +113,7 @@ public final class Static137 {
 					if (GlRenderer.enabled) {
 						Static129.anIntArray297 = null;
 					} else {
-						Static260.frameBuffer.method4189();
+						Static260.frameBuffer.makeTarget();
 					}
 					return false;
 				}
@@ -134,7 +134,7 @@ public final class Static137 {
 		if (GlRenderer.enabled) {
 			Static129.anIntArray297 = null;
 		} else {
-			Static260.frameBuffer.method4189();
+			Static260.frameBuffer.makeTarget();
 		}
 		Static56.aClass3_Sub2_Sub1_Sub1_1 = null;
 		return true;
diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java
index 3833157..e75ad4b 100644
--- a/client/src/main/java/Static140.java
+++ b/client/src/main/java/Static140.java
@@ -16,8 +16,8 @@ public final class Static140 {
 		@Pc(15) byte[] local15 = new byte[24];
 		if (Static121.uid != null) {
 			try {
-				Static121.uid.method1459(0L);
-				Static121.uid.method1457(local15);
+				Static121.uid.seek(0L);
+				Static121.uid.read(local15);
 				@Pc(28) int local28;
 				for (local28 = 0; local28 < 24 && local15[local28] == 0; local28++) {
 				}
diff --git a/client/src/main/java/Static158.java b/client/src/main/java/Static158.java
index 102573d..c976c84 100644
--- a/client/src/main/java/Static158.java
+++ b/client/src/main/java/Static158.java
@@ -28,7 +28,7 @@ public final class Static158 {
 		try {
 			if (++Static226.anInt5079 > 2000) {
 				if (Static124.socket != null) {
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 				}
 				if (Static57.anInt1758 >= 1) {
@@ -76,7 +76,7 @@ public final class Static158 {
 				if (local120 != 21) {
 					Static223.anInt5034 = local120;
 					Static179.anInt4261 = 0;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -94,19 +94,19 @@ public final class Static158 {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
-				Static124.socket.method2827(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.read(0, Static229.aClass100Array156.length * 8, Static57.aClass3_Sub15_Sub1_3.data);
 				for (local120 = 0; local120 < Static229.aClass100Array156.length; local120++) {
 					Static229.aClass100Array156[local120] = Static79.decode37(Static57.aClass3_Sub15_Sub1_3.g8());
 				}
 				Static223.anInt5034 = 21;
 				Static179.anInt4261 = 0;
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 				return;
 			}
 		} catch (@Pc(238) IOException local238) {
 			if (Static124.socket != null) {
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 			}
 			if (Static57.anInt1758 < 1) {
diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java
index a0a11bb..fb280a9 100644
--- a/client/src/main/java/Static196.java
+++ b/client/src/main/java/Static196.java
@@ -32,7 +32,7 @@ public final class Static196 {
 		}
 		@Pc(37) boolean local37 = arg0 == 5 || arg0 == 10 || arg0 == 28;
 		if (arg0 != 40 && Static233.aClass95_4 != null) {
-			Static233.aClass95_4.method2834();
+			Static233.aClass95_4.close();
 			Static233.aClass95_4 = null;
 		}
 		if (arg0 == 25 || arg0 == 28) {
diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java
index eb8cfd3..7a3b31f 100644
--- a/client/src/main/java/Static197.java
+++ b/client/src/main/java/Static197.java
@@ -133,7 +133,7 @@ public final class Static197 {
 				}
 				try {
 					@Pc(269) Graphics local269 = GameShell.canvas.getGraphics();
-					Static260.frameBuffer.method4186(local269);
+					Static260.frameBuffer.draw(local269);
 				} catch (@Pc(277) Exception local277) {
 				}
 				Static139.method2704();
diff --git a/client/src/main/java/Static207.java b/client/src/main/java/Static207.java
index 821d824..433137b 100644
--- a/client/src/main/java/Static207.java
+++ b/client/src/main/java/Static207.java
@@ -158,7 +158,7 @@ public final class Static207 {
 			if (local82 > Static116.anInt2961 - Static141.anInt3469) {
 				local82 = Static116.anInt2961 - Static141.anInt3469;
 			}
-			Static124.socket.method2827(Static141.anInt3469, local82, Static229.aByteArray70);
+			Static124.socket.read(Static141.anInt3469, local82, Static229.aByteArray70);
 			Static141.anInt3469 += local82;
 			if (Static141.anInt3469 < Static116.anInt2961) {
 				return -1;
@@ -171,7 +171,7 @@ public final class Static207 {
 						Static101.aClass10_Sub1Array1[local124++] = local247;
 					}
 				}
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 				Static127.anInt3132 = 0;
 				Static82.anInt2231 = 0;
diff --git a/client/src/main/java/Static216.java b/client/src/main/java/Static216.java
index 5398f2a..3fc9651 100644
--- a/client/src/main/java/Static216.java
+++ b/client/src/main/java/Static216.java
@@ -23,7 +23,7 @@ public final class Static216 {
 		try {
 			if (++Static92.anInt2430 > 2000) {
 				if (Static124.socket != null) {
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 				}
 				if (Static276.anInt5816 >= 1) {
@@ -75,7 +75,7 @@ public final class Static216 {
 				if (local150 != 0) {
 					Static266.anInt5336 = local150;
 					Static184.anInt4348 = 0;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -85,7 +85,7 @@ public final class Static216 {
 				if (Static124.socket.available() < 8) {
 					return;
 				}
-				Static124.socket.method2827(0, 8, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.read(0, 8, Static57.aClass3_Sub15_Sub1_3.data);
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
 				Static193.aLong147 = Static57.aClass3_Sub15_Sub1_3.g8();
 				@Pc(210) int[] local210 = new int[4];
@@ -196,13 +196,13 @@ public final class Static216 {
 					Static184.anInt4348 = 1;
 					Static276.anInt5816++;
 					Static92.anInt2430 = 0;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				} else {
 					Static266.anInt5336 = local623;
 					Static184.anInt4348 = 0;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -219,7 +219,7 @@ public final class Static216 {
 					Static231.anInt5202 = (Static124.socket.read() + 3) * 60;
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 21;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -230,7 +230,7 @@ public final class Static216 {
 					Static204.anInt4765 = Static124.socket.read();
 					Static184.anInt4348 = 0;
 					Static266.anInt5336 = 29;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -240,7 +240,7 @@ public final class Static216 {
 				if (Static124.socket.available() < 14) {
 					return;
 				}
-				Static124.socket.method2827(0, 14, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.read(0, 14, Static57.aClass3_Sub15_Sub1_3.data);
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
 				Static191.staffModLevel = Static57.aClass3_Sub15_Sub1_3.g1();
 				Static249.anInt5431 = Static57.aClass3_Sub15_Sub1_3.g1();
@@ -276,7 +276,7 @@ public final class Static216 {
 					return;
 				}
 				Static57.aClass3_Sub15_Sub1_3.offset = 0;
-				Static124.socket.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
+				Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
 				Static266.anInt5336 = 2;
 				Static184.anInt4348 = 0;
 				Static243.method4221();
@@ -287,7 +287,7 @@ public final class Static216 {
 			}
 		} catch (@Pc(977) IOException local977) {
 			if (Static124.socket != null) {
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 			}
 			if (Static276.anInt5816 >= 1) {
diff --git a/client/src/main/java/Static23.java b/client/src/main/java/Static23.java
index 2651113..d4aa58e 100644
--- a/client/src/main/java/Static23.java
+++ b/client/src/main/java/Static23.java
@@ -84,7 +84,7 @@ public final class Static23 {
 	public static byte[] method648(@OriginalArg(1) byte[] arg0) {
 		@Pc(6) int local6 = arg0.length;
 		@Pc(9) byte[] local9 = new byte[local6];
-		Static289.method2612(arg0, 0, local9, 0, local6);
+		Static289.copy(arg0, 0, local9, 0, local6);
 		return local9;
 	}
 }
diff --git a/client/src/main/java/Static271.java b/client/src/main/java/Static271.java
index 1869d37..07b633d 100644
--- a/client/src/main/java/Static271.java
+++ b/client/src/main/java/Static271.java
@@ -33,8 +33,8 @@ public final class Static271 {
 	public static void method4598(@OriginalArg(0) Buffer arg0) {
 		if (Static121.uid != null) {
 			try {
-				Static121.uid.method1459(0L);
-				Static121.uid.method1458(arg0.data, arg0.offset, 24);
+				Static121.uid.seek(0L);
+				Static121.uid.write(arg0.data, arg0.offset, 24);
 			} catch (@Pc(16) Exception local16) {
 			}
 		}
diff --git a/client/src/main/java/Static278.java b/client/src/main/java/Static278.java
index d4d78bf..87e6eec 100644
--- a/client/src/main/java/Static278.java
+++ b/client/src/main/java/Static278.java
@@ -196,7 +196,7 @@ public final class Static278 {
 	@OriginalMember(owner = "client!wj", name = "b", descriptor = "(B)V")
 	public static void method4653() {
 		if (Static124.socket != null) {
-			Static124.socket.method2834();
+			Static124.socket.close();
 			Static124.socket = null;
 		}
 		Static217.method3768();
diff --git a/client/src/main/java/Static289.java b/client/src/main/java/Static289.java
index e1e6778..fd80704 100644
--- a/client/src/main/java/Static289.java
+++ b/client/src/main/java/Static289.java
@@ -45,7 +45,7 @@ public final class Static289 {
 	}
 
 	@OriginalMember(owner = "client!kg", name = "a", descriptor = "([BI[BII)V")
-	public static void method2612(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
+	public static void copy(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) {
 		@Pc(15) int local15;
 		if (arg0 == arg2) {
 			if (arg1 == arg3) {
diff --git a/client/src/main/java/Static31.java b/client/src/main/java/Static31.java
index 46eb670..32e44af 100644
--- a/client/src/main/java/Static31.java
+++ b/client/src/main/java/Static31.java
@@ -50,7 +50,7 @@ public final class Static31 {
 		try {
 			if (++Static20.anInt673 > 1500) {
 				if (Static124.socket != null) {
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 				}
 				if (Static196.anInt4587 >= 1) {
@@ -98,7 +98,7 @@ public final class Static31 {
 				if (local126 != 101) {
 					Static266.anInt5336 = local126;
 					Static219.anInt4937 = 0;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
@@ -113,19 +113,19 @@ public final class Static31 {
 				if (Static125.worldId == -1) {
 					Static219.anInt4937 = 0;
 					Static266.anInt5336 = 6;
-					Static124.socket.method2834();
+					Static124.socket.close();
 					Static124.socket = null;
 					return;
 				}
 				Static219.anInt4937 = 0;
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 				Static49.method1208();
 				return;
 			}
 		} catch (@Pc(210) IOException local210) {
 			if (Static124.socket != null) {
-				Static124.socket.method2834();
+				Static124.socket.close();
 				Static124.socket = null;
 			}
 			if (Static196.anInt4587 < 1) {
diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java
index fed4920..4bb8b74 100644
--- a/client/src/main/java/Static4.java
+++ b/client/src/main/java/Static4.java
@@ -76,7 +76,7 @@ public final class Static4 {
 		}
 		if (Static164.anInt3985 == -1) {
 			local14--;
-			Static124.socket.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data);
+			Static124.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data);
 			Static57.aClass3_Sub15_Sub1_3.offset = 0;
 			Static164.anInt3985 = Static57.aClass3_Sub15_Sub1_3.method2243();
 			Static223.anInt5028 = Static234.anIntArray456[Static164.anInt3985];
@@ -85,7 +85,7 @@ public final class Static4 {
 			if (local14 <= 0) {
 				return false;
 			}
-			Static124.socket.method2827(0, 1, Static57.aClass3_Sub15_Sub1_3.data);
+			Static124.socket.read(0, 1, Static57.aClass3_Sub15_Sub1_3.data);
 			local14--;
 			Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.data[0] & 0xFF;
 		}
@@ -94,7 +94,7 @@ public final class Static4 {
 				return false;
 			}
 			local14 -= 2;
-			Static124.socket.method2827(0, 2, Static57.aClass3_Sub15_Sub1_3.data);
+			Static124.socket.read(0, 2, Static57.aClass3_Sub15_Sub1_3.data);
 			Static57.aClass3_Sub15_Sub1_3.offset = 0;
 			Static223.anInt5028 = Static57.aClass3_Sub15_Sub1_3.g2();
 		}
@@ -102,7 +102,7 @@ public final class Static4 {
 			return false;
 		}
 		Static57.aClass3_Sub15_Sub1_3.offset = 0;
-		Static124.socket.method2827(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
+		Static124.socket.read(0, Static223.anInt5028, Static57.aClass3_Sub15_Sub1_3.data);
 		Static49.anInt1462 = Static5.anInt45;
 		Static5.anInt45 = Static230.anInt5152;
 		Static230.anInt5152 = Static164.anInt3985;
diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java
index d74d528..424231d 100644
--- a/client/src/main/java/client.java
+++ b/client/src/main/java/client.java
@@ -175,7 +175,7 @@ public final class client extends GameShell {
 			} else if (Static244.anInt5370 != 0) {
 				try {
 					local388 = GameShell.canvas.getGraphics();
-					Static260.frameBuffer.method4186(local388);
+					Static260.frameBuffer.draw(local388);
 					for (local84 = 0; local84 < Static24.anInt766; local84++) {
 						Static31.aBooleanArray29[local84] = false;
 					}
@@ -211,7 +211,7 @@ public final class client extends GameShell {
 		}
 		Static178.instance = null;
 		if (Static124.socket != null) {
-			Static124.socket.method2834();
+			Static124.socket.close();
 			Static124.socket = null;
 		}
 		Static31.method847(GameShell.canvas);