diff --git a/assets/ymls/us/actors/blargg/blargg.yml b/assets/ymls/us/actors/blargg/blargg.yml
index a2af9dd7..47c047b5 100644
--- a/assets/ymls/us/actors/blargg/blargg.yml
+++ b/assets/ymls/us/actors/blargg/blargg.yml
@@ -6,7 +6,7 @@
 blargg_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x670
+  offset: 0x4738
   symbol: blargg_lights_unused
 
 blargg_seg5_lights_05004740:
diff --git a/assets/ymls/us/actors/blue_coin_switch/blue_coin_switch.yml b/assets/ymls/us/actors/blue_coin_switch/blue_coin_switch.yml
index e0df7ca6..fd7c487d 100644
--- a/assets/ymls/us/actors/blue_coin_switch/blue_coin_switch.yml
+++ b/assets/ymls/us/actors/blue_coin_switch/blue_coin_switch.yml
@@ -19,6 +19,7 @@ blue_coin_switch_top:
   offset: 0x418
   format: RGBA16
   symbol: blue_coin_switch_seg8_texture_08000418
+
 blue_coin_switch_seg8_lights_08000000:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/blue_fish/blue_fish.yml b/assets/ymls/us/actors/blue_fish/blue_fish.yml
index 3d2a786b..0647c582 100644
--- a/assets/ymls/us/actors/blue_fish/blue_fish.yml
+++ b/assets/ymls/us/actors/blue_fish/blue_fish.yml
@@ -11,6 +11,7 @@ blue_fish:
   offset: 0x1B5E0
   format: RGBA16
   symbol: blue_fish_seg3_texture_0301B5E0
+
 blue_fish_seg3_lights_0301B5C8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bobomb/bobomb.yml b/assets/ymls/us/actors/bobomb/bobomb.yml
index 01826e1d..2b4f567f 100644
--- a/assets/ymls/us/actors/bobomb/bobomb.yml
+++ b/assets/ymls/us/actors/bobomb/bobomb.yml
@@ -123,7 +123,7 @@ bobomb_seg8_lights_08022E00:
 bobomb_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x22E00
+  offset: 0x22E18
   symbol: bobomb_lights_unused
 
 bobomb_seg8_vertex_08022E30:
diff --git a/assets/ymls/us/actors/bomb/bomb.yml b/assets/ymls/us/actors/bomb/bomb.yml
index 9d771745..f5b4a2b9 100644
--- a/assets/ymls/us/actors/bomb/bomb.yml
+++ b/assets/ymls/us/actors/bomb/bomb.yml
@@ -27,6 +27,7 @@ bomb_spike:
   offset: 0x59C10
   format: RGBA16
   symbol: bomb_seg6_texture_06059AC0
+
 bomb_seg6_lights_06057AA8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/boo/boo.yml b/assets/ymls/us/actors/boo/boo.yml
index 3dc13c64..df59dab7 100644
--- a/assets/ymls/us/actors/boo/boo.yml
+++ b/assets/ymls/us/actors/boo/boo.yml
@@ -19,6 +19,7 @@ boo_mouth:
   offset: 0xAB40
   format: RGBA16
   symbol: boo_seg5_texture_0500AB40
+
 boo_seg5_lights_05009B28:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/boo_castle/boo_castle.yml b/assets/ymls/us/actors/boo_castle/boo_castle.yml
index 65e3ec80..1e144633 100644
--- a/assets/ymls/us/actors/boo_castle/boo_castle.yml
+++ b/assets/ymls/us/actors/boo_castle/boo_castle.yml
@@ -19,6 +19,7 @@ bbh_boo_mouth:
   offset: 0xAB40
   format: RGBA16
   symbol: boo_castle_seg6_texture_06016670
+
 boo_castle_seg6_lights_06015658:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/book/book.yml b/assets/ymls/us/actors/book/book.yml
index 51da51e1..99cfb3b2 100644
--- a/assets/ymls/us/actors/book/book.yml
+++ b/assets/ymls/us/actors/book/book.yml
@@ -11,6 +11,7 @@ book_cover:
   offset: 0x1060
   format: RGBA16
   symbol: book_seg5_texture_05002570
+
 book_seg5_lights_05002558:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bookend/bookend.yml b/assets/ymls/us/actors/bookend/bookend.yml
index 41b5dc17..0f9d10a3 100644
--- a/assets/ymls/us/actors/bookend/bookend.yml
+++ b/assets/ymls/us/actors/bookend/bookend.yml
@@ -43,28 +43,29 @@ bookend_tooth:
   offset: 0x460
   format: RGBA16
   symbol: bookend_seg5_texture_05000460
+
 bookend_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x2FB0
+  offset: 0x1800
   symbol: bookend_lights_unused1
 
 bookend_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x2FB0
+  offset: 0x1818
   symbol: bookend_lights_unused2
 
 bookend_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x2FB0
+  offset: 0x1830
   symbol: bookend_lights_unused3
 
 bookend_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x2FB0
+  offset: 0x1848
   symbol: bookend_lights_unused4
 
 bookend_seg5_lights_05001860:
diff --git a/assets/ymls/us/actors/bowser/bowser.yml b/assets/ymls/us/actors/bowser/bowser.yml
index 4c0508ce..f94bc1c2 100644
--- a/assets/ymls/us/actors/bowser/bowser.yml
+++ b/assets/ymls/us/actors/bowser/bowser.yml
@@ -235,6 +235,7 @@ bowser_upper_face:
   offset: 0x28438
   format: RGBA16
   symbol: bowser_seg6_texture_06028438
+
 bowser_seg6_lights_06038C38:
   type: LIGHTS1
   size: 24
@@ -244,13 +245,13 @@ bowser_seg6_lights_06038C38:
 bowser_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x38C38
+  offset: 0x38C50
   symbol: bowser_lights_unused1
 
 bowser_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x38C38
+  offset: 0x38C68
   symbol: bowser_lights_unused2
 
 bowser_seg6_vertex_06038C80:
diff --git a/assets/ymls/us/actors/bowser_flame/bowser_flame.yml b/assets/ymls/us/actors/bowser_flame/bowser_flame.yml
index 40cb6d4d..0a7e3686 100644
--- a/assets/ymls/us/actors/bowser_flame/bowser_flame.yml
+++ b/assets/ymls/us/actors/bowser_flame/bowser_flame.yml
@@ -115,6 +115,7 @@ bowser_flame_9:
   offset: 0x12000
   format: RGBA16
   symbol: flame_seg6_texture_06012000
+
 flame_seg6_vertex_0601C000:
   type: VTX
   size: 64
diff --git a/assets/ymls/us/actors/breakable_box/breakable_box.yml b/assets/ymls/us/actors/breakable_box/breakable_box.yml
index b6f9c125..e5969b8a 100644
--- a/assets/ymls/us/actors/breakable_box/breakable_box.yml
+++ b/assets/ymls/us/actors/breakable_box/breakable_box.yml
@@ -19,6 +19,7 @@ crazy_box_surface:
   offset: 0x11A90
   format: RGBA16
   symbol: breakable_box_seg8_texture_08011A90
+
 breakable_box_seg8_lights_08011A80:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bub/bub.yml b/assets/ymls/us/actors/bub/bub.yml
index 8828aa27..44d6bfaf 100644
--- a/assets/ymls/us/actors/bub/bub.yml
+++ b/assets/ymls/us/actors/bub/bub.yml
@@ -35,6 +35,7 @@ bub_scales:
   offset: 0x2408
   format: RGBA16
   symbol: bub_seg6_texture_060102A8
+
 bub_seg6_lights_0600E280:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bubba/bubba.yml b/assets/ymls/us/actors/bubba/bubba.yml
index e305b50f..bdbcc959 100644
--- a/assets/ymls/us/actors/bubba/bubba.yml
+++ b/assets/ymls/us/actors/bubba/bubba.yml
@@ -43,8 +43,10 @@ bubba_sunglasses:
   offset: 0x8
   format: RGBA16
   symbol: bubba_seg5_texture_05000008
-bubba_unused_1:
-  type: U64
+
+# bubba_unused_1:
+#   type: U64
+
 bubba_seg5_lights_05004408:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bubble/bubble.yml b/assets/ymls/us/actors/bubble/bubble.yml
index 46a16d6f..45ac62c6 100644
--- a/assets/ymls/us/actors/bubble/bubble.yml
+++ b/assets/ymls/us/actors/bubble/bubble.yml
@@ -19,6 +19,7 @@ mr_i_bubble:
   offset: 0x1D560
   format: RGBA16
   symbol: bubble_seg4_texture_0401D560
+
 bubble_seg4_vertex_0401CD20:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/bullet_bill/bullet_bill.yml b/assets/ymls/us/actors/bullet_bill/bullet_bill.yml
index 6406de61..a1304c2a 100644
--- a/assets/ymls/us/actors/bullet_bill/bullet_bill.yml
+++ b/assets/ymls/us/actors/bullet_bill/bullet_bill.yml
@@ -19,6 +19,7 @@ bullet_bill_mouth:
   offset: 0xCAA8
   format: RGBA16
   symbol: bullet_bill_seg5_texture_0500CAA8
+
 bullet_bill_seg5_lights_0500BA90:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/bully/bully.yml b/assets/ymls/us/actors/bully/bully.yml
index a2525e88..fe2155ff 100644
--- a/assets/ymls/us/actors/bully/bully.yml
+++ b/assets/ymls/us/actors/bully/bully.yml
@@ -35,6 +35,7 @@ bully_right_side:
   offset: 0x1468
   format: RGBA16
   symbol: bully_seg5_texture_05001468
+
 bully_seg5_vertex_05000000:
   type: VTX
   size: 112
