diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 8115c6dfad..bd05a542fb 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -198,12 +198,12 @@ SECTIONS
 
         build/asm/boot_data.o(.text)
 
-        build/asm/boot_rodata_0x80080060.o(.text)
+        build/src/boot_O2_g3/boot_0x80080060.o(.rodata)
         build/asm/boot_rodata_idle.o(.text)
         build/asm/boot_rodata_z_std_dma.o(.text)
         build/asm/boot_rodata_0x80080E30.o(.text)
         build/asm/boot_rodata_0x80081250.o(.text)
-        build/asm/boot_rodata_CIC6105.o(.text)
+        build/src/boot_O2_g3/CIC6105.o(.rodata)
         build/asm/boot_rodata_fault.o(.text)
         build/asm/boot_rodata_fault_drawer.o(.text)
         build/asm/boot_rodata_0x80085570.o(.text)
@@ -211,7 +211,7 @@ SECTIONS
         build/asm/boot_rodata_0x80086760.o(.text)
         build/asm/boot_rodata___osMalloc.o(.text)
         build/asm/boot_rodata_setintmask.o(.text)
-        build/asm/boot_rodata_sinf.o(.text)
+        build/src/libultra/gu/sinf.o(.rodata)
         build/asm/boot_rodata_exceptasm.o(.text)
         build/asm/boot_rodata_perspective.o(.text)
         build/asm/boot_rodata_0x8008C260.o(.text)
diff --git a/src/boot_O2_g3/CIC6105.c b/src/boot_O2_g3/CIC6105.c
index 47c6a3321d..bc0e49d831 100644
--- a/src/boot_O2_g3/CIC6105.c
+++ b/src/boot_O2_g3/CIC6105.c
@@ -6,9 +6,9 @@ void CIC6105_Nop80081820(void) {}
 void CIC6105_Nop80081828(void) {}
 
 void CIC6105_PrintRomInfo(void) {
-    FaultDrawer_DrawText(80, 200, D_80098280, (UNK_PTR)(*(u32*)0xA4040010));
-    FaultDrawer_DrawText(40, 184, D_80098290, &D_800994D0);
-    FaultDrawer_DrawText(56, 192, D_800982A4, &D_800994DC);
+    FaultDrawer_DrawText(80, 200, "SP_STATUS %08x", (UNK_PTR)(*(u32*)0xA4040010));
+    FaultDrawer_DrawText(40, 184, "ROM_F [Creator:%s]", &D_800994D0);
+    FaultDrawer_DrawText(56, 192, "[Date:%s]", &D_800994DC);
 }
 
 void CIC6105_AddRomInfoFaultPage(void) {
diff --git a/src/boot_O2_g3/boot_0x80080060.c b/src/boot_O2_g3/boot_0x80080060.c
index d73ada89f7..ba916f4e24 100644
--- a/src/boot_O2_g3/boot_0x80080060.c
+++ b/src/boot_O2_g3/boot_0x80080060.c
@@ -2,13 +2,13 @@
 #include <global.h>
 
 void start(void) {
-    StackCheck_Init(&bootStackEntry, (u32)bootStack, (u32)&bootStack[1024], 0, -1, bootThreadName);
+    StackCheck_Init(&bootStackEntry, (u32)bootStack, (u32)&bootStack[1024], 0, -1, "boot");
     osMemSize = func_8008D350();
     func_800818F4();
     osInitialize();
     osUnmapTLBAll();
     D_80096B40 = func_80092920();
-    StackCheck_Init(&idleStackEntry, (u32)idleStack, (u32)&idleStack[1024], 0, 256, idleThreadName);
+    StackCheck_Init(&idleStackEntry, (u32)idleStack, (u32)&idleStack[1024], 0, 256, "idle");
     osCreateThread(&idleOSThread, 1, (osCreateThread_func)Idle_ThreadEntry, 0, &idleStack[1024], 12);
     osStartThread(&idleOSThread);
 }
diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c
index 1cdcc06990..4757cd3378 100644
--- a/src/libultra/gu/sinf.c
+++ b/src/libultra/gu/sinf.c
@@ -1,26 +1,20 @@
 #include <guint.h>
 
-// TODO find these values wherever they are in .rodata
-// TODO these can't be defined in here yet because we strip out the .rodata for each object
-//static const du P[5];
+static const du	P[] = {
+    {0x3FF00000, 0x00000000},
+    {0xBFC55554, 0xBC83656D},
+    {0x3F8110ED, 0x3804C2A0},
+    {0xBF29F6FF, 0xEEA56814},
+    {0x3EC5DBDF, 0x0E314BFE},
+};
 
-//static const du rpi;
+static const du	rpi = {0x3FD45F30, 0x6DC9C883};
 
-//static const du pihi;
+static const du	pihi = {0x400921FB, 0x50000000};
 
-//static const du pilo;
+static const du	pilo = {0x3E6110B4, 0x611A6263};
 
-//static const fu zero;
-
-extern du P[5];
-
-extern du rpi;
-
-extern du pihi;
-
-extern du pilo;
-
-extern fu zero;
+static const fu	zero = {0x00000000};
 
 extern float __libm_qnan_f;
 
diff --git a/tables/objects.py b/tables/objects.py
index 4f48a637d2..31d737fca8 100644
--- a/tables/objects.py
+++ b/tables/objects.py
@@ -211,7 +211,7 @@
     0x800992F0:"boot_rodata_lookathil",
     0x80099300:"boot_rodata_xprintf",
     0x80099400:"boot_rodata_cosf",
-    0x80099450:"boot_rodata___libm_qnan_f", # XXX this not be from a file with any functions
+    0x80099450:"boot_rodata___libm_qnan_f", # XXX this might not be from a file with any functions
     0x80099460:"boot_rodata_xldtob",
     0x800994C0:"boot_rodata_llcvt",
     0x800994D0:"boot_rodata_build_date",