misc fixes

1 files changed, 46 insertions, 104 deletions

diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 010addc..f2e7df7 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -15342,8 +15342,8 @@ URLs:
 ---
 Track: Here Comes Santa Claus
 Artists:
-- Oakley Haldeman
-- Gene Autry
+- Gene Autry (lyrics, performance)
+- Oakley Haldeman (composition)
 Duration: '2:34'
 URLs:
 - https://www.youtube.com/watch?v=U6kRYKvWF1E
@@ -16159,59 +16159,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=quxTnEEETbo
 ---
-Track: Santa Claus Is Comin' to Town
-Artists:
-- John Frederick Coots
-- Haven Gillespie
-URLs:
-- https://www.youtube.com/watch?v=zFSVT8PFyI8
-Lyrics: |-
-    I've just come back from a lovely trip
-    Along the Milky Way
-    I stopped off at the North Pole
-    To spend the holiday
-
-    I called on dear old Santa Claus
-    To see what I could see
-    He took me to his workshop
-    And told his plan to me
-
-    So you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-
-    He's making a list
-    Checking it twice
-    Gonna find out who's naughty or nice
-    Santa Claus is comin' to town
-
-    He sees you when you're sleeping
-    He knows when you're awake
-    He knows if you've been good or bad
-    So be good for goodness' sake
-
-    Oh you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-
-    Oh you better watch out
-    You better not cry
-    You better not pout
-    I'm telling you why
-    Santa Claus is comin' to town
-Commentary: |-
-    <i>Niklink:</i> (wiki editor)
-
-    The lyrics may be a little different to what you're used to, but they correspond to the first recording of this carol by Harry Reser.
-
-    <i>Quasar Nebula:</i> (wiki editor)
-
-    [For a very long time,](https://web.archive.org/web/20130111060110/http://xzazupsilon.webs.com/nsnd.html) listed as referenced during the introduction of [[track:gog-rest-ye-merry-prospitians]]; this appears to be [[track:here-comes-santa-claus]] instead.
----
 Track: Shchedryk
 Artists:
 - Mykola Leontovych
@@ -16792,55 +16739,50 @@ URLs:
 Commentary: |-
     <i>Niklink:</i> (wiki editor)
     Also known as the "Westminster Chimes", "Cambridge Quarters", or "Cambridge Chimes". While the task of composing the chimes was given to Joseph Jowett in 1793, it's believed that he was probably assisted by either John Randall or William Crotch.
-# ---
-# Track: When Johnny Comes Marching Home
-#
-#   # Used to be referenced by Land of Sand and Rails,
-#   # presently orphaned. See #hsmusic-chat:
-#   # https://discord.com/channels/749042497610842152/779895315750715422/1199169695908118600
-#
-# Artists:
-# - Patrick Gilmore
-# URLs:
-# - https://www.youtube.com/watch?v=WtEqgG2EdTs
-# Referenced Tracks:
-# - Johnny Fill Up the Bowl
-# Lyrics: |-
-#     When Johnny comes marching home again
-#     Hurrah! Hurrah!
-#     We'll give him a hearty welcome then
-#     Hurrah! Hurrah!
-#     The men will cheer and the boys will shout
-#     The ladies they will all turn out
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     The old church bell will peal with joy
-#     Hurrah! Hurrah!
-#     To welcome home our darling boy
-#     Hurrah! Hurrah!
-#     The village lads and lassies say
-#     With roses they will strew the way
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     Get ready for the Jubilee
-#     Hurrah! Hurrah!
-#     We'll give the hero three times three
-#     Hurrah! Hurrah!
-#     The laurel wreath is ready now
-#     To place upon his loyal brow
-#     And we'll all feel gay
-#     When Johnny comes marching home
-#
-#     Let love and friendship on that day
-#     Hurrah, hurrah!
-#     Their choicest pleasures then display
-#     Hurrah, hurrah!
-#     And let each one perform some part
-#     To fill with joy the warrior's heart
-#     And we'll all feel gay
-#     When Johnny comes marching home
+---
+Track: When Johnny Comes Marching Home
+Artists:
+- Patrick Gilmore
+URLs:
+- https://www.youtube.com/watch?v=WtEqgG2EdTs
+Referenced Tracks:
+- Johnny Fill Up the Bowl
+Lyrics: |-
+    When Johnny comes marching home again
+    Hurrah! Hurrah!
+    We'll give him a hearty welcome then
+    Hurrah! Hurrah!
+    The men will cheer and the boys will shout
+    The ladies they will all turn out
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    The old church bell will peal with joy
+    Hurrah! Hurrah!
+    To welcome home our darling boy
+    Hurrah! Hurrah!
+    The village lads and lassies say
+    With roses they will strew the way
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    Get ready for the Jubilee
+    Hurrah! Hurrah!
+    We'll give the hero three times three
+    Hurrah! Hurrah!
+    The laurel wreath is ready now
+    To place upon his loyal brow
+    And we'll all feel gay
+    When Johnny comes marching home
+
+    Let love and friendship on that day
+    Hurrah, hurrah!
+    Their choicest pleasures then display
+    Hurrah, hurrah!
+    And let each one perform some part
+    To fill with joy the warrior's heart
+    And we'll all feel gay
+    When Johnny comes marching home
 ---
 Track: Yama No Ongakuka
 Artists: