various fixes from #issuefication-zone

14 files changed, 114 insertions, 37 deletions

diff --git a/album/9.yaml b/album/9.yaml
index 4b8473bf..d31fc143 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -180,7 +180,7 @@ Sampled Tracks:
 - Your Bed
 Commentary: |-
     <i>SplitSuns:</i> (Composer)
-    Back in April, [[artist:gorillaz|Gorillaz]] were getting ready to release their new album Humanz. With some coaxing from CaNMT members, I decided to create a mashup for the YouTube channel that would combine the Gorillaz track "Saturnz Barz" with the various trailer music we've heard so far in Hiveswap. Part of the song was set to go with a Hiveswap trailer as a [[artist:silvagunner|SiivaGunner]]-esque bait and switch, and the whole song would be uploaded as a Gorillaz rip. While initially successful, the latter rip was actually striked off of the channel, and the former video was privated to avoid another strike. I later released in on my SoundCloud and am now releasing it on 9 so that you all can hear it once more! As for the song itself, I stuck true to Saturnz Barz' original structure and made sure the Hiveswap music went well with the stops and skips in the song. I also snuck some other Homestuck music in there to make the rip more dynamic. Enjoy!
+    Back in April, [[artist:gorillaz|Gorillaz]] were getting ready to release their new album Humanz. With some coaxing from CaNMT members, I decided to create a mashup for the YouTube channel that would combine the Gorillaz track "Saturnz Barz" with the various trailer music we've heard so far in Hiveswap. Part of the song was set to go with a Hiveswap trailer as a [[artist:siivagunner|SiivaGunner]]-esque bait and switch, and the whole song would be uploaded as a Gorillaz rip. While initially successful, the latter rip was actually striked off of the channel, and the former video was privated to avoid another strike. I later released in on my SoundCloud and am now releasing it on 9 so that you all can hear it once more! As for the song itself, I stuck true to Saturnz Barz' original structure and made sure the Hiveswap music went well with the stops and skips in the song. I also snuck some other Homestuck music in there to make the rip more dynamic. Enjoy!
 
     <i>SplitSuns:</i> (Artist)
     When Secretz Barz was originally uploaded onto the YouTube channel, it didn't have any special track art. For its release on my SoundCloud, I decided to give it some! I decided to go with a straight parody of the Humanz cover, replacing the members of Gorillaz with various characters from Hiveswap. I stuck with 3D models only to mirror the detailed 3D avatars of the Gorillaz' members on the Humanz cover, and I also tried to arrange the characters in ways that were reminiscent of the poses on the original cover. The end result is something I'm quite proud of. Also, just so we're clear, I made this more than a month before the existing cover to 9 was made, so any refrance is entirely coincidental.
@@ -2058,7 +2058,7 @@ Referenced Tracks:
 - Mutiny
 - How Do I Live
 Sampled Tracks:
-- Beat 02
+- track:phat2
 Commentary: |-
     <i>Wheals:</i> (Composer)
     Ever since I heard the very well-made medley -3x piano solo in [[album:canwc-sound-test-1|sound test 1]], I wanted to make an arrangement that both had actual instrumentation and wasn't buried among the piles of rubbish on that album. [[artist:shwan|Shwan]] was kind enough to give me a MIDI, which I sat on for 8 months before cranking this out. The theme (and meaning of the name) of -3x piano solo (and this song too) may not be immediately obvious -- it's songs that were used in the comic from Acts 1-4. I had fun adding four more songs to Shwan's reference list, none of which are in [[album:homestuck-vol-1-4|*Volumes* 1-4]].
diff --git a/album/canwc-for-the-spookdays.yaml b/album/canwc-for-the-spookdays.yaml
index b59ce246..e2eaa262 100644
--- a/album/canwc-for-the-spookdays.yaml
+++ b/album/canwc-for-the-spookdays.yaml
@@ -401,7 +401,7 @@ URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/metaphysical-terror-metafictional-error-off-vocal
 - https://youtu.be/yu3CSN0_8Jk
 Referenced Tracks:
-- Xmas? I Don't Know Such A Thing!
+- Xmas? I don't know such a thing!!
 - This Is Halloween
 - Spooky Scary Skeletons
 Sampled Tracks:
