diff --git a/asd.js b/asd.js
index e941b8c..48411b9 100644
--- a/asd.js
+++ b/asd.js
@@ -54,15 +54,15 @@ const hook___android_log_print = () => {
         s: (x) => x.readCString(),
         d: (x) => x.toInt32(),
         u: (x) => x.toInt32(),
-        z: (x) => x.toInt64(),
-        l: (x) => x.toInt64(),
+        z: (x) => x.toInt32(), // FIXME
+        l: (x) => x.toInt32(), // FIXME
         x: (x) => x.toInt32().toString(16),
         f: (x) => x.toFloat(),
       };
 
       const values = types.map((t, idx) => o[t](args[idx + 3]));
       const newStr = sprintf(fmt, values);
-      console.log(newStr);
+      //console.log(newStr); // FIXME
     },
     () => {},
   );
@@ -92,7 +92,7 @@ let indent = 0;
 function doReplaceFunctions() {
   // const prefixes = ["Send_Pkt*", "P2P*", "*RcvTh*", "parse_*"]; // "XQP2P*",
   // const prefixes = ["parse_*", "pack_*", "Send_Pkt*", "create_*"];
-  const prefixes = ["create_*"];
+  const prefixes = ["create_*", "pack_*"];
   const spam = ["XQP2P_Check_Buffer", "P2P_ChannelBufferCheck"];
 
   const replaced = replaceFunctions();
@@ -122,7 +122,7 @@ function doHooks() {
     hook___android_log_print();
     // hook_create_P2pRdy();
     // hook_in_out_buf("create_LstReq", 0x1c, 0x1c);
-    hook_in_out_buf("create_P2pRdy", 0x1c, 0x1c);
+    //hook_in_out_buf("create_P2pRdy", 0x1c, 0x1c);
     doReplaceFunctions();
 
     // hook_p2p_read();
diff --git a/func_replacements.js b/func_replacements.js
index ee0de00..a4cb259 100644
--- a/func_replacements.js
+++ b/func_replacements.js
@@ -1,8 +1,6 @@
 const pack_P2pHdr = (in_buf, out_buf) => {
   // shitty memcpy
   out_buf.writeByteArray(in_buf.readByteArray(4));
-  // out_buf.writeU16(in_buf.readU16());
-  // out_buf.add(2).writeU16(in_buf.add(2).readU16());
   return 4;
 };
 
@@ -38,17 +36,17 @@ const create_Hello = (buf) => {
 const create_P2pRdy = (outbuf, inbuf) => {
   // TODO: this is literlly the same as create_LstReq, just different command
   /*
-	 * in
-				   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-		00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c 56  BATC......L.EXLV
-		00000010  53 00 00 00                                      S...
+         * in
+                                   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E
+     F  0123456789ABCDEF 00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c
+     56  BATC......L.EXLV 00000010  53 00 00 00 S...
 
-		out
-				   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-		00000000  f1 42 00 14 00 00 00 00 42 41 54 43 00 00 00 00  .B......BATC....
-		00000010  00 09 4c fb 45 58 4c 56 53 00 00 00              ..L.EXLVS...
-		retval 0x18
-	*/
+                out
+                                   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E
+     F  0123456789ABCDEF 00000000  f1 42 00 14 00 00 00 00 42 41 54 43 00 00 00
+     00  .B......BATC.... 00000010  00 09 4c fb 45 58 4c 56 53 00 00 00
+     ..L.EXLVS... retval 0x18
+        */
   const P2PRDY_SIZE = 0x14;
   outbuf.writeU16(0x42f1);
   outbuf.add(2).writeU16(P2PRDY_SIZE << 8);
@@ -61,33 +59,34 @@ const create_P2pRdy = (outbuf, inbuf) => {
 const create_P2pReq = (outbuf, inbuf, m_s_addr, addr_fam) => {
   const P2PREQ_SIZE = 0x24;
 
-  console.log("new p2preq");
   /*
-	  P2P req addr_fam 2 m_s_addr
-           	       0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-		00000000  02 00 00 00 c0 a8 01 64 00 00 00 00 00 00 00 00  .......d........
-	 
-	 at byte 4 is c0 a8 01 64 which is 192 168 1 100
+          P2P req addr_fam 2 m_s_addr
+                       0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+     0123456789ABCDEF 00000000  02 00 00 00 c0 a8 01 64 00 00 00 00 00 00 00 00
+     .......d........
 
-	 in
-			   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-	00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c 56  BATC......L.EXLV
+         at byte 4 is c0 a8 01 64 which is 192 168 1 100
 
-	mine
-			   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-	00000000  f1 20 00 24 00 00 00 00 42 41 54 43 00 00 00 00  . .$....BATC....
-	00000010  00 09 4c fb 45 58 4c 56 53 00 00 00 00 00 00 00  ..L.EXLVS.......
-	00000020  00 00 00 00 00 00 00 00                          ........
+         in
+                           0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+     0123456789ABCDEF 00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c 56
+     BATC......L.EXLV
 
-	original
-			   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
-	00000000  f1 20 00 24 00 00 00 00 42 41 54 43 00 00 00 00  . .$....BATC....
-	00000010  00 09 4c fb 45 58 4c 56 53 00 00 00 00 02 00 00  ..L.EXLVS.......
-	00000020  64 01 a8 c0 00 00 00 00                          d.......
+        mine
+                           0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+     0123456789ABCDEF 00000000  f1 20 00 24 00 00 00 00 42 41 54 43 00 00 00 00
+     . .$....BATC.... 00000010  00 09 4c fb 45 58 4c 56 53 00 00 00 00 00 00 00
+     ..L.EXLVS....... 00000020  00 00 00 00 00 00 00 00 ........
 
-	*/
+        original
+                           0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
+     0123456789ABCDEF 00000000  f1 20 00 24 00 00 00 00 42 41 54 43 00 00 00 00
+     . .$....BATC.... 00000010  00 09 4c fb 45 58 4c 56 53 00 00 00 00 02 00 00
+     ..L.EXLVS....... 00000020  64 01 a8 c0 00 00 00 00 d.......
 
-  //let new_outbuf = Memory.alloc(0x2c);
+        */
+
+  // let new_outbuf = Memory.alloc(0x2c);
   outbuf.writeU16(0x20f1);
   outbuf.add(2).writeU16(P2PREQ_SIZE << 8);
   outbuf.add(8).writeU64(inbuf.readU64());
@@ -100,19 +99,16 @@ const create_P2pReq = (outbuf, inbuf, m_s_addr, addr_fam) => {
   outbuf.add(2 * 0x12).writeU64(0);
   outbuf.add(2 * 0x10).writeByteArray(swap_endianness_u32(m_s_addr.add(4))); // ip address
 
-  //og_func(outbuf, inbuf, m_s_addr, addr_fam);
-  //console.log("in");
-  //console.log(inbuf.readByteArray(0x10));
-  //console.log("mine");
-  //console.log(new_outbuf.readByteArray(0x28));
-  //console.log("original");
-  //console.log(outbuf.readByteArray(0x28));
+  // og_func(outbuf, inbuf, m_s_addr, addr_fam);
+  // console.log("in");
+  // console.log(inbuf.readByteArray(0x10));
+  // console.log("mine");
+  // console.log(new_outbuf.readByteArray(0x28));
+  // console.log("original");
+  // console.log(outbuf.readByteArray(0x28));
 
   return P2PREQ_SIZE + 4;
 };
-const dbg_create_P2pReq = (og_func) => {
-  return create_P2pReq;
-};
 
 const swap_endianness_u16 = (ptr) => {
   const bytes = ptr.readU16();
@@ -137,10 +133,10 @@ const create_LstReq = (outbuf, inbuf) => {
      BATC......L.EXLV 00000010  53 00 00 00 00 00 00 00 00 00 00 00 S...........
 
         out
-                           		 0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F
-     0123456789ABCDEF 00000000  f1 67 00 14 00 00 00 00 42 41 54 43 00 00 00 00
-     .g......BATC.... 00000010  00 09 4c fb 45 58 4c 56 53 00 00 00 ..L.EXLVS...
-        retval 0x18
+                                         0  1  2  3  4  5  6  7  8  9  A  B  C
+     D  E  F 0123456789ABCDEF 00000000  f1 67 00 14 00 00 00 00 42 41 54 43 00
+     00 00 00 .g......BATC.... 00000010  00 09 4c fb 45 58 4c 56 53 00 00 00
+     ..L.EXLVS... retval 0x18
 
         */
   const LISTREQ_SIZE = 0x14;
@@ -166,7 +162,121 @@ const create_LstReq = (outbuf, inbuf) => {
   return LISTREQ_SIZE + 4; // this is actually wrong (and unused) in the code -- it is 0x1c
 };
 
-export const replace_func = (stub, ret, args, pass_orig) => {
+const dbg_create_Drw = (og_func) => {
+  const create_Drw = (
+    outbuf,
+    idk_param2,
+    idk_param3,
+    idk_param4,
+    copy_len,
+    inbuf,
+  ) => {
+    /// idk_param4 goes up by 0x100 per call
+
+    //console.log(
+    //  `2: ${idk_param2.toString(16)} 3: ${idk_param3.toString(16)} 4: ${idk_param4.toString(16)} copylen: ${copy_len}`,
+    //);
+    /*
+     * 2: ffffffd1 3: 0 4: 3100 copylen: 44
+	In buffer
+			   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
+	00000000  11 0a 31 10 24 00 00 00 75 39 4c 74 01 01 01 01  ..1.$...u9Lt....
+	00000010  01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01  ................
+	00000020  01 01 01 01 01 01 01 01 01 01 01 00              ............
+	OG retval 52
+	OG out buffer
+			   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
+	00000000  f1 d0 00 30 00 00 00 00 d1 00 00 31 11 0a 31 10  ...0.......1..1.
+	00000010  24 00 00 00 75 39 4c 74 01 01 01 01 01 01 01 01  $...u9Lt........
+	00000020  01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01  ................
+	00000030  01 01 01 01
+	*/
+
+    const copy_len_swapped =
+      (((copy_len + 4) & 0xff00) >> 8) | (((copy_len + 4) & 0x00ff) << 8);
+    outbuf.writeU16(0xd0f1);
+    outbuf.add(2).writeU16(copy_len_swapped);
+    outbuf.add(8).writeU8(0xd1);
+    outbuf.add(10).writeU16(idk_param4);
+    outbuf.add(12).writeByteArray(inbuf.readByteArray(copy_len));
+
+    return copy_len + 8;
+  };
+  return create_Drw;
+};
+const debugInOut = (inbuf, outbuf, og_func, insize, outsize) => {
+  console.log("In buffer");
+  console.log(inbuf.readByteArray(insize));
+
+  let og_outbuf = Memory.alloc(outsize);
+  console.log("OG retval", og_func(inbuf, og_outbuf));
+  console.log("OG out buffer");
+  console.log(og_outbuf.readByteArray(outsize));
+
+  console.log("My out buffer");
+  console.log(outbuf.readByteArray(outsize));
+};
+
+const pack_Drw = (inbuf, m_pkt_size, outbuf) => {
+  // a shitty memcpy?
+  const DRW_HDR_SIZE = 0x4;
+
+  outbuf.writeU8(inbuf.readU8());
+  outbuf.add(1).writeU8(inbuf.add(1).readU8());
+  outbuf.add(2).writeU16(inbuf.add(2).readU16());
+  outbuf
+    .add(4)
+    .writeByteArray(inbuf.add(4).readByteArray(m_pkt_size - DRW_HDR_SIZE));
+
+  return m_pkt_size;
+};
+// FIXME literally identical
+const pack_DrwAck = (inbuf, m_pkt_size, outbuf) => {
+  // a shitty memcpy?
+  const DRW_ACK_HDR_SIZE = 0x4;
+
+  outbuf.writeU8(inbuf.readU8());
+  outbuf.add(1).writeU8(inbuf.add(1).readU8());
+  outbuf.add(2).writeU16(inbuf.add(2).readU16());
+  outbuf
+    .add(4)
+    .writeByteArray(inbuf.add(4).readByteArray(m_pkt_size - DRW_ACK_HDR_SIZE));
+
+  return m_pkt_size;
+};
+
+const pack_P2pId = (inbuf, outbuf) => {
+  // TODO not verified correct but works ?
+  outbuf.writeU64(inbuf.readU64());
+  outbuf.add(8).writeU32(inbuf.add(8).readU32());
+  outbuf.add(0xc).writeU64(inbuf.add(0xc).readU32());
+
+  return 0x14;
+};
+
+const pack_P2pReq4 = (inbuf, outbuf) => {
+  // a shitty memcpy?
+  /*
+	   In buffer
+				   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
+		00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c 56  BATC......L.EXLV
+		00000010  53 00 00 00 00 02 00 00 64 01 a8 c0 00 00 00 00  S.......d.......
+		OG retval 36
+		OG out buffer
+				   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
+		00000000  42 41 54 43 00 00 00 00 00 09 4c fb 45 58 4c 56  BATC......L.EXLV
+		00000010  53 00 00 00 00 02 00 00 64 01 a8 c0 00 00 00 00  S.......d.......
+		My out buffer
+				   0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F  0123456789ABCDEF
+		00000000  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+		00000010  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+
+	*/
+  Memory.copy(outbuf, inbuf, 0x24);
+  //debugInOut(inbuf, outbuf, og_func, 0x20, 0x20); // probably 0x18
+  return 0x24;
+};
+export const replace_func = (stub, ret, args) => {
   const name_in_elf = stub.name.replace("dbg_", ""); // UGH  FIXME
   const symbol_addr = DebugSymbol.fromName(name_in_elf).address;
   if (symbol_addr == 0) {
@@ -177,7 +287,7 @@ export const replace_func = (stub, ret, args, pass_orig) => {
   const orig_func = new NativeFunction(symbol_addr, ret, args);
 
   let replacement_func;
-  if (pass_orig) {
+  if (stub.name.startsWith("dbg_")) {
     replacement_func = stub(orig_func);
   } else {
     replacement_func = stub;
@@ -212,32 +322,42 @@ export const replace_func = (stub, ret, args, pass_orig) => {
  */
 /*
  hard
- [NOT REPLACED] create_Drw
+ [NOT REPLACED] pack_ClntPkt
+
+ todo:
  [NOT REPLACED] create_DrwAck
- [NOT REPLACED] create_P2pReq
  */
 export const replaceFunctions = () => {
   const replacements = [
-    [create_P2pAlive, "uchar", ["pointer"]],
-    [create_P2pAliveAck, "uchar", ["pointer"]],
-    [create_LanSearch, "uchar", ["pointer"]],
-    [create_LanSearchExt, "uchar", ["pointer"]],
-    [create_Hello, "uchar", ["pointer"]],
-    [create_Close, "uchar", ["pointer"]],
+    [create_P2pAlive, "uint8", ["pointer"]],
+    [create_P2pAliveAck, "uint8", ["pointer"]],
+    [create_LanSearch, "uint8", ["pointer"]],
+    [create_LanSearchExt, "uint8", ["pointer"]],
+    [create_Hello, "uint8", ["pointer"]],
+    [create_Close, "uint8", ["pointer"]],
     /*
     [
       dbg_create_P2pReq,
-      "uchar",
+      "uint8",
       ["pointer", "pointer", "pointer", "uint"],
       true,
     ],
-	*/
-    [create_P2pReq, "uchar", ["pointer", "pointer", "pointer", "uint"]],
-    [create_LstReq, "uchar", ["pointer", "pointer"]],
-    [create_P2pRdy, "uchar", ["pointer", "pointer"]],
-    [pack_P2pHdr, "uchar", ["pointer", "pointer"]],
+        */
+    [
+      dbg_create_Drw,
+      "uint",
+      ["pointer", "uint64", "uint8", "uint16", "uint32", "pointer"],
+    ],
+    [create_P2pReq, "uint8", ["pointer", "pointer", "pointer", "uint"]],
+    [create_LstReq, "uint8", ["pointer", "pointer"]],
+    [create_P2pRdy, "uint8", ["pointer", "pointer"]],
+    [pack_P2pHdr, "uint8", ["pointer", "pointer"]],
+    [pack_Drw, "uint8", ["pointer", "uint16", "pointer"]],
+    [pack_DrwAck, "uint8", ["pointer", "uint16", "pointer"]],
+    [pack_P2pId, "uint32", ["pointer", "pointer"]],
+    [pack_P2pReq4, "uint64", ["pointer", "pointer"]],
   ];
 
   replacements.forEach((x) => replace_func(...x));
-  return replacements.map((x) => x[0].name);
+  return replacements.map((x) => x[0].name.replace("dbg_", ""));
 };