diff --git a/include/enums.h b/include/enums.h
index fab1f12..579c689 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -347,37 +347,36 @@ typedef enum actors_e {
     ACTOR_DIDDY_5DI_PAD_6,
     ACTOR_KONG_REFLECTION,
     ACTOR_BONUS_BARREL_HELM,
-    ACTOR_UNKNOWN_108
-    /*
-    [109] = "Race Checkpoint",
-    [110] = "CB Bunch", // Unused? Doesn't seem to work, these are normally model 2
+    ACTOR_UNKNOWN_108,
+    ACTOR_RACE_CHECKPOINT,
+    ACTOR_CB_BUNCH, // From Japes rear tunnel boulder
     ACTOR_BALLOON_CHUNKY,
     ACTOR_BALLOON_TINY,
     ACTOR_BALLOON_LANKY,
     ACTOR_BALLOON_DK,
-    [115] = "K. Lumsy's Cage", // TODO: Also rabbit race finish line?
-    [116] = "Chain",
-    [117] = "Beanstalk",
-    [118] = "Yellow ?", // Unused?
-    [119] = "CB Single (Blue)", // Unused? Doesn't seem to work, these are normally model 2
-    [120] = "CB Single (Yellow)", // Unused? Doesn't seem to work, these are normally model 2
-    [121] = "Crystal Coconut", // Unused? Doesn't seem to work, these are normally model 2
-    [122] = "DK Coin", // Multiplayer
-    [123] = "Kong Mirror", // Creepy Castle Museum
-    [124] = "Barrel Gun", // Peril Path Panic
-    [125] = "Barrel Gun", // Krazy Kong Klamour
-    [126] = "Fly Swatter",
-    [127] = "Searchlight", // Searchlight Seek
+    ACTOR_KLUMSY_CAGE, // Also rabbit race finish line for an unknown reason
+    ACTOR_CHAIN,
+    ACTOR_BEANSTALK,
+    ACTOR_MULTIPLAYER_QMARK_YELLOW,
+    ACTOR_MULTIPLAYER_BANANA_BLUE,
+    ACTOR_MULITPLAYER_BANANA_YELLOW,
+    ACTOR_MULTIPLAYER_CRYSTAL,
+    ACTOR_MULTIPLAYER_RACECOIN,
+    ACTOR_REFLECTION_MUSEUM,
+    ACTOR_BARRELGUN_PERILPATHPANIC,
+    ACTOR_BARRELGUN_KRAZYKONGKLAMOUR,
+    ACTOR_FLYSWATTER,
+    ACTOR_SEARCHLIGHT,
     ACTOR_HEADPHONES,
-    [129] = "Enguarde Crate",
-    [130] = "Apple", // Fungi
-    [131] = "Worm", // Fungi
-    [132] = "Enguarde Crate (Unused?)",
-    [133] = "Barrel",
-    [134] = "Training Barrel",
-    [135] = "Boombox", // Treehouse
-    [136] = "Tag Barrel",
-    [137] = "Tag Barrel", // Troff'n'Scoff
+    ACTOR_CRATE_ENGUARDE,
+    ACTOR_APPLE,
+    ACTOR_WORM,
+    ACTOR_CRATE_ENGUARDE_0,
+    ACTOR_BARREL,
+    ACTOR_BONUS_TRAINING, // Training Barrel
+    ACTOR_BOOMBOX,
+    ACTOR_TAGBARREL_0,
+    ACTOR_TAGBARREL_TNS,
     ACTOR_B_LOCKER,
     ACTOR_RAINBOW_COIN_PATCH,
     ACTOR_RAINBOW_COIN,
@@ -385,12 +384,12 @@ typedef enum actors_e {
     ACTOR_UNKNOWN_142,
     ACTOR_UNKNOWN_143,
     ACTOR_UNKNOWN_144,
-    [145] = "Cannon (Seasick Chunky)", // Internal name "Puffer cannon"
+    ACTOR_CANNON_SEASICK,
     ACTOR_UNKNOWN_146,
-    [147] = "Balloon (Unused - K. Rool)", // Internal Name: K. Rool Banana Balloon, unsure of purpose. Can only be popped by Lanky
-    [148] = "Rope", // K. Rool's Arena
-    [149] = "Banana Barrel", // Lanky Phase
-    [150] = "Banana Barrel Spawner", // Lanky Phase, internal name "Skin barrel generator"
+    ACTOR_BALLOON_KROOL,
+    ACTOR_ROPE,
+    ACTOR_BARREL_BANANA,
+    ACTOR_BARREL_BANANA_SPAWNER,
     ACTOR_UNKNOWN_151,
     ACTOR_UNKNOWN_152,
     ACTOR_UNKNOWN_153,
@@ -403,187 +402,187 @@ typedef enum actors_e {
     ACTOR_UNKNOWN_160,
     ACTOR_UNKNOWN_161,
     ACTOR_UNKNOWN_162,
-    [163] = "Banana Fairy (BFI)",
-    [164] = "Ice Tomato",
-    [165] = "Tag Barrel (King Kut Out)",
-    [166] = "King Kut Out Part",
-    [167] = "Cannon",
+    ACTOR_FAIRY_QUEEN,
+    ACTOR_TOMATO_ICE,
+    ACTOR_BOSS_KUTOUT_TAG,
+    ACTOR_BOSS_KUTOUT_SEGMENT,
+    ACTOR_CANNON_0,
     ACTOR_UNKNOWN_168,
-    [169] = "Pufftup", // Pufftoss Fight
-    [170] = "Damage Source", // K. Rool's Glove
-    [171] = "Orange", // Krusha's Gun
-    [173] = "Cutscene Controller",
+    ACTOR_PUFFTUP,
+    ACTOR_BOSS_KROOL_GLOVE,
+    ACTOR_PROJECTILE_ORANGE_KRUSHA,
+    ACTOR_UNKNOWN_172,
+    ACTOR_CUTSCENE_CONTROLLER,
     ACTOR_UNKNOWN_174,
-    [175] = "Kaboom",
-    [176] = "Timer",
-    [177] = "Timer Controller", // Pufftoss Fight & Fac Beaver Bother Spawn Timer
-    [178] = "Beaver", // Blue
-    [179] = "Shockwave (Mad Jack)",
-    [180] = "Krash", // Minecart Club Guy
-    [181] = "Book", // Castle Library
-    [182] = "Klobber",
-    [183] = "Zinger",
-    [184] = "Snide",
-    [185] = "Army Dillo",
-    [186] = "Kremling", // Kremling Kosh
-    [187] = "Klump",
-    [188] = "Camera",
-    [189] = "Cranky",
-    [190] = "Funky",
-    [191] = "Candy",
-    [192] = "Beetle", // Race
-    [193] = "Mermaid",
-    [194] = "Vulture",
-    [195] = "Squawks",
-    [196] = "Cutscene DK",
-    [197] = "Cutscene Diddy",
-    [198] = "Cutscene Lanky",
-    [199] = "Cutscene Tiny",
-    [200] = "Cutscene Chunky",
-    [201] = "Llama",
-    [202] = "Fairy Picture",
-    [203] = "Padlock (T&S)",
-    [204] = "Mad Jack",
-    [205] = "Klaptrap", // Green
-    [206] = "Zinger",
-    [207] = "Vulture (Race)",
-    [208] = "Klaptrap (Purple)",
-    [209] = "Klaptrap (Red)",
-    [210] = "GETOUT Controller",
-    [211] = "Klaptrap (Skeleton)",
-    [212] = "Beaver (Gold)",
-    [213] = "Fire Column Spawner", // Japes Minecart
-    [214] = "Minecart (TNT)", // Minecart Mayhem
-    [215] = "Minecart (TNT)",
-    [216] = "Pufftoss",
+    ACTOR_KABOOM,
+    ACTOR_TIMER,
+    ACTOR_TIMER_CONTROLLER,
+    ACTOR_BEAVER_BLUE,
+    ACTOR_SHOCKWAVE_MAD_JACK,
+    ACTOR_KRASH,
+    ACTOR_BOOK,
+    ACTOR_KLOBBER,
+    ACTOR_ZINGER_0,
+    ACTOR_SNIDE,
+    ACTOR_BOSS_ARMY_DILLO,
+    ACTOR_MINIGAME_KREMLING,
+    ACTOR_KLUMP,
+    ACTOR_CAMERA,
+    ACTOR_CRANKY,
+    ACTOR_FUNKY,
+    ACTOR_CANDY,
+    ACTOR_BEETLE,
+    ACTOR_MERMAID,
+    ACTOR_VULTURE_SHOOTING,
+    ACTOR_SQUAWKS,
+    ACTOR_CUTSCENE_DK,
+    ACTOR_CUTSCENE_DIDDY,
+    ACTOR_CUTSCENE_LANKY,
+    ACTOR_CUTSCENE_TINY,
+    ACTOR_CUTSCENE_CHUNKY,
+    ACTOR_LLAMA,
+    ACTOR_PICTURE,
+    ACTOR_PADLOCK_TNS,
+    ACTOR_BOSS_MAD_JACK,
+    ACTOR_KLAPTRAP_GREEN,
+    ACTOR_ZINGER_1,
+    ACTOR_VULTURE_RACE,
+    ACTOR_KLAPTRAP_PURPLE,
+    ACTOR_KLAPTRAP_RED,
+    ACTOR_CONTROLLER_GETOUT,
+    ACTOR_KLAPTRAP_SKELETON,
+    ACTOR_BEAVER_GOLD,
+    ACTOR_FIRE_COLUMN_SPAWNER,
+    ACTOR_MINECART_TNT_MINIGAME,
+    ACTOR_MINECART_TNT_COURSE,
+    ACTOR_BOSS_PUFFTOSS,
     ACTOR_UNKNOWN_217,
-    [218] = "Handle",
-    [219] = "Slot",
-    [220] = "Cannon (Seasick Chunky)",
-    [221] = "Light Piece", // Lanky Phase
-    [222] = "Banana Peel", // Lanky Phase
-    [223] = "Fireball Spawner", // Factory Crusher Room
-    [224] = "Mushroom Man",
+    ACTOR_BANDIT_HANDLE,
+    ACTOR_BANDIT_SLOT,
+    ACTOR_CANNON_SEASICK_0,
+    ACTOR_BOSS_KROOL_LIGHT,
+    ACTOR_BOSS_KROOL_PEEL,
+    ACTOR_FIREBALL_SPAWNER,
+    ACTOR_MUSHROOM_MAN,
     ACTOR_UNKNOWN_225,
-    [226] = "Troff",
-    [227] = "K. Rool's Foot", // Including leftmost toe
-    [228] = "Bad Hit Detection Man",
-    [229] = "K. Rool's Toe", // Rightmost 3 toes
-    [230] = "Ruler",
-    [231] = "Toy Box",
-    [232] = "Text Overlay",
-    [233] = "Squawks",
-    [234] = "Scoff",
-    [235] = "Robo-Kremling",
-    [236] = "Dogadon",
+    ACTOR_TROFF,
+    ACTOR_BOSS_KROOL_FOOT,
+    ACTOR_TOY_MONSTER,
+    ACTOR_BOSS_KROOL_TOE,
+    ACTOR_RULER,
+    ACTOR_TOY_BOX,
+    ACTOR_TEXT_OVERLAY,
+    ACTOR_SQUAWKS_0,
+    ACTOR_SCOFF,
+    ACTOR_ROBO_KREMLING,
+    ACTOR_BOSS_DOGADON,
     ACTOR_UNKNOWN_237,
-    [238] = "Kremling",
-    [239] = "Bongos",
-    [240] = "Spotlight Fish",
-    [241] = "Kasplat (DK)",
-    [242] = "Kasplat (Diddy)",
-    [243] = "Kasplat (Lanky)",
-    [244] = "Kasplat (Tiny)",
-    [245] = "Kasplat (Chunky)",
-    [246] = "Mechanical Fish",
-    [247] = "Seal",
-    [248] = "Banana Fairy",
-    [249] = "Squawks with spotlight",
-    [250] = "Owl",
-    [251] = "Spider miniBoss",
-    [252] = "Rabbit", // Fungi
-    [253] = "Nintendo Logo",
-    [254] = "Cutscene Object", // For objects animated by Cutscenes
-    [255] = "Shockwave",
-    [256] = "Minigame Controller",
-    [257] = "Fire Breath Spawner", // Aztec Beetle Race
-    [258] = "Shockwave", // Boss
-    [259] = "Guard", // Stealthy Snoop
-    [260] = "Text Overlay", // K. Rool boss
-    [261] = "Robo-Zinger",
-    [262] = "Krossbones",
-    [263] = "Fire Shockwave (Dogadon)",
-    [264] = "Squawks",
-    [265] = "Light beam", // Boss bosss etc
-    [266] = "DK Rap Controller", // Handles the lyrics etc
-    [267] = "Shuri",
-    [268] = "Gimpfish",
-    [269] = "Mr. Dice",
-    [270] = "Sir Domino",
-    [271] = "Mr. Dice",
-    [272] = "Rabbit",
-    [273] = "Fireball (With Glasses)", // From Chunky 5DI
+    ACTOR_KREMLING,
+    ACTOR_BONGOS,
+    ACTOR_SPOTLIGHT_FISH,
+    ACTOR_KASPLAT_DK,
+    ACTOR_KASPLAT_DIDDY,
+    ACTOR_KASPLAT_LANKY,
+    ACTOR_KASPLAT_TINY,
+    ACTOR_KASPLAT_CHUNKY,
+    ACTOR_MECHANICAL_FISH,
+    ACTOR_SEAL,
+    ACTOR_FAIRY,
+    ACTOR_SPOTLIGHT_SQUAWKS,
+    ACTOR_OWL,
+    ACTOR_BOSS_SPIDER,
+    ACTOR_RABBIT_RACE,
+    ACTOR_NINTENDO_LOGO,
+    ACTOR_CUTSCENE_OBJECT,
+    ACTOR_SHOCKWAVE,
+    ACTOR_MINIGAME_CONTROLLER,
+    ACTOR_FIRE_BREATH_SPAWNER,
+    ACTOR_BOSS_SHOCKWAVE,
+    ACTOR_GUARD,
+    ACTOR_BOSS_KROOL_OVERLAY,
+    ACTOR_ROBO_ZINGER,
+    ACTOR_KROSSBONES,
+    ACTOR_BOSS_DOGADON_SHOCKWAVE,
+    ACTOR_SQUAWKS_1,
+    ACTOR_BOSS_DOGADON_LIGHTBEAM,
+    ACTOR_DK_RAP_CONTROLLER,
+    ACTOR_SHURI,
+    ACTOR_GIMPFISH,
+    ACTOR_MR_DICE_0,
+    ACTOR_SIR_DOMINO,
+    ACTOR_MR_DICE_1,
+    ACTOR_RABBIT_CAVES,
+    ACTOR_FIREBALL_WITH_GLASSES,
     ACTOR_UNKNOWN_274,
-    [275] = "K. Lumsy",
-    [276] = "Spiderling",
-    [277] = "Squawks",
-    [278] = "Projectile", // Spider miniBoss
-    [279] = "Trap Bubble", // Spider miniBoss
-    [280] = "Spider Silk String", // Spider miniBoss
-    [281] = "K. Rool (DK Phase)",
-    [282] = "Retexturing Controller", // Beaver Bother
-    [283] = "Skeleton Head",
+    ACTOR_KLUMSY,
+    ACTOR_SPIDERLING,
+    ACTOR_SQUAWKS_2,
+    ACTOR_PROJECTILE_SPIDER,
+    ACTOR_TRAP_BUBBLE,
+    ACTOR_SILK,
+    ACTOR_BOSS_KROOL_DK,
+    ACTOR_MINIGAME_BOTHER_KLAPTRAP,
+    ACTOR_SKELETON_HEAD,
     ACTOR_UNKNOWN_284,
-    [285] = "Bat",
-    [286] = "Giant Clam",
+    ACTOR_BAT,
+    ACTOR_CLAM,
     ACTOR_UNKNOWN_287,
-    [288] = "Tomato", // Fungi
-    [289] = "Kritter-in-a-Sheet",
-    [290] = "Pufftup",
-    [291] = "Kosha",
-    [292] = "K. Rool (Diddy Phase)",
-    [293] = "K. Rool (Lanky Phase)",
-    [294] = "K. Rool (Tiny Phase)",
-    [295] = "K. Rool (Chunky Phase)",
+    ACTOR_TOMATO_FUNGI,
+    ACTOR_KRITTER_IN_A_SHEET,
+    ACTOR_PUFFTUP_0,
+    ACTOR_KOSHA,
+    ACTOR_BOSS_KROOL_DIDDY,
+    ACTOR_BOSS_KROOL_LANKY,
+    ACTOR_BOSS_KROOL_TINY,
+    ACTOR_BOSS_KROOL_CHUNKY,
     ACTOR_UNKNOWN_296,
-    [297] = "Battle Crown Controller",
+    ACTOR_BATTLE_CROWN_CONTROLLER,
     ACTOR_UNKNOWN_298,
-    [299] = "Textbox",
-    [300] = "Snake", // Teetering Turtle Trouble
-    [301] = "Turtle", // Teetering Turtle Trouble
-    [302] = "Toy Car", // Player in the Factory Toy Car Race
-    [303] = "Toy Car",
-    [304] = "Camera", // Factory Toy Car Race
-    [305] = "Missile", // Car Race
+    ACTOR_TEXT_BUBBLE,
+    ACTOR_SNAKE,
+    ACTOR_TURTLE,
+    ACTOR_CAR_FACTORY_PLAYER,
+    ACTOR_CAR_FACTORY_ENEMY,
+    ACTOR_CAMERA_CARRACE,
+    ACTOR_MISSILE_CAR,
     ACTOR_UNKNOWN_306,
     ACTOR_UNKNOWN_307,
-    [308] = "Seal",
-    [309] = "Kong Logo (Instrument)", // DK for DK, Star for Diddy, DK for Lanky, Flower for Tiny, DK for Chunky
-    [310] = "Spotlight", // Tag barrel, instrument etc.
-    [311] = "Race Checkpoint", // Seal race & Castle car race
-    [312] = "Minecart (TNT)",
-    [313] = "Idle Particle",
-    [314] = "Rareware Logo",
+    ACTOR_SEAL_0,
+    ACTOR_INSTRUMENT_LOGO,
+    ACTOR_SPOTLIGHT,
+    ACTOR_RACE_CHECKPOINT_0,
+    ACTOR_MINECART_TNT_0,
+    ACTOR_PARTICLE_IDLE,
+    ACTOR_RAREWARE_LOGO,
     ACTOR_UNKNOWN_315,
-    [316] = "Kong (Tag Barrel)",
-    [317] = "Locked Kong (Tag Barrel)",
+    ACTOR_TAGBARREL_KONG,
+    ACTOR_TAGBARREL_LOCKED,
     ACTOR_UNKNOWN_318,
-    [319] = "Propeller (Boat)",
-    [320] = "Potion", // Cranky Purchase
-    [321] = "Fairy (Refill)", // Refill Fairy
-    [322] = "Car", // Car Race
-    [323] = "Enemy Car", // Car Race, aka George
-    [324] = "Text Overlay Controller", // Candy's
-    [325] = "Shockwave", // Simian Slam
-    [326] = "Main Menu Controller",
-    [327] = "Kong", // Krazy Kong Klamour
-    [328] = "Klaptrap", // Peril Path Panic
-    [329] = "Fairy", // Peril Path Panic
-    [330] = "Bug", // Big Bug Bash
-    [331] = "Klaptrap", // Searchlight Seek
-    [332] = "Big Bug Bash Controller?", // TODO: Fly swatter?
-    [333] = "Barrel (Main Menu)",
-    [334] = "Padlock (K. Lumsy)",
-    [335] = "Snide's Menu",
-    [336] = "Training Barrel Controller",
-    [337] = "Multiplayer Model (Main Menu)",
-    [338] = "End Sequence Controller",
-    [339] = "Arena Controller", // Rambi/Enguarde
-    [340] = "Bug", // Trash Can
+    ACTOR_PROPELLER,
+    ACTOR_POTION,
+    ACTOR_FAIRY_REFILL,
+    ACTOR_CAR_CASTLE_PLAYER,
+    ACTOR_CAR_CASTLE_ENEMY,
+    ACTOR_PURCHASE_TEXT_OVERLAY,
+    ACTOR_SHOCKWAVE_SLAM,
+    ACTOR_MAIN_MENU_CONTROLLER,
+    ACTOR_MINIGAME_KRAZYKONGKLAMOUR_KONG,
+    ACTOR_MINIGAME_PERILPATHPANIC_KLAPTRAP,
+    ACTOR_MINIGAME_PERILPATHPANIC_FAIRY,
+    ACTOR_MINIGAME_BIGBUGBASH_BUG,
+    ACTOR_MINIGAME_SEARCHLIGHTSEEK_KLAPTRAP,
+    ACTOR_FLYSWATTER_SHADOW,
+    ACTOR_BARREL_MAIN_MENU,
+    ACTOR_PADLOCK_KLUMSY,
+    ACTOR_MENU_SNIDE,
+    ACTOR_TRAINING_BARREL_CONTROLLER,
+    ACTOR_MAIN_MENU_MULTIPLAYER_KONG,
+    ACTOR_END_SEQUENCE_CONTROLLER,
+    ACTOR_ARENA_CONTROLLER,
+    ACTOR_BUG,
     ACTOR_UNKNOWN_341,
-    [342] = "Try Again Dialog",
-    [343] = "Pause Menu", // Mystery menu bosses
-    */
+    ACTOR_TRY_AGAIN_DIALOG,
+    ACTOR_PAUSE_MENU_MYSTERY_MENU,
 } Actors;
 
 typedef enum sfx_e{
diff --git a/include/structs.h b/include/structs.h
index 7cdf923..c5b66b4 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -981,7 +981,7 @@ struct actor {
     u32 unk4C;
     u32 unk50;
     u32 unk54;
-    u32 unk58;
+    Actors unk58;
     u16 interactable; // Bitfield at 0x5C
     u16 unk5E;
     union {