@@ -66,7 +67,7 @@ bully_seg5_lights_05000420:
 bully_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x420
+  offset: 0x438
   symbol: bully_lights_unused
 
 bully_seg5_lights_05000450:
diff --git a/assets/ymls/us/actors/burn_smoke/burn_smoke.yml b/assets/ymls/us/actors/burn_smoke/burn_smoke.yml
index 51019848..fcc02540 100644
--- a/assets/ymls/us/actors/burn_smoke/burn_smoke.yml
+++ b/assets/ymls/us/actors/burn_smoke/burn_smoke.yml
@@ -11,6 +11,7 @@ burn_smoke:
   offset: 0x21800
   format: IA16
   symbol: burn_smoke_seg4_texture_04021800
+
 burn_smoke_seg4_vertex_040217C0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/butterfly/butterfly.yml b/assets/ymls/us/actors/butterfly/butterfly.yml
index fe4a4443..6b91dcd5 100644
--- a/assets/ymls/us/actors/butterfly/butterfly.yml
+++ b/assets/ymls/us/actors/butterfly/butterfly.yml
@@ -11,6 +11,7 @@ butterfly_wing:
   offset: 0x43A8
   format: RGBA16
   symbol: butterfly_seg3_texture_030043A8
+
 butterfly_seg3_vertex_03004348:
   type: VTX
   size: 48
diff --git a/assets/ymls/us/actors/cannon_barrel/cannon_barrel.yml b/assets/ymls/us/actors/cannon_barrel/cannon_barrel.yml
index 6a571c84..f79df425 100644
--- a/assets/ymls/us/actors/cannon_barrel/cannon_barrel.yml
+++ b/assets/ymls/us/actors/cannon_barrel/cannon_barrel.yml
@@ -11,6 +11,7 @@ cannon_barrel:
   offset: 0x58A8
   format: RGBA16
   symbol: cannon_barrel_seg8_texture_080058A8
+
 cannon_barrel_seg8_lights_08005878:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/cannon_base/cannon_base.yml b/assets/ymls/us/actors/cannon_base/cannon_base.yml
index 143058d0..0e8ae675 100644
--- a/assets/ymls/us/actors/cannon_base/cannon_base.yml
+++ b/assets/ymls/us/actors/cannon_base/cannon_base.yml
@@ -11,6 +11,7 @@ cannon_base:
   offset: 0x49B8
   format: RGBA16
   symbol: cannon_base_seg8_texture_080049B8
+
 cannon_base_seg8_lights_08004988:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/cannon_lid/cannon_lid.yml b/assets/ymls/us/actors/cannon_lid/cannon_lid.yml
index ced0bff0..bbb4b5fc 100644
--- a/assets/ymls/us/actors/cannon_lid/cannon_lid.yml
+++ b/assets/ymls/us/actors/cannon_lid/cannon_lid.yml
@@ -11,6 +11,7 @@ cannon_lid:
   offset: 0x4058
   format: RGBA16
   symbol: cannon_lid_seg8_texture_08004058
+
 cannon_lid_seg8_lights_08004040:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/capswitch/capswitch.yml b/assets/ymls/us/actors/capswitch/capswitch.yml
index 3aa4bb9a..3c28a023 100644
--- a/assets/ymls/us/actors/capswitch/capswitch.yml
+++ b/assets/ymls/us/actors/capswitch/capswitch.yml
@@ -19,6 +19,7 @@ cap_switch_head:
   offset: 0x1C48
   format: IA16
   symbol: capswitch_seg5_texture_05001C48
+
 capswitch_seg5_lights_05001BB8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/chain_ball/chain_ball.yml b/assets/ymls/us/actors/chain_ball/chain_ball.yml
index 752de1e0..db3d9a74 100644
--- a/assets/ymls/us/actors/chain_ball/chain_ball.yml
+++ b/assets/ymls/us/actors/chain_ball/chain_ball.yml
@@ -11,14 +11,16 @@ chain_ball:
   offset: 0x20AE8
   format: RGBA16
   symbol: chain_ball_seg6_texture_06020AE8
+
 chain_ball_seg6_vertex_06020AA0:
   type: VTX
   size: 32
   offset: 0x20AA0
   symbol: chain_ball_seg6_vertex_06020AA0
 
-chain_ball_unused_1:
-  type: U64
+# chain_ball_unused_1:
+#   type: U64
+
 chain_ball_seg6_dl_060212E8:
   type: GFX
   offset: 0x212E8
diff --git a/assets/ymls/us/actors/chair/chair.yml b/assets/ymls/us/actors/chair/chair.yml
index 5ac0e8cf..900a1983 100644
--- a/assets/ymls/us/actors/chair/chair.yml
+++ b/assets/ymls/us/actors/chair/chair.yml
@@ -35,10 +35,11 @@ chair_surface_unused:
   offset: 0x4460
   format: RGBA16
   symbol: chair_seg5_texture_05004460
+
 chair_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x24FC0
+  offset: 0x3048
   symbol: chair_lights_unused
 
 chair_seg5_lights_05004C60:
diff --git a/assets/ymls/us/actors/checkerboard_platform/checkerboard_platform.yml b/assets/ymls/us/actors/checkerboard_platform/checkerboard_platform.yml
index 7afde102..33b5f8f3 100644
--- a/assets/ymls/us/actors/checkerboard_platform/checkerboard_platform.yml
+++ b/assets/ymls/us/actors/checkerboard_platform/checkerboard_platform.yml
@@ -19,6 +19,7 @@ checkerboard_platform_side:
   offset: 0xC840
   format: RGBA16
   symbol: checkerboard_platform_seg8_texture_0800C840
+
 checkerboard_platform_seg8_lights_0800C828:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/chillychief/chillychief.yml b/assets/ymls/us/actors/chillychief/chillychief.yml
index 4b6bea5f..c541e60e 100644
--- a/assets/ymls/us/actors/chillychief/chillychief.yml
+++ b/assets/ymls/us/actors/chillychief/chillychief.yml
@@ -28,6 +28,7 @@ chill_bully_eye:
   format: RGBA16
   symbol: chilly_chief_seg6_texture_06002060
 
+# todo: move to geo yml
 chilly_chief_geo:
   type: SM64:GEO_LAYOUT
   offset: 0x3754
@@ -37,6 +38,7 @@ chilly_chief_big_geo:
   type: SM64:GEO_LAYOUT
   offset: 0x3874
   symbol: chilly_chief_big_geo
+
 chilly_chief_seg6_lights_06000000:
   type: LIGHTS1
   size: 24
@@ -58,7 +60,7 @@ chilly_chief_seg6_lights_06000030:
 chillychief_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x30
+  offset: 0x48
   symbol: chillychief_lights_unused
 
 chilly_chief_seg6_vertex_06002860:
diff --git a/assets/ymls/us/actors/chuckya/chuckya.yml b/assets/ymls/us/actors/chuckya/chuckya.yml
index deb86203..de105668 100644
--- a/assets/ymls/us/actors/chuckya/chuckya.yml
+++ b/assets/ymls/us/actors/chuckya/chuckya.yml
@@ -35,46 +35,47 @@ chuckya_hand_antenna:
   offset: 0x7778
   format: RGBA16
   symbol: chuckya_seg8_texture_08007778
+
 chuckya_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x66D0
   symbol: chuckya_lights_unused1
 
 chuckya_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x66E8
   symbol: chuckya_lights_unused2
 
 chuckya_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x6700
   symbol: chuckya_lights_unused3
 
 chuckya_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x6718
   symbol: chuckya_lights_unused4
 
 chuckya_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x6730
   symbol: chuckya_lights_unused5
 
 chuckya_lights_unused6:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x6748
   symbol: chuckya_lights_unused6
 
 chuckya_lights_unused7:
   type: LIGHTS1
   size: 24
-  offset: 0x3010
+  offset: 0x6760
   symbol: chuckya_lights_unused7
 
 chuckya_seg8_vertex_08009F78:
diff --git a/assets/ymls/us/actors/clam_shell/clam_shell.yml b/assets/ymls/us/actors/clam_shell/clam_shell.yml
index 7f6c97e7..f7d61618 100644
--- a/assets/ymls/us/actors/clam_shell/clam_shell.yml
+++ b/assets/ymls/us/actors/clam_shell/clam_shell.yml
@@ -19,16 +19,17 @@ clam_shell_mouth:
   offset: 0x830
   format: RGBA16
   symbol: clam_shell_seg5_texture_05000830
+
 clam_shell_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xABE8
+  offset: 0x0
   symbol: clam_shell_lights_unused1
 
 clam_shell_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xABE8
+  offset: 0x18
   symbol: clam_shell_lights_unused2
 
 clam_shell_seg5_lights_05001030:
diff --git a/assets/ymls/us/actors/coin/coin.yml b/assets/ymls/us/actors/coin/coin.yml
index 836b5580..8a9414c3 100644
--- a/assets/ymls/us/actors/coin/coin.yml
+++ b/assets/ymls/us/actors/coin/coin.yml
@@ -35,6 +35,7 @@ coin_tilt_right:
   offset: 0x5F80
   format: IA16
   symbol: coin_seg3_texture_03005F80
+
 coin_seg3_vertex_030056C0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/cyan_fish/cyan_fish.yml b/assets/ymls/us/actors/cyan_fish/cyan_fish.yml
index f7041038..8c16f380 100644
--- a/assets/ymls/us/actors/cyan_fish/cyan_fish.yml
+++ b/assets/ymls/us/actors/cyan_fish/cyan_fish.yml
@@ -11,12 +11,14 @@ cyan_fish:
   offset: 0xD468
   format: RGBA16
   symbol: cyan_fish_seg6_texture_0600D468
