bring over Niklink's data fixes!

18 files changed, 111 insertions, 53 deletions

diff --git a/album/cherubim.yaml b/album/cherubim.yaml
index 9cd98aff..02640317 100644
--- a/album/cherubim.yaml
+++ b/album/cherubim.yaml
@@ -114,11 +114,7 @@ Commentary: |-
 ---
 Track: Green Lolly
 Artists:
-- James Dever
 - Robert J! Lake
-Contributors:
-- James Dever (original theme)
-- Robert J! Lake (arrangement, production)
 Duration: '4:11'
 URLs:
 - https://homestuck.bandcamp.com/track/green-lolly-2
@@ -132,11 +128,7 @@ Referenced Tracks:
 ---
 Track: Red Sucker
 Artists:
-- James Dever
-- Robert J! Lake
-Contributors:
-- James Dever (theme)
-- Robert J! Lake (arrangement, production)
+- Kalibration
 Duration: '3:44'
 URLs:
 - https://homestuck.bandcamp.com/track/red-sucker-2
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 8d901302..949d5c8f 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -450,9 +450,9 @@ Directory: doctor-vol-1-4
 Originally Released As: track:doctor
 Artists:
 - Buzinkai
+- Clark Powell
 Contributors:
-- Clark Powell (production)
-- Michael Vallejo (production)
+- Michael Vallejo (percussion)
 Duration: '2:37'
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-3
@@ -523,4 +523,7 @@ Artists:
 Duration: 0:54
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-original-loop-2
-- https://youtu.be/VpXseHnyzDg
+- https://www.youtube.com/watch?v=o0Um9OiP8dU
+Commentary: |-
+    <i>Buzinkai:</i>
+    <a href='https://www.youtube.com/watch?v=EsG71P_zEIE'>'Doctor' Explained</a>
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index e88d0e5f..dbe4e56e 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -177,7 +177,7 @@ Contributors:
 - viaSatellite (bass)
 - David Dycus (synths, composition)
 - Ian White (trumpet)
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 Duration: '4:22'
 URLs:
 - https://homestuck.bandcamp.com/track/you-killed-my-father-prepare-to-die-2
@@ -407,7 +407,7 @@ Cover Artists:
 - Alyssa Lee Dalangin
 Art Tags:
 - John
-- Dave
+- AH
 Referenced Tracks:
 - Skaian Ride
 - Skaia Voyages
@@ -694,7 +694,7 @@ Artists:
 Contributors:
 - Marcy Nabors (composition, bass clarinet)
 - Catboss (flute)
-- Kelly Sadwin (violin & viola)
+- Noel Sadwin (violin & viola)
 - Jamie Paige Stanley (percussion)
 - Kyle G. Jamolin (lyrics & choir direction)
 - Ciaran Cain (choir)
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index b84840fd..414b0696 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -112,9 +112,9 @@ Sampled Tracks:
 Track: Doctor
 Artists:
 - Buzinkai
+- Clark Powell
 Contributors:
-- Clark Powell (production)
-- Michael Vallejo (production)
+- Michael Vallejo (percussion)
 Duration: '2:37'
 URLs:
 - https://homestuck.bandcamp.com/track/doctor-3
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index a7a24eaa..ec3844fc 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -113,6 +113,8 @@ Commentary: |-
     THE GAMES WILL NEVER STOP
     you know the rest
     (alternatively: where the heck did that horrible dude come from get him out of the way of the album art jesus)
+
+    I just binged on too much <a href="https://www.youtube.com/watch?v=xkreaWxL224">Go Mario Go</a> and <a href="https://www.youtube.com/watch?v=1cez1x1Gei4">The Heat Is On (bust a groove 2)</a> and went out to mow the lawn and came up with it
 ---
 Track: Tribal Ebonpyre
 Artists:
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index b35ec134..a03b87a8 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -648,7 +648,7 @@ Track: Judgment Day
 Artists:
 - Toby Fox
 Contributors:
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 Duration: '2:00'
 URLs:
 - https://homestuck.bandcamp.com/track/judgment-day-2
@@ -763,7 +763,7 @@ Artists:
 - Toby Fox
 Contributors:
 - Tensei (electric guitar)
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 Duration: '2:30'
 URLs:
 - https://homestuck.bandcamp.com/track/black-hole-green-sun-2
diff --git a/album/labyrinths-heart.yaml b/album/labyrinths-heart.yaml
index 6792020e..6e8515d8 100644
--- a/album/labyrinths-heart.yaml
+++ b/album/labyrinths-heart.yaml
@@ -4,6 +4,7 @@ Artists:
 Date: September 2, 2015
 Date Added: October 10, 2020
 URLs:
+- https://clarkpowell.bandcamp.com/album/labyrinths-heart
 - https://www.youtube.com/playlist?list=PLnVpmehyaOFZhrI8iMi4bMrEyl2ZaWd7R
 Has Track Art: false
 Cover Artists:
@@ -19,26 +20,31 @@ Banner Dimensions: 975x180
 Track: Getting Lost
 Duration: '1:22'
 URLs:
+- https://clarkpowell.bandcamp.com/track/getting-lost
 - https://youtu.be/MCQjTIw6VY8
 ---
 Track: Minotaur
 Duration: '3:36'
 URLs:
+- https://clarkpowell.bandcamp.com/track/minotaur
 - https://youtu.be/NOIaL69tDHI
 ---
 Track: Pleas
 Duration: '3:06'
 URLs:
+- https://clarkpowell.bandcamp.com/track/pleas
 - https://youtu.be/F13Mw50d3Zk
 ---
 Track: Forgotten
 Duration: '4:22'
 URLs:
+- https://clarkpowell.bandcamp.com/track/forgotten
 - https://youtu.be/Vatl6V7lTpQ
 ---
 Track: Misbegotten
 Duration: '4:20'
 URLs:
+- https://clarkpowell.bandcamp.com/track/misbegotten
 - https://youtu.be/9ai9ETnvXQo
 Referenced Tracks:
 - Pencil Holder (demo version)
@@ -51,42 +57,50 @@ Lyrics: |-
 Track: Calypso Deep
 Duration: '1:46'
 URLs:
+- https://clarkpowell.bandcamp.com/track/calypso-deep
 - https://youtu.be/hcg2mriL1sc
 ---
 Track: Cruel Ulysses
 Duration: '2:24'
 URLs:
+- https://clarkpowell.bandcamp.com/track/cruel-ulysses
 - https://youtu.be/VvREunKFvkQ
 ---
 Track: Shoreline
 Duration: '3:48'
 URLs:
+- https://clarkpowell.bandcamp.com/track/shoreline
 - https://youtu.be/x9Nen28KsS8
 ---
 Track: Bosom of Abraham
 Duration: '2:28'
 URLs:
+- https://clarkpowell.bandcamp.com/track/bosom-of-abraham
 - https://youtu.be/pDs5u221UGo
 ---
 Track: Dante
 Duration: '2:12'
 URLs:
+- https://clarkpowell.bandcamp.com/track/dante
 - https://youtu.be/B6SGqbdQA9g
 ---
 Track: Tiresias
 Duration: '3:40'
 URLs:
+- https://clarkpowell.bandcamp.com/track/tiresias
 - https://youtu.be/_uI2KZD9IYc
 ---
 Track: Fission
 Duration: '2:30'
 URLs:
+- https://clarkpowell.bandcamp.com/track/fission
 - https://youtu.be/l_ODZbxdzFg
 ---
 Track: Requiem
 Directory: requiem-labyrinths-heart
 Duration: '4:38'
 URLs:
+- https://clarkpowell.bandcamp.com/track/requiem
 - https://youtu.be/u4x-_BipEwA
 Referenced Tracks:
 - Serenade
@@ -94,9 +108,11 @@ Referenced Tracks:
 Track: I Miss Being Lost
 Duration: '2:48'
 URLs:
+- https://clarkpowell.bandcamp.com/track/i-miss-being-lost
 - https://youtu.be/26W6xjT8i8g
 ---
 Track: Come Theseus
 Duration: '1:50'
 URLs:
+- https://clarkpowell.bandcamp.com/track/come-theseus
 - https://youtu.be/iPk8jx_C53I
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index fc7a9aa9..a4a66b18 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -196,7 +196,7 @@ Artists:
 Duration: '4:17'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/skaian-starstorm
-- https://youtu.be/zZF06KQUNzQ
+- https://youtu.be/oTOwhix_Zqw
 Cover Artists:
 - Dawn Davis
 Art Tags:
@@ -1615,7 +1615,6 @@ Artists:
 Duration: '3:13'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/planetarium
-- https://youtu.be/sGfi96uva5Q
 Cover Artists:
 - Spectrumfizz
 Commentary: |-
diff --git a/album/namesake.yaml b/album/namesake.yaml
index 3122128b..20b2d156 100644
--- a/album/namesake.yaml
+++ b/album/namesake.yaml
@@ -14,44 +14,58 @@ Commentary: |-
     <i>Clark Powell:</i>
     Special thanks to Astro Kid for his beautiful voice, and to Andarix for her keen eyes.
 Listed on Homepage: false
+URLS:
+- https://clarkpowell.bandcamp.com/album/namesake
 ---
 Track: Star I Never Caught
 Duration: '3:50'
 URLs:
+- https://clarkpowell.bandcamp.com/track/star-i-never-caught
 - https://soundcloud.com/plazmataz/star-i-never-caught
 ---
 Track: Woman I Never Met
 Duration: '2:36'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/woman-i-never-met
 ---
 Track: Day That Never Came
+Contributors:
+- Astro Kid (Vocals)
 Duration: '3:22'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/day-that-never-came
 ---
 Track: Puzzle I Never Solved
 Duration: '3:20'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/puzzle-i-never-solved
 ---
 Track: Treasure I Never Found
 Duration: '2:28'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/treasure-i-never-found
 ---
 Track: Voice I Never Heard
 Duration: '2:43'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/voice-i-never-heard
 ---
 Track: Country I Never Saw
 Duration: '4:02'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/country-i-never-saw
 ---
 Track: People I Never Knew
 Duration: '3:26'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/people-i-never-knew
 ---
 Track: Sigh I Never Breathed
 Duration: '2:22'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/sigh-i-never-breathed
 ---
 Track: Song I Never Played
 Duration: '1:52'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/song-i-never-played
diff --git a/album/one-year-older.yaml b/album/one-year-older.yaml
index 788f40d3..51eed919 100644
--- a/album/one-year-older.yaml
+++ b/album/one-year-older.yaml
@@ -239,6 +239,11 @@ Cover Artists:
 - K
 Art Tags:
 - John
+- Vriska
+- Dave
+- Jade
+- Rose
+- Karkat
 Commentary: |-
     <i>Erik Scheele:</i>
     To separate the big glitched-up waves from the final battle and rest up ahead, I wanted to stick something right in the middle just to give the listener a break. And, in some games I've played, there's a sort of resting area before the final boss, or a small break to prepare yourself before the last battle. This is what spawned Respit, the idea of a light and airy, calming piece. I was also pretty reminded of Kingdom Heart's usage of the "resting area" trope, which was a small chamber with several large crystals around. So, I went with the idea of a large, reflective area, someplace in the dream bubbles perhaps, where the heroes could rest and reflect.
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index 11d6a93b..e1db7ef6 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -28,6 +28,8 @@ URLs:
 ---
 Track: Together
 Originally Released As: Day That Never Came
+Contributors:
+- Astro Kid (Vocals)
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index b8387e56..47b144dc 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -55,6 +55,8 @@ URLs:
 Track: Together
 Directory: together-ost
 Originally Released As: Day That Never Came
+Contributors:
+- Astro Kid (Vocals)
 Duration: '2:04'
 URLs:
 - https://psycholonials.bandcamp.com/track/together-2
@@ -306,8 +308,9 @@ Group: Bonus tracks
 ---
 Track: 'Together: Vocal Remix'
 Originally Released As: Someday
-Artists:
-- Clark Powell
-- Astro Kid
+Contributors:
+- Astro Kid (Vocals)
 Duration: '2:56'
 Has URLs: false
+Referenced Tracks:
+- track:day-that-never-came
diff --git a/album/someday.yaml b/album/someday.yaml
index 99ced94c..43ff270d 100644
--- a/album/someday.yaml
+++ b/album/someday.yaml
@@ -4,6 +4,8 @@ Artists:
 - Astro Kid
 Date: November 21, 2013
 Date Added: May 12, 2021
+URLs:
+- https://clarkpowell.bandcamp.com/album/someday
 Has Track Art: false
 Cover Artists:
 - Kristin Kemper
@@ -20,14 +22,22 @@ Wallpaper Artists:
 Listed on Homepage: false
 ---
 Track: Someday
+Artists:
+- Clark Powell
+Contributors:
+- Astro Kid (Vocals)
 Duration: '3:58'
 URLs:
+- https://clarkpowell.bandcamp.com/track/someday-feat-astro-kid
 - https://soundcloud.com/plazmataz/someday-feat-astro-kid
+Referenced Tracks:
+- Day That Never Came
 ---
 Track: Someday (Astro Kid Remix)
 Artists:
 - Astro Kid
 Duration: '4:41'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/someday-astro-kid-remix
 Referenced Tracks:
 - Someday
diff --git a/album/strife-2.yaml b/album/strife-2.yaml
index bab0c9ed..d702524f 100644
--- a/album/strife-2.yaml
+++ b/album/strife-2.yaml
@@ -162,4 +162,5 @@ URLs:
 ---
 Track: Duet
 Duration: '2:37'
-Has URLs: false
+URLs:
+- https://www.youtube.com/watch?v=oJHJGgbpeMI
diff --git a/album/the-baby-is-you.yaml b/album/the-baby-is-you.yaml
index 11af73b2..0cd8d658 100644
--- a/album/the-baby-is-you.yaml
+++ b/album/the-baby-is-you.yaml
@@ -1,7 +1,7 @@
 Album: The Baby is You
 Artists:
 - Toby Fox
-Date: September 27, 2010
+Date: October 13, 2010
 Date Added: January 12, 2021
 URLs:
 - https://www.youtube.com/watch?v=gfiwU2f-ts4
diff --git a/album/the-wanderers.yaml b/album/the-wanderers.yaml
index c9fb4f94..79a89df3 100644
--- a/album/the-wanderers.yaml
+++ b/album/the-wanderers.yaml
@@ -68,7 +68,7 @@ Duration: '5:59'
 URLs:
 - https://youtu.be/TktueKyYBKs
 Cover Artists:
-- Guy
+- Carla Bravo
 Art Tags:
 - WV
 - PM
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index f2a70576..f72c8717 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -2113,7 +2113,7 @@ Artists:
 - Seth Peelle
 Duration: '5:48'
 URLs:
-- https://www.youtube.com/watch?v=dUA7oEyZT0Y
+- https://www.youtube.com/watch?v=OEYox7zoOvU
 ---
 Track: Chrono Trigger
 Artists:
@@ -2132,7 +2132,7 @@ URLs:
 Track: Corridors of Time
 Artists:
 - Chrono Trigger
-Duration: '3:03'
+Duration: '3:00'
 URLs:
 - https://www.youtube.com/watch?v=BXo3DrXHY8w
 ---
@@ -2265,7 +2265,7 @@ URLs:
 Track: Fear of the Heavens
 Artists:
 - Secret of Mana
-Duration: '1:44'
+Duration: '1:42'
 URLs:
 - https://www.youtube.com/watch?v=dGna-qHdg-k
 ---
@@ -2464,7 +2464,7 @@ Artists:
 - Final Fantasy
 Duration: '4:28'
 URLs:
-- https://www.youtube.com/watch?v=wEiNkDmEkFk
+- https://www.youtube.com/watch?v=4CTjzAL3XT8
 ---
 Track: Hotel Mario
 Artists:
@@ -2504,7 +2504,7 @@ URLs:
 Track: Icirrus City
 Artists:
 - Pokémon
-Duration: '7:00'
+Duration: '2:05'
 URLs:
 - https://www.youtube.com/watch?v=vMTqSl-usYI
 ---
@@ -2599,7 +2599,7 @@ Artists:
 - Rhythm Heaven
 Duration: '2:55'
 URLs:
-- https://www.youtube.com/watch?v=D3UaMiVt814
+- https://www.youtube.com/watch?v=2xNDTPbdO80
 ---
 Track: Let it Snow! Let it Snow! Let it Snow!
 Artists:
@@ -3217,7 +3217,7 @@ Commentary: |-
 Track: Terra's Theme
 Artists:
 - Final Fantasy
-Duration: '3:52'
+Duration: '3:50'
 URLs:
 - https://www.youtube.com/watch?v=PiI7rDqv9FQ
 ---
@@ -3252,7 +3252,7 @@ URLs:
 Track: The Decisive Battle
 Artists:
 - Final Fantasy
-Duration: '2:02'
+Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=6SB4_iQWwoQ
 ---
diff --git a/album/we-are-all-satellites.yaml b/album/we-are-all-satellites.yaml
index cd6124d3..927decc4 100644
--- a/album/we-are-all-satellites.yaml
+++ b/album/we-are-all-satellites.yaml
@@ -3,6 +3,8 @@ Artists:
 - Clark Powell
 Date: October 4, 2012
 Date Added: May 12, 2021
+URLs:
+- https://clarkpowell.bandcamp.com/album/we-are-all-satellites
 Has Track Art: false
 Cover Artists:
 - Richard Gung
@@ -15,36 +17,45 @@ Listed on Homepage: false
 Track: Harrigan
 Duration: '4:32'
 URLs:
+- https://clarkpowell.bandcamp.com/track/harrigan
 - https://soundcloud.com/plazmataz/harrigan
 ---
 Track: She Needs to Come Home
 Duration: '3:39'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/she-needs-to-come-home
 ---
 Track: Mischief
 Duration: '3:44'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/mischief
 ---
 Track: Miranda
 Duration: '3:22'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/miranda
 ---
 Track: A Romance of Protons and Neutrons
 Duration: '4:24'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/a-romance-of-protons-and-neutrons
 ---
 Track: A Heaven Broad and Ochre
 Duration: '4:09'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/a-heaven-broad-and-ochre
 ---
 Track: Lunatic
 Duration: '5:48'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/lunatic
 ---
 Track: An Old One
 Duration: '3:04'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/an-old-one
 ---
 Track: '15874'
 Duration: '2:19'
-Has URLs: false
+URLs:
+- https://clarkpowell.bandcamp.com/track/15874