diff --git a/album/cool-and-new-homestuck-3.yaml b/album/cool-and-new-homestuck-3.yaml
index 8837e3bd..7cb05908 100644
--- a/album/cool-and-new-homestuck-3.yaml
+++ b/album/cool-and-new-homestuck-3.yaml
@@ -405,7 +405,7 @@ Commentary: |-
     If this song had [[track:snow-halation|Snow Halation]] in it, it wouldn't be the worst song on the soundtrack anymore.
 
     <i>StarlightCalliope:</i> (Composer)
-    Cookie, please, we all know that [[track:we-are-number-one|We Are Number One]] is a vastly superior [[artist:silvagunner|Siiva]] meme to Snow Halation. Snow Halation would make this the worstest song on the soundtrack. Anyways, I'll start talking about the song itself. Originally, I was inspired by how one Homestuck Musician, (if I recall correctly it was [[artist:erik-scheele|Jit]],) said that he felt like Crystalanthemums was going to be Jade's Land Theme. As this was to be a remix for Jade's Land reveal, my original starting concept was, "Frost but with Crystalanthemums." I had started a version of this concept back before [[album:cool-and-new-volume-2|CANH2]] had even been released, although I mostly reworked this old version from the ground up. The only thing that really remained unchanged was the Violin Arpeggio. I had planned to use [[track:frog-forager|Frog Forager]] as a continuation melody to Crystalanthemums at this time, but that melody didn't quite seem to fit the song, and I instead replaced it with a change to the Drum Beat at that point (said drum beat pretty heavily inspired/referencing Crystamanthequins or whatever the name was for the one in [[flash:2578|[S] Make Her Pay]]. One part of this song I am overall dissatisfied with is the Cymbals that come in near the end of the portion referencing Courser. I originally had a version where I had arranged the Cymbals in a manner where I was happy with them, but this version was poorly mastered and I was too lazy to transcribe what I had done for the old version. Anyways, I feel like this song was very much useful in helping me figure out how to better arrange orchestral percussion lines and to not make them completely uninteresting.
+    Cookie, please, we all know that [[track:we-are-number-one|We Are Number One]] is a vastly superior [[artist:siivagunner|Siiva]] meme to Snow Halation. Snow Halation would make this the worstest song on the soundtrack. Anyways, I'll start talking about the song itself. Originally, I was inspired by how one Homestuck Musician, (if I recall correctly it was [[artist:erik-scheele|Jit]],) said that he felt like Crystalanthemums was going to be Jade's Land Theme. As this was to be a remix for Jade's Land reveal, my original starting concept was, "Frost but with Crystalanthemums." I had started a version of this concept back before [[album:cool-and-new-volume-2|CANH2]] had even been released, although I mostly reworked this old version from the ground up. The only thing that really remained unchanged was the Violin Arpeggio. I had planned to use [[track:frog-forager|Frog Forager]] as a continuation melody to Crystalanthemums at this time, but that melody didn't quite seem to fit the song, and I instead replaced it with a change to the Drum Beat at that point (said drum beat pretty heavily inspired/referencing Crystamanthequins or whatever the name was for the one in [[flash:2578|[S] Make Her Pay]]. One part of this song I am overall dissatisfied with is the Cymbals that come in near the end of the portion referencing Courser. I originally had a version where I had arranged the Cymbals in a manner where I was happy with them, but this version was poorly mastered and I was too lazy to transcribe what I had done for the old version. Anyways, I feel like this song was very much useful in helping me figure out how to better arrange orchestral percussion lines and to not make them completely uninteresting.
 
     <i>koykoy13:</i> (Artist)
     <img src="media/misc/pic-of-koykoy13-message.jpg" width="400">
diff --git a/album/cool-and-new-volume-v.yaml b/album/cool-and-new-volume-v.yaml
index 84b641ad..89430381 100644
--- a/album/cool-and-new-volume-v.yaml
+++ b/album/cool-and-new-volume-v.yaml
@@ -441,7 +441,7 @@ Referenced Tracks:
 - Doctor
 Commentary: |-
     <i>VulkanShawl:</i>
-    The idea was make only a Hospital-game themed Doctor Remix. But actually i remembered Theme Hospital. Later looking from game's OST i just found a song called "Doctor" in his OST. So i decided to do a Double doctor mashup. A funny thing is this game reminds me of a hospital tycoon game. *insert i don't like [[artist:silvagunner|siivagunner]] joke here*
+    The idea was make only a Hospital-game themed Doctor Remix. But actually i remembered Theme Hospital. Later looking from game's OST i just found a song called "Doctor" in his OST. So i decided to do a Double doctor mashup. A funny thing is this game reminds me of a hospital tycoon game. *insert i don't like [[artist:siivagunner|siivagunner]] joke here*
 ---
 Track: Doctor Remix Remix
 Artists:
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 29b02102..204732e8 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -26,7 +26,7 @@ Art Tags:
 Commentary: |-
     <i>Robert J! Lake:</i> (project manager, booklet commentary)
 
-    <b>FORWARD</b>
+    <b>FOREWORD</b>
 
     This almost didn't happen.
 
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index e725ef9a..317339de 100644
--- a/album/intermishin.yaml
+++ b/album/intermishin.yaml
@@ -389,7 +389,7 @@ URLs:
 Commentary: |- 
     <i>SplitSuns:</i> (Composer)
     I actually started production on this song before the idea for Intermishin developed. Someone had an idea to mash up Liquid Negrocity and We Are Number One, and I jumped at the opportunity after realizing how similar the chord progressions were. Originally this was going to go on a later album, but after realizing that this was originally a [[album:midnight-crew-drawing-dead|Drawing Dead]] song I decided to move it to this release. I wanted it to begin in a similar way to my first song "[[track:the-endless-black-aka-clockwork-negrocity|The Endless Black]]" before quickly diving off the rails into pure insanity. I wanted the song itself to have the instrumentation of WANO with the bass and piano providing the Black-bone, if you will (and I certainly shall.) Robbie's distinctive voice tied the whole thing together, and I had a lot of fun chopping and echoing it up throughout the song. To break up the main idea, I put in a Ballad of Jack Noir-esque tune near the end that I think really helped charge the song with some energy. And of course, it ends in a big finish before fading out in the same way as Liquid Negrocity. This track was pretty complicated to produce, but I think it turned out very well in the end in terms of balance!
-    Fun fact: there's a reference to [[artist:silvagunner|Siiva's]] first WANO rip in the song. I wonder if you can spot it...?
+    Fun fact: there's a reference to [[artist:siivagunner|Siiva's]] first WANO rip in the song. I wonder if you can spot it...?
 
     <i>Ephemerald:</i> (Artist)
     The basic idea here is pretty simple - combine Spades Sleck and Robbie Rotten to get utter hell. The background is meant to invoke the first panel of the Intermishin - you can see the gateways, the flame, the shitty rug, and a clock throughout the image. At first I just wanted to draw a hyperrealistic version of Sleck's shitty head, but along the way that turned into making his head be a reasonable facsimilie of Robbie's own head. I also modeled Sleck's knife off of the knife he wields very early on, but tried to make it look three-dimensional, once again attempting to convey a hyperrealistic shitty drawing. I made this track art before the album cover, and looking back, those principles are clearly echoed in it as well. The Midnight Crew's lines look pretty much as clean as the Felt because of how "hyperrealistically shitty" I went, so I had to go back and .jpeg them up a bit. I didn't do that with this because... I'm lazy??