-cyan_fish_unused_1:
-  type: U64
+
+# cyan_fish_unused_1:
+#   type: U64
+
 cyan_fish_seg6_lights_0600DC68:
   type: LIGHTS1
   size: 24
-  offset: 0xD468
+  offset: 0xDC68
   symbol: cyan_fish_seg6_lights_0600DC68
 
 cyan_fish_seg6_vertex_0600DC80:
diff --git a/assets/ymls/us/actors/dirt/dirt.yml b/assets/ymls/us/actors/dirt/dirt.yml
index 939d9e5e..6ef0cf41 100644
--- a/assets/ymls/us/actors/dirt/dirt.yml
+++ b/assets/ymls/us/actors/dirt/dirt.yml
@@ -11,6 +11,7 @@ dirt_particle:
   offset: 0x2BDF8
   format: RGBA16
   symbol: dirt_seg3_texture_0302BDF8
+
 dirt_seg3_lights_0302BD68:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/door/door.yml b/assets/ymls/us/actors/door/door.yml
index cf048d79..45cf8231 100644
--- a/assets/ymls/us/actors/door/door.yml
+++ b/assets/ymls/us/actors/door/door.yml
@@ -115,6 +115,7 @@ zero_star_door_sign:
   offset: 0x11D10
   format: RGBA16
   symbol: door_seg3_texture_03011D10
+
 door_seg3_lights_03009CE0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/dorrie/dorrie.yml b/assets/ymls/us/actors/dorrie/dorrie.yml
index d25c901d..6dd7284f 100644
--- a/assets/ymls/us/actors/dorrie/dorrie.yml
+++ b/assets/ymls/us/actors/dorrie/dorrie.yml
@@ -27,6 +27,7 @@ dorrie_tongue:
   offset: 0xADA0
   format: RGBA16
   symbol: dorrie_seg6_texture_0600ADA0
+
 dorrie_seg6_lights_0600B5A0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/exclamation_box/exclamation_box.yml b/assets/ymls/us/actors/exclamation_box/exclamation_box.yml
index 4ac7744c..e665db1c 100644
--- a/assets/ymls/us/actors/exclamation_box/exclamation_box.yml
+++ b/assets/ymls/us/actors/exclamation_box/exclamation_box.yml
@@ -67,6 +67,7 @@ wing_cap_box_side:
   offset: 0x16628
   format: RGBA16
   symbol: exclamation_box_seg8_texture_08016628
+
 exclamation_box_seg8_lights_08012E10:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/exclamation_box_outline/exclamation_box_outline.yml b/assets/ymls/us/actors/exclamation_box_outline/exclamation_box_outline.yml
index b359385f..8d6c9540 100644
--- a/assets/ymls/us/actors/exclamation_box_outline/exclamation_box_outline.yml
+++ b/assets/ymls/us/actors/exclamation_box_outline/exclamation_box_outline.yml
@@ -19,6 +19,7 @@ exclamation_point:
   offset: 0x25A80
   format: RGBA16
   symbol: exclamation_box_outline_seg8_texture_08025A80
+
 exclamation_box_outline_seg8_lights_08024CB8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/explosion/explosion.yml b/assets/ymls/us/actors/explosion/explosion.yml
index a596640d..096b6ea7 100644
--- a/assets/ymls/us/actors/explosion/explosion.yml
+++ b/assets/ymls/us/actors/explosion/explosion.yml
@@ -59,6 +59,7 @@ explosion_6:
   offset: 0x3A08
   format: RGBA16
   symbol: explosion_seg3_texture_03003A08
+
 explosion_seg3_vertex_030009C8:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/eyerok/eyerok.yml b/assets/ymls/us/actors/eyerok/eyerok.yml
index 9fc710a8..a0ed30e8 100644
--- a/assets/ymls/us/actors/eyerok/eyerok.yml
+++ b/assets/ymls/us/actors/eyerok/eyerok.yml
@@ -43,10 +43,11 @@ eyerok_eye_open:
   offset: 0x9540
   format: RGBA16
   symbol: eyerok_seg5_texture_05009540
+
 eyerok_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x4328
+  offset: 0x8D28
   symbol: eyerok_lights_unused
 
 eyerok_seg5_lights_0500B540:
diff --git a/assets/ymls/us/actors/flame/flame.yml b/assets/ymls/us/actors/flame/flame.yml
index de127668..4be6baea 100644
--- a/assets/ymls/us/actors/flame/flame.yml
+++ b/assets/ymls/us/actors/flame/flame.yml
@@ -67,6 +67,7 @@ flame_7:
   offset: 0x1AB20
   format: IA16
   symbol: flame_seg3_texture_0301AB20
+
 flame_seg3_vertex_030172E0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/flyguy/flyguy.yml b/assets/ymls/us/actors/flyguy/flyguy.yml
index 52009fa6..e8a05ef7 100644
--- a/assets/ymls/us/actors/flyguy/flyguy.yml
+++ b/assets/ymls/us/actors/flyguy/flyguy.yml
@@ -27,12 +27,14 @@ flyguy_propeller:
   offset: 0xF888
   format: IA16
   symbol: flyguy_seg8_texture_0800F888
-flyguy_unused_1:
-  type: U64
+
+# flyguy_unused_1:
+#   type: U64
+
 flyguy_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xF888
+  offset: 0x10088
   symbol: flyguy_lights_unused1
 
 flyguy_seg8_lights_080100A0:
@@ -50,25 +52,25 @@ flyguy_seg8_lights_080100B8:
 flyguy_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x100B8
+  offset: 0x100D0
   symbol: flyguy_lights_unused2
 
 flyguy_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x100B8
+  offset: 0x100E8
   symbol: flyguy_lights_unused3
 
 flyguy_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x100B8
+  offset: 0x10100
   symbol: flyguy_lights_unused4
 
 flyguy_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0x100B8
+  offset: 0x10118
   symbol: flyguy_lights_unused5
 
 flyguy_seg8_vertex_08010130:
diff --git a/assets/ymls/us/actors/fwoosh/fwoosh.yml b/assets/ymls/us/actors/fwoosh/fwoosh.yml
index d10817bc..8eb88c1e 100644
--- a/assets/ymls/us/actors/fwoosh/fwoosh.yml
+++ b/assets/ymls/us/actors/fwoosh/fwoosh.yml
@@ -11,6 +11,7 @@ fwoosh_face:
   offset: 0x15808
   format: IA16
   symbol: fwoosh_seg5_texture_05015808
+
 fwoosh_seg5_vertex_050157C8:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/goomba/goomba.yml b/assets/ymls/us/actors/goomba/goomba.yml
index d8e739d6..f497b141 100644
--- a/assets/ymls/us/actors/goomba/goomba.yml
+++ b/assets/ymls/us/actors/goomba/goomba.yml
@@ -27,16 +27,17 @@ goomba_face_blink:
   offset: 0x1A530
   format: RGBA16
   symbol: goomba_seg8_texture_0801A530
+
 goomba_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x16040
+  offset: 0x194A0
   symbol: goomba_lights_unused1
 
 goomba_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x16040
+  offset: 0x194B8
   symbol: goomba_lights_unused2
 
 goomba_seg8_lights_080194D0:
diff --git a/assets/ymls/us/actors/haunted_cage/haunted_cage.yml b/assets/ymls/us/actors/haunted_cage/haunted_cage.yml
index 6d9df2ca..6893ba5d 100644
--- a/assets/ymls/us/actors/haunted_cage/haunted_cage.yml
+++ b/assets/ymls/us/actors/haunted_cage/haunted_cage.yml
@@ -51,6 +51,7 @@ bbh_cage_wooden_base:
   offset: 0xD688
   format: RGBA16
   symbol: haunted_cage_seg5_texture_0500D688
+
 haunted_cage_seg5_lights_0500C258:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/heart/heart.yml b/assets/ymls/us/actors/heart/heart.yml
index 3ffac825..615ae2c5 100644
--- a/assets/ymls/us/actors/heart/heart.yml
+++ b/assets/ymls/us/actors/heart/heart.yml
@@ -11,6 +11,7 @@ spinning_heart:
   offset: 0xD7E0
   format: RGBA16
   symbol: heart_seg8_texture_0800D7E0
+
 heart_seg8_vertex_0800D7A0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/heave_ho/heave_ho.yml b/assets/ymls/us/actors/heave_ho/heave_ho.yml
index de14bbb4..88f619b7 100644
--- a/assets/ymls/us/actors/heave_ho/heave_ho.yml
+++ b/assets/ymls/us/actors/heave_ho/heave_ho.yml
@@ -51,22 +51,23 @@ heave-ho_turnkey:
   offset: 0x113C8
   format: RGBA16
   symbol: heave_ho_seg5_texture_050113C8
+
 heave_ho_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xDFE0
+  offset: 0xE920
   symbol: heave_ho_lights_unused1
 
 heave_ho_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xDFE0
+  offset: 0xE938
   symbol: heave_ho_lights_unused2
 
 heave_ho_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0xDFE0
+  offset: 0xE950
   symbol: heave_ho_lights_unused3
 
 heave_ho_seg5_lights_0500E968:
@@ -84,13 +85,13 @@ heave_ho_seg5_lights_0500E980:
 heave_ho_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0xE980
+  offset: 0xE998
   symbol: heave_ho_lights_unused4
 
 heave_ho_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0xE980
+  offset: 0xE9B0
   symbol: heave_ho_lights_unused5
 
 heave_ho_seg5_lights_05011BC8:
diff --git a/assets/ymls/us/actors/hoot/hoot.yml b/assets/ymls/us/actors/hoot/hoot.yml
index eb1af107..75e308e0 100644
--- a/assets/ymls/us/actors/hoot/hoot.yml
+++ b/assets/ymls/us/actors/hoot/hoot.yml
@@ -27,6 +27,7 @@ hoot_wing_tip:
   offset: 0x2650
   format: RGBA16
   symbol: hoot_seg5_texture_05002650
+
 hoot_seg5_lights_05000900:
   type: LIGHTS1
   size: 24
@@ -36,7 +37,7 @@ hoot_seg5_lights_05000900:
 hoot_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x900
+  offset: 0x918
   symbol: hoot_lights_unused1
 
 hoot_seg5_lights_05000930:
@@ -66,19 +67,19 @@ hoot_seg5_lights_05000978:
 hoot_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x978
+  offset: 0x990
   symbol: hoot_lights_unused2
 
 hoot_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x978
+  offset: 0x9A8
   symbol: hoot_lights_unused3
 
 hoot_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x978
+  offset: 0x9C0
   symbol: hoot_lights_unused4
 
 hoot_seg5_lights_050009D8:
diff --git a/assets/ymls/us/actors/impact_ring/impact_ring.yml b/assets/ymls/us/actors/impact_ring/impact_ring.yml
index 8061cca5..3f8bae45 100644
--- a/assets/ymls/us/actors/impact_ring/impact_ring.yml
+++ b/assets/ymls/us/actors/impact_ring/impact_ring.yml
@@ -19,6 +19,7 @@ impact_ring_right_side:
   offset: 0x1DA50
   format: IA16
   symbol: impact_ring_seg6_texture_0601DA50
+
 impact_ring_seg6_vertex_0601C9D0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/impact_smoke/impact_smoke.yml b/assets/ymls/us/actors/impact_smoke/impact_smoke.yml
index 0965bc30..5e8c66bb 100644
--- a/assets/ymls/us/actors/impact_smoke/impact_smoke.yml
+++ b/assets/ymls/us/actors/impact_smoke/impact_smoke.yml
@@ -35,14 +35,7 @@ impact_smoke_3:
   offset: 0x60B78
   format: IA16
   symbol: impact_smoke_seg6_texture_06060A28
-impact_smoke_seg6_texture_0605AA28:
-  type: U8
-impact_smoke_seg6_texture_0605CA28:
-  type: U8
-impact_smoke_seg6_texture_0605EA28:
-  type: U8
-impact_smoke_seg6_texture_06060A28:
-  type: U8
+
 impact_smoke_seg6_vertex_06062A28:
   type: VTX
   size: 64
diff --git a/assets/ymls/us/actors/king_bobomb/king_bobomb.yml b/assets/ymls/us/actors/king_bobomb/king_bobomb.yml
index 99193afb..537a0c23 100644
--- a/assets/ymls/us/actors/king_bobomb/king_bobomb.yml
+++ b/assets/ymls/us/actors/king_bobomb/king_bobomb.yml
@@ -91,34 +91,35 @@ king_bob-omb_right_side:
   offset: 0x9478
   format: RGBA16
   symbol: king_bobomb_seg5_texture_05009478
+
 king_bobomb_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x62D18
+  offset: 0x0
   symbol: king_bobomb_lights_unused1
 
 king_bobomb_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x62D18
+  offset: 0x18
   symbol: king_bobomb_lights_unused2
 
 king_bobomb_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x62D18
+  offset: 0x30
   symbol: king_bobomb_lights_unused3
 
 king_bobomb_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x62D18
+  offset: 0x48
   symbol: king_bobomb_lights_unused4
 
 king_bobomb_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0x62D18
+  offset: 0x60
   symbol: king_bobomb_lights_unused5
 
 king_bobomb_seg5_vertex_0500A478:
diff --git a/assets/ymls/us/actors/klepto/klepto.yml b/assets/ymls/us/actors/klepto/klepto.yml
index bf1d6acf..e8bcfd90 100644
--- a/assets/ymls/us/actors/klepto/klepto.yml
+++ b/assets/ymls/us/actors/klepto/klepto.yml
@@ -43,8 +43,10 @@ klepto_wing_flap:
   offset: 0x3008
   format: RGBA16
   symbol: klepto_seg5_texture_05003008
-klepto_unused_1:
-  type: U64
+
+# klepto_unused_1:
+#   type: U64
+
 klepto_seg5_lights_05003808:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/koopa/koopa.yml b/assets/ymls/us/actors/koopa/koopa.yml
index d9ba161f..17473514 100644
--- a/assets/ymls/us/actors/koopa/koopa.yml
+++ b/assets/ymls/us/actors/koopa/koopa.yml
@@ -67,10 +67,11 @@ koopa_shoe:
   offset: 0x3648
   format: RGBA16
   symbol: koopa_seg6_texture_06003648
+
 koopa_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x5178
+  offset: 0x2588
   symbol: koopa_lights_unused1
 
 koopa_seg6_lights_060025A0:
@@ -94,7 +95,7 @@ koopa_seg6_lights_060025D0:
 koopa_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x25D0
+  offset: 0x25E8
   symbol: koopa_lights_unused2
 
 koopa_seg6_lights_06002600:
diff --git a/assets/ymls/us/actors/koopa_flag/koopa_flag.yml b/assets/ymls/us/actors/koopa_flag/koopa_flag.yml
index 86a2f305..d7d07a7f 100644
--- a/assets/ymls/us/actors/koopa_flag/koopa_flag.yml
+++ b/assets/ymls/us/actors/koopa_flag/koopa_flag.yml
@@ -11,6 +11,7 @@ koopa_flag_banner:
   offset: 0x48
   format: RGBA16
   symbol: koopa_flag_seg6_texture_06000048
+
 koopa_flag_seg6_lights_06000000:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/koopa_shell/koopa_shell.yml b/assets/ymls/us/actors/koopa_shell/koopa_shell.yml
index 6799e844..bd61d3de 100644
--- a/assets/ymls/us/actors/koopa_shell/koopa_shell.yml
+++ b/assets/ymls/us/actors/koopa_shell/koopa_shell.yml
@@ -19,6 +19,7 @@ koopa_shell_front:
   offset: 0x2648
   format: RGBA16
   symbol: koopa_shell_seg8_texture_080274A0
+
 koopa_shell_seg8_lights_08026388:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml b/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml
index 5484784c..24d58b81 100644
--- a/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml
+++ b/assets/ymls/us/actors/lakitu_cameraman/lakitu_cameraman.yml
@@ -304,7 +304,7 @@ lakitu_seg6_dl_06005360:
 lakitu_cameraman_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x5360
+  offset: 0x53D8
   symbol: lakitu_cameraman_lights_unused1
 
 lakitu_seg6_lights_060053F0:
@@ -316,13 +316,13 @@ lakitu_seg6_lights_060053F0:
 lakitu_cameraman_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x53F0
+  offset: 0x5408
   symbol: lakitu_cameraman_lights_unused2
 
 lakitu_cameraman_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x53F0
+  offset: 0x5420
   symbol: lakitu_cameraman_lights_unused3
 
 lakitu_seg6_lights_06005438:
@@ -334,7 +334,7 @@ lakitu_seg6_lights_06005438:
 lakitu_cameraman_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x5438
+  offset: 0x5450
   symbol: lakitu_cameraman_lights_unused4
 
 lakitu_seg6_vertex_06005468:
diff --git a/assets/ymls/us/actors/lakitu_enemy/lakitu_enemy.yml b/assets/ymls/us/actors/lakitu_enemy/lakitu_enemy.yml
index b9a71aad..c22c764b 100644
--- a/assets/ymls/us/actors/lakitu_enemy/lakitu_enemy.yml
+++ b/assets/ymls/us/actors/lakitu_enemy/lakitu_enemy.yml
@@ -43,10 +43,11 @@ lakitu_enemy_shell:
   offset: 0x114E0
   format: RGBA16
   symbol: lakitu_enemy_seg5_texture_050114E0
+
 lakitu_enemy_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x5610
+  offset: 0xEC98
   symbol: lakitu_enemy_lights_unused1
 
 lakitu_enemy_seg5_lights_0500ECB0:
@@ -58,7 +59,7 @@ lakitu_enemy_seg5_lights_0500ECB0:
 lakitu_enemy_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xECB0
+  offset: 0xECC8
   symbol: lakitu_enemy_lights_unused2
 
 lakitu_enemy_seg5_lights_050124E0:
diff --git a/assets/ymls/us/actors/leaves/leaves.yml b/assets/ymls/us/actors/leaves/leaves.yml
index cde620e7..0ca632dc 100644
--- a/assets/ymls/us/actors/leaves/leaves.yml
+++ b/assets/ymls/us/actors/leaves/leaves.yml
@@ -11,6 +11,7 @@ leaf:
   offset: 0x1CBE0
   format: RGBA16
   symbol: leaves_seg3_texture_0301CBE0
+
 leaves_seg3_vertex_0301CBA0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/mad_piano/mad_piano.yml b/assets/ymls/us/actors/mad_piano/mad_piano.yml
index 0c98b1d0..861d2062 100644
--- a/assets/ymls/us/actors/mad_piano/mad_piano.yml
+++ b/assets/ymls/us/actors/mad_piano/mad_piano.yml
@@ -51,28 +51,29 @@ mad_piano_tooth:
   offset: 0x6AF0
   format: RGBA16
   symbol: mad_piano_seg5_texture_05006AF0
+
 mad_piano_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x1CDE0
+  offset: 0x6A90
   symbol: mad_piano_lights_unused1
 
 mad_piano_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x1CDE0
+  offset: 0x6AA8
   symbol: mad_piano_lights_unused2
 
 mad_piano_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x1CDE0
+  offset: 0x6AC0
   symbol: mad_piano_lights_unused3
 
 mad_piano_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x1CDE0