diff --git a/album/lofam.yaml b/album/lofam.yaml
index b0f8b4b6..b456bd56 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -7,6 +7,8 @@ URLs:
 - https://www.youtube.com/playlist?list=PLVrrmdafwD4-cD2-ZeRtfnzvRpl2IsrQ0
 Cover Artists:
 - melodiousDiscord
+Art Tags:
+- LoFaM
 Color: '#4876ff'
 Groups:
 - Homestuck Gaiden
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index e18f73bb..77a70d7d 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -78,7 +78,7 @@ Referenced Tracks:
 - English
 - Sburban Jungle
 - The Paradox Paradigm
-- --Emperical
+- --Empirical
 Commentary: |-
     <i>Jamie Paige:</i>
     Hi there!! Welcome to the second LOFAM. Kind of sounds like some really gangster hiphop group or something. Anyways this is a song I made JUST FOR THE ALBUM!!! Wowee. There's a lot going on here. There's the intro which is like Lord English taking a proverbial shit on everything by existing or something like that, then it sort of BLEHs and goes into the main part of the song. Right off the bat you've got Sburban Jungle's marimba part played backwards on a piano, and then there's some stuff from a fan song that I don't remember the title of. THEN there's stuff from Condy's song off the unofficial ancestor album, and some stuff from some other things. There's basically a lot of things!! It's a very thing filled song.
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index e9f695db..aac9a6d4 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -651,7 +651,7 @@ Referenced Tracks:
 - track:fuchsia-ruler
 - '0_0'
 - Ugly Betty