+  offset: 0x6AD8
   symbol: mad_piano_lights_unused4
 
 mad_piano_seg5_lights_050086F0:
diff --git a/assets/ymls/us/actors/manta/manta.yml b/assets/ymls/us/actors/manta/manta.yml
index 216af71e..b0feedb1 100644
--- a/assets/ymls/us/actors/manta/manta.yml
+++ b/assets/ymls/us/actors/manta/manta.yml
@@ -35,6 +35,7 @@ manta_gills:
   offset: 0x1FA0
   format: RGBA16
   symbol: manta_seg5_texture_05001FA0
+
 manta_seg5_lights_05001758:
   type: LIGHTS1
   size: 24
@@ -50,7 +51,7 @@ manta_seg5_lights_05001770:
 manta_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0x1770
+  offset: 0x1788
   symbol: manta_lights_unused
 
 manta_seg5_vertex_050047A0:
diff --git a/assets/ymls/us/actors/mario/mario.yml b/assets/ymls/us/actors/mario/mario.yml
index c7836531..7d1c3591 100644
--- a/assets/ymls/us/actors/mario/mario.yml
+++ b/assets/ymls/us/actors/mario/mario.yml
@@ -155,6 +155,7 @@ mario_wing_tip:
   offset: 0x9090
   format: RGBA16
   symbol: mario_texture_wings_half_2
+
 mario_blue_lights_group:
   type: LIGHTS1
   size: 24
@@ -835,13 +836,13 @@ mario_metal_cap_on_shared_dl:
 mario_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x12120
+  offset: 0x12160
   symbol: mario_lights_unused1
 
 mario_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x12120
+  offset: 0x12178
   symbol: mario_lights_unused2
 
 mario_eyes_cap_off_dl_vertex:
diff --git a/assets/ymls/us/actors/mario_cap/mario_cap.yml b/assets/ymls/us/actors/mario_cap/mario_cap.yml
index a44822de..6b319f94 100644
--- a/assets/ymls/us/actors/mario_cap/mario_cap.yml
+++ b/assets/ymls/us/actors/mario_cap/mario_cap.yml
@@ -51,6 +51,7 @@ mario_cap_wing_tip:
   offset: 0x9090
   format: RGBA16
   symbol: mario_cap_seg3_texture_0301F750
+
 mario_cap_seg3_lights_0301CF08:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/mips/mips.yml b/assets/ymls/us/actors/mips/mips.yml
index bdd520fe..f24e29bc 100644
--- a/assets/ymls/us/actors/mips/mips.yml
+++ b/assets/ymls/us/actors/mips/mips.yml
@@ -11,6 +11,7 @@ mips_eyes:
   offset: 0xFC70
   format: RGBA16
   symbol: mips_seg6_texture_0600FB80
+
 mips_seg6_lights_06010380:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/mist/mist.yml b/assets/ymls/us/actors/mist/mist.yml
index 28a9fc0b..a55104da 100644
--- a/assets/ymls/us/actors/mist/mist.yml
+++ b/assets/ymls/us/actors/mist/mist.yml
@@ -11,6 +11,7 @@ mist:
   offset: 0x80
   format: IA16
   symbol: mist_seg3_texture_03000080
+
 mist_seg3_vertex_03000000:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/moneybag/moneybag.yml b/assets/ymls/us/actors/moneybag/moneybag.yml
index 5a922110..fdbc94a0 100644
--- a/assets/ymls/us/actors/moneybag/moneybag.yml
+++ b/assets/ymls/us/actors/moneybag/moneybag.yml
@@ -19,6 +19,7 @@ moneybag_mouth:
   offset: 0x39B0
   format: RGBA16
   symbol: moneybag_seg6_texture_060039B0
+
 moneybag_seg6_lights_060051B0:
   type: LIGHTS1
   size: 24
@@ -110,13 +111,13 @@ moneybag_seg6_dl_06005750:
 moneybag_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x5750
+  offset: 0x57C0
   symbol: moneybag_lights_unused1
 
 moneybag_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x5750
+  offset: 0x57D8
   symbol: moneybag_lights_unused2
 
 moneybag_seg6_lights_060057F0:
@@ -128,7 +129,7 @@ moneybag_seg6_lights_060057F0:
 moneybag_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x57F0
+  offset: 0x5808
   symbol: moneybag_lights_unused3
 
 moneybag_seg6_vertex_06005820:
diff --git a/assets/ymls/us/actors/monty_mole/monty_mole.yml b/assets/ymls/us/actors/monty_mole/monty_mole.yml
index 60dbee2e..c7443191 100644
--- a/assets/ymls/us/actors/monty_mole/monty_mole.yml
+++ b/assets/ymls/us/actors/monty_mole/monty_mole.yml
@@ -43,40 +43,41 @@ monty_mole_tooth:
   offset: 0x2170
   format: RGBA16
   symbol: monty_mole_seg5_texture_05002170
+
 monty_mole_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x8E0
   symbol: monty_mole_lights_unused1
 
 monty_mole_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x8F8
   symbol: monty_mole_lights_unused2
 
 monty_mole_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x910
   symbol: monty_mole_lights_unused3
 
 monty_mole_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x928
   symbol: monty_mole_lights_unused4
 
 monty_mole_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x940
   symbol: monty_mole_lights_unused5
 
 monty_mole_lights_unused6:
   type: LIGHTS1
   size: 24
-  offset: 0x59F0
+  offset: 0x958
   symbol: monty_mole_lights_unused6
 
 monty_mole_seg5_lights_05003170:
diff --git a/assets/ymls/us/actors/monty_mole_hole/monty_mole_hole.yml b/assets/ymls/us/actors/monty_mole_hole/monty_mole_hole.yml
index 0dbe69a3..41e728ef 100644
--- a/assets/ymls/us/actors/monty_mole_hole/monty_mole_hole.yml
+++ b/assets/ymls/us/actors/monty_mole_hole/monty_mole_hole.yml
@@ -11,6 +11,7 @@ monty_mole_hole:
   offset: 0x40
   format: IA16
   symbol: monty_mole_hole_seg5_texture_05000040
+
 monty_mole_hole_seg5_vertex_05000000:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/mr_i_eyeball/mr_i_eyeball.yml b/assets/ymls/us/actors/mr_i_eyeball/mr_i_eyeball.yml
index b5476321..c9a6d7ae 100644
--- a/assets/ymls/us/actors/mr_i_eyeball/mr_i_eyeball.yml
+++ b/assets/ymls/us/actors/mr_i_eyeball/mr_i_eyeball.yml
@@ -19,6 +19,7 @@ mr_i_eyeball_right_side:
   offset: 0x1080
   format: RGBA16
   symbol: mr_i_eyeball_seg6_texture_06001080
+
 mr_i_eyeball_seg6_vertex_06000000:
   type: VTX
   size: 64
diff --git a/assets/ymls/us/actors/mr_i_iris/mr_i_iris.yml b/assets/ymls/us/actors/mr_i_iris/mr_i_iris.yml
index 1cf0cf17..feeb0be4 100644
--- a/assets/ymls/us/actors/mr_i_iris/mr_i_iris.yml
+++ b/assets/ymls/us/actors/mr_i_iris/mr_i_iris.yml
@@ -35,6 +35,7 @@ mr_i_iris_open:
   offset: 0x2170
   format: RGBA16
   symbol: mr_i_iris_seg6_texture_06002170
+
 mr_i_iris_seg6_vertex_06002130:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/mushroom_1up/mushroom_1up.yml b/assets/ymls/us/actors/mushroom_1up/mushroom_1up.yml
index f2cb6b05..928d98cc 100644
--- a/assets/ymls/us/actors/mushroom_1up/mushroom_1up.yml
+++ b/assets/ymls/us/actors/mushroom_1up/mushroom_1up.yml
@@ -11,6 +11,7 @@
   offset: 0x29628
   format: RGBA16
   symbol: mushroom_1up_seg3_texture_03029628
+
 mushroom_1up_seg3_vertex_030295E8:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/peach/peach.yml b/assets/ymls/us/actors/peach/peach.yml
index a08ecd2b..9a2f295f 100644
--- a/assets/ymls/us/actors/peach/peach.yml
+++ b/assets/ymls/us/actors/peach/peach.yml
@@ -83,6 +83,7 @@ peach_nostril:
   offset: 0x3E28
   format: RGBA16
   symbol: peach_seg5_texture_05003E28
+
 peach_seg5_lights_050009F8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/pebble/pebble.yml b/assets/ymls/us/actors/pebble/pebble.yml
index f217a10e..6441842f 100644
--- a/assets/ymls/us/actors/pebble/pebble.yml
+++ b/assets/ymls/us/actors/pebble/pebble.yml
@@ -11,6 +11,7 @@ pebble:
   offset: 0x1C300
   format: RGBA16
   symbol: pebble_seg3_texture_0301C300
+
 pebble_seg3_vertex_0301C2C0:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/penguin/penguin.yml b/assets/ymls/us/actors/penguin/penguin.yml
index 708de2c6..6601b82f 100644
--- a/assets/ymls/us/actors/penguin/penguin.yml
+++ b/assets/ymls/us/actors/penguin/penguin.yml
@@ -51,6 +51,7 @@ penguin_eye_open:
   offset: 0x2DE0
   format: RGBA16
   symbol: penguin_seg5_texture_05002DE0
+
 penguin_seg5_lights_05002D80:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/piranha_plant/piranha_plant.yml b/assets/ymls/us/actors/piranha_plant/piranha_plant.yml
index 1da0ac2c..738fa41a 100644
--- a/assets/ymls/us/actors/piranha_plant/piranha_plant.yml
+++ b/assets/ymls/us/actors/piranha_plant/piranha_plant.yml
@@ -51,6 +51,7 @@ piranha_plant_leaf:
   offset: 0x143F8
   format: RGBA16
   symbol: piranha_plant_seg6_texture_060143F8
+
 piranha_plant_seg6_lights_060113B0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/pokey/pokey.yml b/assets/ymls/us/actors/pokey/pokey.yml
index 56976ce9..745ff640 100644
--- a/assets/ymls/us/actors/pokey/pokey.yml
+++ b/assets/ymls/us/actors/pokey/pokey.yml
@@ -27,6 +27,7 @@ pokey_face_blink:
   offset: 0x11F50
   format: RGBA16
   symbol: pokey_seg5_texture_05011F50
+
 pokey_seg5_vertex_05011710:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/poundable_pole/poundable_pole.yml b/assets/ymls/us/actors/poundable_pole/poundable_pole.yml
index b56db673..717974da 100644
--- a/assets/ymls/us/actors/poundable_pole/poundable_pole.yml
+++ b/assets/ymls/us/actors/poundable_pole/poundable_pole.yml
@@ -19,6 +19,7 @@ poundable_pole_top:
   offset: 0x1050
   format: RGBA16
   symbol: poundable_pole_seg6_texture_06001050
+
 poundable_pole_seg6_lights_06001038:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/power_meter/power_meter.yml b/assets/ymls/us/actors/power_meter/power_meter.yml
index e32a30ba..082ace76 100644
--- a/assets/ymls/us/actors/power_meter/power_meter.yml
+++ b/assets/ymls/us/actors/power_meter/power_meter.yml
@@ -83,10 +83,6 @@ power_meter_two_segments:
   offset: 0x283E0
   format: RGBA16
   symbol: texture_power_meter_two_segments
-power_meter_unused_1:
-  type: U64
-  offset: 0x293E0
-  symbol: *const
 
 vertex_power_meter_base:
   type: VTX
diff --git a/assets/ymls/us/actors/purple_switch/purple_switch.yml b/assets/ymls/us/actors/purple_switch/purple_switch.yml
index c3a2a1d9..a55ce502 100644
--- a/assets/ymls/us/actors/purple_switch/purple_switch.yml
+++ b/assets/ymls/us/actors/purple_switch/purple_switch.yml
@@ -21,6 +21,7 @@ purple_switch_exclamation_point:
   mio0: 0xC128
   format: RGBA16
   symbol: purple_switch_seg8_texture_0800C128
+
 purple_switch_seg8_lights_0800C090:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/sand/sand.yml b/assets/ymls/us/actors/sand/sand.yml
index 23c28e18..6a2e6510 100644
--- a/assets/ymls/us/actors/sand/sand.yml
+++ b/assets/ymls/us/actors/sand/sand.yml
@@ -11,6 +11,7 @@ sand_particle:
   offset: 0x2BAD0
   format: RGBA16
   symbol: sand_seg3_texture_0302BAD0
+
 sand_seg3_vertex_0302BA90:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/scuttlebug/scuttlebug.yml b/assets/ymls/us/actors/scuttlebug/scuttlebug.yml
index 8cfce825..485f5c52 100644
--- a/assets/ymls/us/actors/scuttlebug/scuttlebug.yml
+++ b/assets/ymls/us/actors/scuttlebug/scuttlebug.yml
@@ -43,16 +43,17 @@ scuttlebug_right_side:
   offset: 0x11908
   format: RGBA16
   symbol: scuttlebug_seg6_texture_06011908
+
 scuttlebug_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x2BCD0
+  offset: 0x100D8
   symbol: scuttlebug_lights_unused1
 
 scuttlebug_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x2BCD0
+  offset: 0x100F0
   symbol: scuttlebug_lights_unused2
 
 scuttlebug_seg6_vertex_06013908:
diff --git a/assets/ymls/us/actors/seaweed/seaweed.yml b/assets/ymls/us/actors/seaweed/seaweed.yml
index a49ea080..14a82b09 100644
--- a/assets/ymls/us/actors/seaweed/seaweed.yml
+++ b/assets/ymls/us/actors/seaweed/seaweed.yml
@@ -35,6 +35,7 @@ seaweed_upper_center:
   offset: 0x8610
   format: RGBA16
   symbol: seaweed_seg6_texture_06008610
+
 seaweed_seg6_lights_06007DF8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/skeeter/skeeter.yml b/assets/ymls/us/actors/skeeter/skeeter.yml
index 676f1558..3332fd2c 100644
--- a/assets/ymls/us/actors/skeeter/skeeter.yml
+++ b/assets/ymls/us/actors/skeeter/skeeter.yml
@@ -19,40 +19,41 @@ skeeter_iris:
   offset: 0x890
   format: RGBA16
   symbol: skeeter_seg6_texture_06000890
+
 skeeter_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x0
   symbol: skeeter_lights_unused1
 
 skeeter_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x18
   symbol: skeeter_lights_unused2
 
 skeeter_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x30
   symbol: skeeter_lights_unused3
 
 skeeter_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x48
   symbol: skeeter_lights_unused4
 
 skeeter_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x60
   symbol: skeeter_lights_unused5
 
 skeeter_lights_unused6:
   type: LIGHTS1
   size: 24
-  offset: 0xA180
+  offset: 0x78
   symbol: skeeter_lights_unused6
 
 skeeter_seg6_vertex_06000990:
diff --git a/assets/ymls/us/actors/small_key/small_key.yml b/assets/ymls/us/actors/small_key/small_key.yml
index f7e1f2d6..9bb8b182 100644
--- a/assets/ymls/us/actors/small_key/small_key.yml
+++ b/assets/ymls/us/actors/small_key/small_key.yml
@@ -3,8 +3,9 @@
   segments:
     seg5: 0x16D5C0
 
-small_key_unused_1:
-  type: U64
+# small_key_unused_1:
+#   type: U64
+
 small_key_seg5_lights_05005798:
   type: LIGHTS1
   size: 24
@@ -29,8 +30,9 @@ small_key_seg5_lights_050057E0:
   offset: 0x57E0
   symbol: small_key_seg5_lights_050057E0
 
-small_key_unused_2:
-  type: U64
+# small_key_unused_2:
+#   type: U64
+
 small_key_seg5_vertex_05005800:
   type: VTX
   size: 120
diff --git a/assets/ymls/us/actors/smoke/smoke.yml b/assets/ymls/us/actors/smoke/smoke.yml
index 3f4a7fa8..62ba2dbc 100644
--- a/assets/ymls/us/actors/smoke/smoke.yml
+++ b/assets/ymls/us/actors/smoke/smoke.yml
@@ -11,6 +11,7 @@ smoke:
   offset: 0x72C0
   format: IA16
   symbol: smoke_seg5_texture_050072C0
+
 smoke_seg5_vertex_05007280:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/snowman/snowman.yml b/assets/ymls/us/actors/snowman/snowman.yml
index 504d86fb..91dd5fed 100644
--- a/assets/ymls/us/actors/snowman/snowman.yml
+++ b/assets/ymls/us/actors/snowman/snowman.yml
@@ -43,30 +43,32 @@ mr_blizzard_right_side:
   offset: 0xA470
   format: RGBA16
   symbol: snowman_seg5_texture_0500A470
-snowman_unused_1:
-  type: U64
+
+# snowman_unused_1:
+#   type: U64
+
 snowman_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x7AF8
+  offset: 0x8C10
   symbol: snowman_lights_unused1
 
 snowman_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x7AF8
+  offset: 0x8C28
   symbol: snowman_lights_unused2
 
 snowman_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x7AF8
+  offset: 0x8C40
   symbol: snowman_lights_unused3
 
 snowman_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x7AF8
+  offset: 0x8C58
   symbol: snowman_lights_unused4
 
 snowman_seg5_lights_0500C470:
diff --git a/assets/ymls/us/actors/snufit/snufit.yml b/assets/ymls/us/actors/snufit/snufit.yml
index 1d054475..8089d0ab 100644
--- a/assets/ymls/us/actors/snufit/snufit.yml
+++ b/assets/ymls/us/actors/snufit/snufit.yml
@@ -35,6 +35,7 @@ snufit_mouth:
   offset: 0x84E0
   format: RGBA16
   symbol: snufit_seg6_texture_060084E0
+
 snufit_seg6_lights_06008CE0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/sparkle/sparkle.yml b/assets/ymls/us/actors/sparkle/sparkle.yml
index 3c1c347e..bb3d2eed 100644
--- a/assets/ymls/us/actors/sparkle/sparkle.yml
+++ b/assets/ymls/us/actors/sparkle/sparkle.yml
@@ -51,6 +51,7 @@ sparkle_5:
   offset: 0x29C90
   format: RGBA16
   symbol: sparkles_seg4_texture_04029C90
+
 sparkles_seg4_vertex_04027450:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/sparkle_animation/sparkle_animation.yml b/assets/ymls/us/actors/sparkle_animation/sparkle_animation.yml
index 97621078..84584b02 100644
--- a/assets/ymls/us/actors/sparkle_animation/sparkle_animation.yml
+++ b/assets/ymls/us/actors/sparkle_animation/sparkle_animation.yml
@@ -43,6 +43,7 @@ sparkle_animation_4:
   offset: 0x34A88
   format: IA16
   symbol: sparkles_animation_seg4_texture_04034A88
+
 sparkles_animation_seg4_vertex_04032A48:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/spindrift/spindrift.yml b/assets/ymls/us/actors/spindrift/spindrift.yml
index a888165d..78bafa42 100644
--- a/assets/ymls/us/actors/spindrift/spindrift.yml
+++ b/assets/ymls/us/actors/spindrift/spindrift.yml
@@ -35,16 +35,17 @@ spindrift_petal:
   offset: 0xED0
   format: RGBA16
   symbol: spindrift_seg5_texture_05000ED0
+
 spindrift_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x35360
+  offset: 0x0
   symbol: spindrift_lights_unused1
 
 spindrift_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x35360
+  offset: 0x18
   symbol: spindrift_lights_unused2
 
 spindrift_seg5_lights_05000030:
@@ -62,7 +63,7 @@ spindrift_seg5_lights_05000048:
 spindrift_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0x48
+  offset: 0x60
   symbol: spindrift_lights_unused3
 
 spindrift_seg5_lights_05000078:
@@ -80,7 +81,7 @@ spindrift_seg5_lights_05000090:
 spindrift_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0x90
+  offset: 0xA8
   symbol: spindrift_lights_unused4
 
 spindrift_seg5_vertex_050000C0:
diff --git a/assets/ymls/us/actors/springboard/springboard.yml b/assets/ymls/us/actors/springboard/springboard.yml
index 3ca9a31a..d0278bb1 100644
--- a/assets/ymls/us/actors/springboard/springboard.yml
+++ b/assets/ymls/us/actors/springboard/springboard.yml
@@ -19,6 +19,7 @@ springboard_top_unused:
   offset: 0x18
   format: RGBA16
   symbol: springboard_seg5_texture_05000018
+
 springboard_seg5_lights_05000000:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/star/star.yml b/assets/ymls/us/actors/star/star.yml
index 1a9be1d8..33e399d4 100644
--- a/assets/ymls/us/actors/star/star.yml
+++ b/assets/ymls/us/actors/star/star.yml
@@ -19,6 +19,7 @@ star_eye:
   offset: 0x2AEF0
   format: RGBA16
   symbol: star_seg3_texture_0302AEF0
+
 star_seg3_lights_0302A6D8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/stomp_smoke/stomp_smoke.yml b/assets/ymls/us/actors/stomp_smoke/stomp_smoke.yml
index 9e32dd4a..28ae2e2c 100644
--- a/assets/ymls/us/actors/stomp_smoke/stomp_smoke.yml
+++ b/assets/ymls/us/actors/stomp_smoke/stomp_smoke.yml
@@ -51,6 +51,7 @@ stomp_smoke_5:
   offset: 0x24948
   format: IA16
   symbol: stomp_smoke_seg4_texture_04024948
+
 stomp_smoke_seg4_vertex_040220C8:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/sushi/sushi.yml b/assets/ymls/us/actors/sushi/sushi.yml
index 192ddaf3..c888c8bb 100644
--- a/assets/ymls/us/actors/sushi/sushi.yml
+++ b/assets/ymls/us/actors/sushi/sushi.yml
@@ -27,8 +27,10 @@ sushi_tooth:
   offset: 0x9AD0
   format: RGBA16
   symbol: sushi_seg5_texture_05009AD0
-sushi_unused_1:
-  type: U64
+
+# sushi_unused_1:
+#   type: U64
+
 sushi_seg5_vertex_05009B50:
   type: VTX
   size: 120
diff --git a/assets/ymls/us/actors/swoop/swoop.yml b/assets/ymls/us/actors/swoop/swoop.yml
index 896d9a85..62a09fd1 100644
--- a/assets/ymls/us/actors/swoop/swoop.yml
+++ b/assets/ymls/us/actors/swoop/swoop.yml
@@ -35,16 +35,17 @@ swoop_wing:
   offset: 0x5A70
   format: RGBA16
   symbol: swoop_seg6_texture_06005A70
+
 swoop_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xA990
+  offset: 0x4240
   symbol: swoop_lights_unused1
 
 swoop_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xA990
+  offset: 0x4258
   symbol: swoop_lights_unused2
 
 swoop_seg6_lights_06006270:
diff --git a/assets/ymls/us/actors/thwomp/thwomp.yml b/assets/ymls/us/actors/thwomp/thwomp.yml
index acf81726..6dd547ef 100644
--- a/assets/ymls/us/actors/thwomp/thwomp.yml
+++ b/assets/ymls/us/actors/thwomp/thwomp.yml
@@ -19,6 +19,7 @@ thwomp_surface:
   offset: 0xA900
   format: RGBA16
   symbol: thwomp_seg5_texture_0500A900
+
 thwomp_seg5_lights_050098E8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/toad/toad.yml b/assets/ymls/us/actors/toad/toad.yml
index a1a8ade0..5a97f9cc 100644
--- a/assets/ymls/us/actors/toad/toad.yml
+++ b/assets/ymls/us/actors/toad/toad.yml
@@ -19,6 +19,7 @@ toad_head:
   offset: 0x6120
   format: RGBA16
   symbol: toad_seg6_texture_06006120
+
 toad_seg6_lights_06005908:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/tornado/tornado.yml b/assets/ymls/us/actors/tornado/tornado.yml
index 3581432e..2a6d2a89 100644
--- a/assets/ymls/us/actors/tornado/tornado.yml
+++ b/assets/ymls/us/actors/tornado/tornado.yml
@@ -11,6 +11,7 @@ tornado:
   offset: 0x12848
   format: IA16
   symbol: tornado_seg5_texture_05013128
+
 tornado_seg5_lights_05014128:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/treasure_chest/treasure_chest.yml b/assets/ymls/us/actors/treasure_chest/treasure_chest.yml
index 0ce77922..94d87a1b 100644
--- a/assets/ymls/us/actors/treasure_chest/treasure_chest.yml
+++ b/assets/ymls/us/actors/treasure_chest/treasure_chest.yml
@@ -35,6 +35,7 @@ treasure_chest_side:
   offset: 0x147A8
   format: RGBA16
   symbol: treasure_chest_seg6_texture_060147A8
+
 treasure_chest_seg6_lights_06013F90:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/tree/tree.yml b/assets/ymls/us/actors/tree/tree.yml
index ca5d1789..43708548 100644
--- a/assets/ymls/us/actors/tree/tree.yml
+++ b/assets/ymls/us/actors/tree/tree.yml
@@ -43,6 +43,7 @@ tree_right_side:
   offset: 0x2EE28
   format: RGBA16
   symbol: tree_seg3_texture_0302EE28
+
 tree_seg3_lights_0302DE10:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/ukiki/ukiki.yml b/assets/ymls/us/actors/ukiki/ukiki.yml
index c1d2d731..09223a3a 100644
--- a/assets/ymls/us/actors/ukiki/ukiki.yml
+++ b/assets/ymls/us/actors/ukiki/ukiki.yml
@@ -35,16 +35,17 @@ ukiki_fur:
   offset: 0xA3C0
   format: RGBA16
   symbol: ukiki_seg5_texture_0500A3C0
+
 ukiki_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x33258
+  offset: 0x7B70
   symbol: ukiki_lights_unused1
 
 ukiki_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x33258
+  offset: 0x7B88
   symbol: ukiki_lights_unused2
 
 ukiki_seg5_lights_05007BA0:
@@ -53,8 +54,9 @@ ukiki_seg5_lights_05007BA0:
   offset: 0x7BA0
   symbol: ukiki_seg5_lights_05007BA0
 
-ukiki_unused_1:
-  type: U64
+# ukiki_unused_1:
+#   type: U64
+
 ukiki_seg5_lights_0500ABC0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/unagi/unagi.yml b/assets/ymls/us/actors/unagi/unagi.yml
index e2164e9b..d1fbe7fa 100644
--- a/assets/ymls/us/actors/unagi/unagi.yml
+++ b/assets/ymls/us/actors/unagi/unagi.yml
@@ -51,52 +51,53 @@ unagi_tooth:
   offset: 0xC120
   format: RGBA16
   symbol: unagi_seg5_texture_0500C120
+
 unagi_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAE60
   symbol: unagi_lights_unused1
 
 unagi_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAE78
   symbol: unagi_lights_unused2
 
 unagi_lights_unused3:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAE90
   symbol: unagi_lights_unused3
 
 unagi_lights_unused4:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAEA8
   symbol: unagi_lights_unused4
 
 unagi_lights_unused5:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAEC0
   symbol: unagi_lights_unused5
 
 unagi_lights_unused6:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAED8
   symbol: unagi_lights_unused6
 
 unagi_lights_unused7:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAEF0
   symbol: unagi_lights_unused7
 
 unagi_lights_unused8:
   type: LIGHTS1
   size: 24
-  offset: 0xD108
+  offset: 0xAF08
   symbol: unagi_lights_unused8
 
 unagi_seg5_vertex_0500CBA0:
diff --git a/assets/ymls/us/actors/walk_smoke/walk_smoke.yml b/assets/ymls/us/actors/walk_smoke/walk_smoke.yml
index cc52c27f..91baaae8 100644
--- a/assets/ymls/us/actors/walk_smoke/walk_smoke.yml
+++ b/assets/ymls/us/actors/walk_smoke/walk_smoke.yml
@@ -59,6 +59,7 @@ walk_smoke_6:
   offset: 0x20EA0
   format: IA16
   symbol: smoke_seg4_texture_04020EA0
+
 smoke_seg4_vertex_0401DE60:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/warp_pipe/warp_pipe.yml b/assets/ymls/us/actors/warp_pipe/warp_pipe.yml
index 0a2108a2..efc9db46 100644
--- a/assets/ymls/us/actors/warp_pipe/warp_pipe.yml
+++ b/assets/ymls/us/actors/warp_pipe/warp_pipe.yml
@@ -19,6 +19,7 @@ warp_pipe_top:
   offset: 0x9168
   format: RGBA16
   symbol: warp_pipe_seg3_texture_03009168
+
 warp_pipe_seg3_lights_030079E8:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/water_bubble/water_bubble.yml b/assets/ymls/us/actors/water_bubble/water_bubble.yml
index ec9cd9e1..03e0d36e 100644
--- a/assets/ymls/us/actors/water_bubble/water_bubble.yml
+++ b/assets/ymls/us/actors/water_bubble/water_bubble.yml
@@ -11,6 +11,7 @@ water_bubble:
   offset: 0xFE80
   format: RGBA16
   symbol: water_bubble_seg5_texture_0500FE80
+
 water_bubble_seg5_lights_0500FE68:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/water_mine/water_mine.yml b/assets/ymls/us/actors/water_mine/water_mine.yml
index 5b1a7713..667afa9a 100644
--- a/assets/ymls/us/actors/water_mine/water_mine.yml
+++ b/assets/ymls/us/actors/water_mine/water_mine.yml
@@ -27,6 +27,7 @@ water_mine_spike_unused:
   offset: 0x59C10
   format: RGBA16
   symbol: water_mine_seg6_texture_0600C4F8
+
 water_mine_seg6_lights_0600A4E0:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/water_ring/water_ring.yml b/assets/ymls/us/actors/water_ring/water_ring.yml
index 64a15e9d..6e8c080b 100644
--- a/assets/ymls/us/actors/water_ring/water_ring.yml
+++ b/assets/ymls/us/actors/water_ring/water_ring.yml
@@ -11,6 +11,7 @@ water_ring:
   offset: 0x12380
   format: RGBA16
   symbol: water_ring_seg6_texture_06012380
+
 water_ring_seg6_lights_06012368:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/water_splash/water_splash.yml b/assets/ymls/us/actors/water_splash/water_splash.yml
index 64e94ae2..8d864c9d 100644
--- a/assets/ymls/us/actors/water_splash/water_splash.yml
+++ b/assets/ymls/us/actors/water_splash/water_splash.yml
@@ -67,6 +67,7 @@ water_splash_7:
   offset: 0x315C8
   format: RGBA16
   symbol: water_splash_seg4_texture_040315C8
+
 water_splash_seg4_vertex_0402A588:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/water_wave/water_wave.yml b/assets/ymls/us/actors/water_wave/water_wave.yml
index 393465d7..9a635ce6 100644
--- a/assets/ymls/us/actors/water_wave/water_wave.yml
+++ b/assets/ymls/us/actors/water_wave/water_wave.yml
@@ -35,6 +35,7 @@ water_wave_3:
   offset: 0x26B58
   format: IA16
   symbol: water_wave_seg4_texture_04026B58
+
 water_wave_seg4_vertex_04025318:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/whirlpool/whirlpool.yml b/assets/ymls/us/actors/whirlpool/whirlpool.yml
index 1f97b6e9..97527100 100644
--- a/assets/ymls/us/actors/whirlpool/whirlpool.yml
+++ b/assets/ymls/us/actors/whirlpool/whirlpool.yml
@@ -11,6 +11,7 @@ whirlpool:
   offset: 0x12848
   format: IA16
   symbol: whirlpool_seg5_texture_05012848
+
 whirlpool_seg5_vertex_05013848:
   type: VTX
   size: 112
diff --git a/assets/ymls/us/actors/white_particle/white_particle.yml b/assets/ymls/us/actors/white_particle/white_particle.yml
index cb297d9f..2507815c 100644
--- a/assets/ymls/us/actors/white_particle/white_particle.yml
+++ b/assets/ymls/us/actors/white_particle/white_particle.yml
@@ -11,6 +11,7 @@ snow_particle:
   offset: 0x2C6A0
   format: RGBA16
   symbol: white_particle_texture
+
 white_particle_vertex:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/white_particle_small/white_particle_small.yml b/assets/ymls/us/actors/white_particle_small/white_particle_small.yml
index e0273de5..fe5ddf47 100644
--- a/assets/ymls/us/actors/white_particle_small/white_particle_small.yml
+++ b/assets/ymls/us/actors/white_particle_small/white_particle_small.yml
@@ -11,6 +11,7 @@ small_snow_particle:
   offset: 0x32780
   format: RGBA16
   symbol: white_particle_small_texture
+
 white_particle_small_vertex:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/whomp/whomp.yml b/assets/ymls/us/actors/whomp/whomp.yml
index 53b7e67b..cc98aae4 100644
--- a/assets/ymls/us/actors/whomp/whomp.yml
+++ b/assets/ymls/us/actors/whomp/whomp.yml
@@ -35,8 +35,10 @@ whomp_surface:
   offset: 0x1EB60
   format: RGBA16
   symbol: whomp_seg6_texture_0601EB60
-whomp_unused_1:
-  type: U64
+
+# whomp_unused_1:
+#   type: U64
+
 whomp_seg6_lights_0601F360:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/wiggler_body/wiggler_body.yml b/assets/ymls/us/actors/wiggler_body/wiggler_body.yml
index eacef20c..635ed752 100644
--- a/assets/ymls/us/actors/wiggler_body/wiggler_body.yml
+++ b/assets/ymls/us/actors/wiggler_body/wiggler_body.yml
@@ -18,7 +18,7 @@ wiggler_seg5_lights_0500B248:
 wiggler_body_lights_unused:
   type: LIGHTS1
   size: 24
-  offset: 0xB248
+  offset: 0xB260
   symbol: wiggler_body_lights_unused
 
 wiggler_seg5_vertex_0500B278:
diff --git a/assets/ymls/us/actors/wiggler_head/wiggler_head.yml b/assets/ymls/us/actors/wiggler_head/wiggler_head.yml
index 1fa4d9a1..9da71de9 100644
--- a/assets/ymls/us/actors/wiggler_head/wiggler_head.yml
+++ b/assets/ymls/us/actors/wiggler_head/wiggler_head.yml
@@ -18,13 +18,13 @@ wiggler_seg5_lights_0500C890:
 wiggler_head_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0xC890
+  offset: 0xC8A8
   symbol: wiggler_head_lights_unused1
 
 wiggler_head_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0xC890
+  offset: 0xC8C0
   symbol: wiggler_head_lights_unused2
 
 wiggler_seg5_vertex_0500C8D8:
diff --git a/assets/ymls/us/actors/wooden_signpost/wooden_signpost.yml b/assets/ymls/us/actors/wooden_signpost/wooden_signpost.yml
index 5fbc6a21..02a5497a 100644
--- a/assets/ymls/us/actors/wooden_signpost/wooden_signpost.yml
+++ b/assets/ymls/us/actors/wooden_signpost/wooden_signpost.yml
@@ -19,6 +19,7 @@ wooden_signpost_front:
   offset: 0x2D1C8
   format: RGBA16
   symbol: wooden_signpost_seg3_texture_0302D1C8
+
 wooden_signpost_seg3_lights_0302C940:
   type: LIGHTS1
   size: 24
diff --git a/assets/ymls/us/actors/yellow_sphere/yellow_sphere.yml b/assets/ymls/us/actors/yellow_sphere/yellow_sphere.yml
index 9c33707a..4e3f4321 100644
--- a/assets/ymls/us/actors/yellow_sphere/yellow_sphere.yml
+++ b/assets/ymls/us/actors/yellow_sphere/yellow_sphere.yml
@@ -11,6 +11,7 @@ yellow_sphere:
   offset: 0x40
   format: RGBA16
   symbol: yellow_sphere_seg6_texture_0601EB88
+
 yellow_sphere_seg6_vertex_0601EB48:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/yellow_sphere_small/yellow_sphere_small.yml b/assets/ymls/us/actors/yellow_sphere_small/yellow_sphere_small.yml
index 2fc74448..f5444437 100644
--- a/assets/ymls/us/actors/yellow_sphere_small/yellow_sphere_small.yml
+++ b/assets/ymls/us/actors/yellow_sphere_small/yellow_sphere_small.yml
@@ -11,6 +11,7 @@ small_yellow_sphere:
   offset: 0x40
   format: RGBA16
   symbol: yellow_sphere_seg5_texture_05000040
+
 yellow_sphere_seg5_vertex_05000000:
   type: VTX
   size: 32
diff --git a/assets/ymls/us/actors/yoshi/yoshi.yml b/assets/ymls/us/actors/yoshi/yoshi.yml
index 91788d08..7e92be46 100644
--- a/assets/ymls/us/actors/yoshi/yoshi.yml
+++ b/assets/ymls/us/actors/yoshi/yoshi.yml
@@ -27,6 +27,7 @@ yoshi_nostril:
   offset: 0x1C988
   format: RGBA16
   symbol: yoshi_seg5_texture_0501C8A0
+
 yoshi_seg5_lights_0501C458:
   type: LIGHTS1
   size: 24
@@ -179,13 +180,13 @@ yoshi_seg5_lights_0501D9F0:
 yoshi_lights_unused1:
   type: LIGHTS1
   size: 24
-  offset: 0x1D9F0
+  offset: 0x1DA08
   symbol: yoshi_lights_unused1
 
 yoshi_lights_unused2:
   type: LIGHTS1
   size: 24
-  offset: 0x1D9F0
+  offset: 0x1DA20
   symbol: yoshi_lights_unused2
 
 yoshi_seg5_lights_0501DA38:
diff --git a/assets/ymls/us/actors/yoshi_egg/yoshi_egg.yml b/assets/ymls/us/actors/yoshi_egg/yoshi_egg.yml
index b3ef839d..c7de7f0f 100644
--- a/assets/ymls/us/actors/yoshi_egg/yoshi_egg.yml
+++ b/assets/ymls/us/actors/yoshi_egg/yoshi_egg.yml
@@ -67,6 +67,7 @@ yoshi_egg_7_unused:
   offset: 0x8FB8
   format: RGBA16
   symbol: yoshi_egg_seg5_texture_05008FB8
+
 yoshi_egg_seg5_vertex_05005778:
   type: VTX
   size: 32