-- --Emperical
+- --Empirical
 - Rust Servant
 - The Lost Child
 - English
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 704be372..d33d51ec 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -545,9 +545,35 @@ Lyrics: |-
     My love lies with the ocean
 ---
 Track: lucaslee.mp3
+Directory: lucaslee-mp3
 Artists:
 - Toby Fox
-
+Duration: 1:20
+URLs:
+- https://twitter.com/OutOfRadiation/status/1515551353552134144
+- https://hsmusic.wiki/media/misc/archive/lucaslee.mp4
+Lyrics: |-
+    Piss on me
+    Come on, just fuckin' piss on me
+    Piss on me, just fuckin' piss on me (Just piss on me)
+    Piss on me
+    Come on, just fuckin' piss on me
+    Piss on me, just fuckin' piss on me (Just piss on me)
+
+    Piss on me, piss on me
+
+    Piss on me
+    Come on, just fuckin' piss on me
+    Piss on me, just fuckin' piss on me (Just piss on me)
+    Piss on me
+    come on, just fuckin' piss on me
+    Piss on me- (laughter)
+    (Just piss on me)
+    Piss on me, piss on me
+    Come on just fucking piss on me
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+    Basically nothing is known about this track, including whether or not it was actually called "lucaslee.mp3". It was uploaded [on Twitter](https://twitter.com/OutOfRadiation/status/1515551353552134144) by Out of Context Toby Fox on April 17, 2022; it was referenced in [[track:the-dirk-rap-instrumental]] from [[The Baby is 2]], which released July 20, 2018 and also [credited](https://coolandnewwebcomic.bandcamp.com/track/the-baby-is-2) this track as "lucaslee.mp3". And, well, it's clearly Toby... singing...
 ---
 Track: Lupus Mortis Aeternae
 Artists:
@@ -1479,6 +1505,16 @@ Commentary: |-
     🎛️ DAW: Reaper<br>
     🎞️ Video Editing Software: Adobe Premiere Pro CC
 ---
+Track: Life Liberated
+Additional Names:
+- Wind Waker (original name)
+Duration: 3:22
+Artists:
+- Levc
+URLs:
+- https://desynced.bandcamp.com/track/disc-1-life-liberated
+- https://www.youtube.com/watch?v=v-jk3cVnL3Y
+---
 Track: luminantFlare
 # Fully gone from the internet, sorry
 Artists:
@@ -1792,10 +1828,6 @@ Duration: '2:26'
 URLs:
 - https://monckat.bandcamp.com/track/vacuum-spark
 ---
-Track: Wind Waker
-Artists:
-- Levc
----
 Track: White King
 Artists:
 - Demographerist
diff --git a/album/pantheon.yaml b/album/pantheon.yaml
index 8c54cd0f..c9bb73c2 100644
--- a/album/pantheon.yaml
+++ b/album/pantheon.yaml
@@ -129,22 +129,27 @@ Section: Bonus tracks
 ---
 Track: Flying Witch
 Duration: '3:28'
+Artists:
+- Rainy
+- Levc
 URLs:
 - https://www.youtube.com/watch?v=OaGWu5driFE
+- https://desynced.bandcamp.com/track/bonus-flying-witch-ft-levc
 Cover Artists:
 - Dizzims
 Art Tags:
 - Kate (Desynced)
 - Gaea (Desynced)
 Referenced Tracks:
-- Wind Waker
-- track:daughter-desynced
+- Life Liberated
 - track:cooldown-desynced
+- track:daughter-desynced
 ---
 Track: Tsukuyomi (Remix)
 Duration: '1:41'
 URLs:
 - https://www.youtube.com/watch?v=wb91nZJc5qE
+- https://desynced.bandcamp.com/track/bonus-tsukuyomi-remix
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -158,6 +163,7 @@ Track: AUTOMATA
 Duration: '1:13'
 URLs:
 - https://www.youtube.com/watch?v=TbYNB-UWIG0
+- https://desynced.bandcamp.com/track/bonus-automata
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -178,6 +184,7 @@ Track: Josh's Theme
 Duration: '2:33'
 URLs:
 - https://www.youtube.com/watch?v=3VHyQhqLlYk
+- https://desynced.bandcamp.com/track/bonus-joshs-theme
 Cover Artists:
 - Dizzims
 Art Tags:
@@ -192,6 +199,7 @@ Always Reference By Directory: true
 Duration: '2:01'
 URLs:
 - https://www.youtube.com/watch?v=nsHHVTfndH0
+- https://desynced.bandcamp.com/track/bonus-breakdown
 Cover Artists:
 - Dizzims
 Art Tags:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 23a51917..0b2a3e2c 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -276,6 +276,9 @@ Artists:
 Duration: '3:56'
 URLs:
 - https://www.youtube.com/watch?v=pa7xBUKruEw&t=52s
+Commentary: |-
+    <i>Quasar Nebula:</i>
+    Unofficial name - it's the main theme from [Backyard Fun](https://www.youtube.com/watch?v=pa7xBUKruEw).
 ---
 Track: Bogey Theme
 Artists:
@@ -1229,10 +1232,15 @@ Commentary: |-
     This song was originally intended to be used in a game, however, it never came to fruition.
 ---
 Track: Texas History Theme
-# Also known as "funmusic.mp3"
 # The song in Texas History from when the flag of Texas shows up and stuff, unreleased
+Duration: 0:24
 Artists:
 - Michael Guy Bowman
+URLs:
+- https://www.youtube.com/watch?v=tULy69RF9xE
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+    Unofficial name - it's the main theme from [Texas History](https://www.youtube.com/watch?v=tULy69RF9xE). When you pause the LaserDisc, not when Governor Sam Houston gets his grave dug.
 ---
 Track: Teenage Mutant Ninja Turtles
 Artists:
@@ -2735,7 +2743,9 @@ Artists:
 - Sonic the Hedgehog
 - Tomoya Ohtani (composer)
 - Douglas Robb (writing and vocals)
-Duration: '4:24'
+Duration: '4:30'
+URLs:
+- https://www.youtube.com/watch?v=eCkWlRL3_N0
 Lyrics: |-
     I can't do this alone
     Even though I am strong
@@ -3016,6 +3026,8 @@ Artists:
 - Dark Souls
 - Motoi Sakuraba
 Duration: '3:22'
+URLs:
+- https://www.youtube.com/watch?v=RZVyHH-voR8
 ---
 Track: Green Hill Zone
 # Official release:
@@ -3235,6 +3247,8 @@ Artists:
 - Sonic the Hedgehog
 - Tomoya Ohtani (composer)
 - Dangerkids
+URLs:
+- https://www.youtube.com/watch?v=Ki_Nn95hj48
 Duration: '4:35'
 Lyrics: |-
     (Yeah!) 
@@ -7657,13 +7671,16 @@ Lyrics: |-
     Than peace and love on the planet Earth
 ---
 Track: Pokémon Theme (Gotta Catch 'Em All)
+Directory: pokemon-theme
 Artists:
 - artist:pokemon
 - John Siegler
 - John Loeffler
 Contributors:
 - Jason Paige (vocals)
-Duration: '3:22'
+URLs:
+- https://www.youtube.com/watch?v=fAP-lGPqHbA
+Duration: '3:18'
 Lyrics: |-
     I wanna be the very best
     Like no one ever was
@@ -12465,7 +12482,7 @@ Referenced Tracks:
 ---
 Track: A Grand New Era ~Ending~
 Artists:
-- SilvaGunner
+- SiIvaGunner
 - The Voice Inside Your Head
 Duration: '4:43'
 URLs:
@@ -13718,6 +13735,8 @@ Lyrics: |-
 Track: Blue (Da Ba Dee) (DJ Ponte Ice Pop Mix)
 Artists:
 - Eiffel 65
+URLs:
+- https://www.youtube.com/watch?v=_Nx8Wzi3h5s
 Duration: '6:26'
 Lyrics: |-
     Yo, listen up, here's the story
@@ -14318,6 +14337,8 @@ Directory: burn-deep-purple
 Duration: 6:04
 Artists:
 - Deep Purple
+URLs:
+- https://www.youtube.com/watch?v=ZQGstnfTmAk
 Lyrics: |-
     The sky is red, I don't understand
     Past midnight I still see the land
@@ -14770,7 +14791,9 @@ Lyrics: |-
 Track: Chocolate Rain
 Artists:
 - Tay Zonday
-Duration: '4:48'
+URLs:
+- https://www.youtube.com/watch?v=EwTZ2xpQwpA
+Duration: '4:52'
 Lyrics: |-
     Chocolate Rain
     Some stay dry and others feel the pain
@@ -15839,9 +15862,11 @@ Track: Dicko Mode
 Artists:
 - DJ Splash Drip
 - Kusorare
-Duration: '4:57'
+Duration: '5:00'
 Sampled Tracks:
 - Sicko Mode
+URLs:
+- https://www.youtube.com/watch?v=AUbmUEq6uWA
 Lyrics: |-
     Asshole
 
@@ -18425,7 +18450,9 @@ Track: Galo Sengen
 # Also known as ポリスマン／GAL男宣言
 Artists:
 - POLICEMAN
-Duration: '3:46'
+Duration: '3:47'
+URLs:
+- https://www.youtube.com/watch?v=1EKTw50Uf8M
 Lyrics: |-
     Nichi saro ni itte hada o yaku (<i>Every day, exposing my skin to the sun</i>)
 
@@ -18884,7 +18911,7 @@ Lyrics: |-
 ---
 Track: Goodbye To The Underground
 Artists:
-- SilvaGunner
+- SiIvaGunner
 - MtH
 Duration: '5:29'
 URLs:
@@ -19013,7 +19040,7 @@ Lyrics: |-
 ---
 Track: Grand Dad's Secret Slide
 Artists:
-- SilvaGunner
+- SiIvaGunner
 - ZVAARI
 Duration: '1:18'
 URLs:
@@ -26327,7 +26354,7 @@ URLs:
 ---
 Track: Stone halation
 Artists:
-- SilvaGunner
+- SiIvaGunner
 - The Yabba Dabba μ's
 Duration: '4:19'
 URLs:
@@ -26570,6 +26597,16 @@ Lyrics: |-
     (Alright, bye.)
     (—we praise, Our Father, who art in heaven, hallowed be thy name. Thy kingdom come—)
 ---
+Track: Summer
+Directory: summer-vanilla
+Always Reference By Directory: true
+Duration: 4:40
+Artists:
+- Vanilla
+URLs:
+- https://vanillabeats.bandcamp.com/track/summer-2
+- https://www.youtube.com/watch?v=8CDXBHpvC04
+---
 Track: Sun King
 Artists:
 - The Beatles
@@ -30742,12 +30779,16 @@ Lyrics: |-
     Come on
     Uh, uh, come on
 ---
-Track: Xmas? I Don't Know Such A Thing!
+Track: Xmas? I don't know such a thing!!
 # JP: クリスマス？なにそれ？美味しいの？
 # Literally: "Christmas? What's that? Is it tasty?"
+# Reference:
+#   https://ja.wikipedia.org/wiki/クリスマス%3Fなにそれ%3F美味しいの%3F
 Artists:
 - Hyadain
-Duration: '3:43'
+URLs:
+- https://www.youtube.com/watch?v=W7Y8rkI5z_4
+Duration: '3:45'
 Lyrics: |-
     Jingle bells! Jingle bells! Jingle all the way!
     Oh, what fun it is to ride in a one horse open sleigh
@@ -31193,12 +31234,6 @@ Always Reference By Directory: true
 Artists:
 - Noah Noble
 ---
-Track: Summer
-Directory: summer-vanilla
-Always Reference By Directory: true
-Artists:
-- Vanilla
----
 Track: Super Mario Bros. (The Movie)
 Artists:
 - Super Mario
diff --git a/album/tomb-of-the-ancestors.yaml b/album/tomb-of-the-ancestors.yaml
index ab6a595a..1002d4ae 100644
--- a/album/tomb-of-the-ancestors.yaml
+++ b/album/tomb-of-the-ancestors.yaml
@@ -74,9 +74,9 @@ Cover Artists:
 Art Tags:
 - Dualscar
 ---
-Track: --Emperical
+Track: --Empirical
 Additional Names:
-- Emperical (English, normalized)
+- Empirical (English, normalized)
 Duration: '2:04'
 URLs:
 - https://homestuckgaiden.bandcamp.com/track/empirical
diff --git a/album/troleplanet.yaml b/album/troleplanet.yaml
index 41271799..342e79e6 100644
--- a/album/troleplanet.yaml
+++ b/album/troleplanet.yaml
@@ -35,7 +35,7 @@ Referenced Tracks:
 - Miasmajesty
 Sampled Tracks:
 - Miasmajesty
-- Dave's Phat Beat Machine Beat 01 by Andrew Hussie
+- track:phat-1
 ---
 Track: tonados and glass (SHARDS IN EVERY G*G D*NG DIRECTIAN)
 Artists: