various post-release fixes

fixes #97, #98, #101, #104, #108, #110, #111, #114, #116

8 files changed, 76 insertions, 56 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 31c0673d..8c0383d1 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -155,7 +155,7 @@ Art Tags:
 - Vriska
 Referenced Tracks:
 - The Lemonsnout Turnabout
-- Objection! 2001
+- Phoenix Wright - Objection! 2001
 - track:sburban-jungle
 Commentary: |-
     <i>Malcolm Brown:</i>
diff --git a/album/homestuck-vol-9.yaml b/album/homestuck-vol-9.yaml
index 33e16514..1c01c9a5 100644
--- a/album/homestuck-vol-9.yaml
+++ b/album/homestuck-vol-9.yaml
@@ -691,7 +691,7 @@ Artists:
 - Michael Guy Bowman
 Contributors:
 - Erik Scheele (piano)
-- Marcy Nabors (thermin & accordian)
+- Marcy Nabors (theremin & accordion)
 Duration: '3:50'
 URLs:
 - https://homestuck.bandcamp.com/track/im-a-member-of-the-midnight-crew-post-punk-version-2
diff --git a/album/nice-wizards-electronic-extravaganza.yaml b/album/nice-wizards-electronic-extravaganza.yaml
index 16dcf34f..41baf2e4 100644
--- a/album/nice-wizards-electronic-extravaganza.yaml
+++ b/album/nice-wizards-electronic-extravaganza.yaml
@@ -11,6 +11,7 @@ Cover Artists:
 Color: '#6d74cf'
 Groups:
 - Fandom
+- Beyond
 Commentary: |-
     <i>Nice Wizard:</i>
     This is a collection of my electronic works, all in one easy album! Don't feel obliged to pay anything, I'd rather you guys hear it than pay me a penny!
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 78b2b1b6..90ac873b 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -290,3 +290,5 @@ Cover Artists:
 - Hadron
 Art Tags:
 - Kaji (Oceanfalls)
+Referenced Tracks:
+- Sea Patrol (Ocean Quarrel)
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 1ea1d8bc..fa841ee8 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -85,7 +85,7 @@ Referenced Tracks:
 ---
 Track: The Not-Fuckass Not-Waltz
 Cover Artists:
-- drXfactorz
+- daXfactorz
 Duration: '02:41'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/the-not-fuckass-not-waltz
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index bf48a91b..98b891c5 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -161,6 +161,15 @@ Lyrics: |-
     (Well thank you Scott. Thank goodness for comedians. You know? It lightens our day.)
     (It-that-it wasn't supposed to be funny.)
 ---
+Track: Gaster's Theme
+# No official release, duration is from the in-game audio loop.
+Artists:
+- 'Toby Fox'
+Directory: gasters-theme-undertale
+Duration: 0:17
+URLs:
+- https://www.youtube.com/watch?v=CFn8xs157Gw
+---
 Track: Gay Love Song for Four Cellos
 Artists:
 - Clark Powell
@@ -199,6 +208,14 @@ URLs:
 - https://sleepytimejesse.bandcamp.com/track/megalo-strike-back
 - https://www.youtube.com/watch?v=ZpJudi7_iiw
 ---
+Track: Megalovania
+Directory: megalovania-halloween
+# No official release (RIP)
+Artists:
+- Toby Fox
+URLs:
+- https://www.youtube.com/watch?v=iIowwZThIXM
+---
 Track: Michael Bowman Remix
 Artists:
 - Michael Guy Bowman
@@ -329,6 +346,14 @@ Lyrics: |-
 
     (So what, in conclusion, subscribe to my YouTube, subscribe to my Twitter, my Tumblr, everything you can find! I'm Toby "Radiation" Fox, and I'm, the greatest living artist, known to maaan! ...Yo, the fuck? Homestuck update yo, get out! Yo get out! ...Aw, Equius, you get me in a place I can't touch.)
 ---
+Track: Room of Dog
+# No official release, duration is from the in-game audio loop.
+Artists:
+- 'Toby Fox'
+Duration: '0:35'
+URLs:
+- https://www.youtube.com/watch?v=grGnVeKCcvc
+---
 Track: Seinfeld X
 Artists:
 - Toby Fox
@@ -850,15 +875,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=hPT77G3LGwA
 ---
-Track: Gaster's Theme
-# No official release, duration is from the in-game audio loop.
-Artists:
-- 'Toby Fox'
-Directory: gasters-theme-undertale
-Duration: 0:17
-URLs:
-- https://www.youtube.com/watch?v=CFn8xs157Gw
----
 Track: GO MY WAY!!
 # Official release:
 #   THE IDOLM@STER MASTERWORK 01 GO MY WAY!!
@@ -1292,13 +1308,20 @@ Lyrics: |-
     Your lonely rolling star
     Saa mae wo muite yukou (<i>So face forward and keep going!</i>)
 ---
-Track: Megalovania
-Directory: megalovania-halloween
-# No official release (RIP)
+Track: Maya Fey - Turnabout Sisters 2001
+# JP: 綾里真宵　～逆転姉妹のテーマ 2001
+# Official release:
+#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
 Artists:
-- Toby Fox
+- Ace Attorney
+- Masakazu Sugimori
+Contributors:
+- Naoto Tanaka (arrangement)
+Duration: '2:41'
 URLs:
-- https://www.youtube.com/watch?v=iIowwZThIXM
+- https://www.youtube.com/watch?v=upOhRRYVGkA
 ---
 Track: Moon Over the Castle
 # Original release:
@@ -1339,21 +1362,6 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=PTQBFoM_cVw
 ---
-Track: Objection! 2001
-# JP: 成歩堂龍一　～異議あり！ 2001
-# Official release:
-#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
-# Reference:
-#   https://vgmdb.net/album/2600
-Artists:
-- Ace Attorney
-- Masakazu Sugimori
-Contributors:
-- Naoto Tanaka (arrangement)
-Duration: '1:22'
-URLs:
-- https://www.youtube.com/watch?v=_I34nshlOPk
----
 Track: Old Friends
 # Official release on Bandcamp
 Artists:
@@ -1382,6 +1390,21 @@ Artists:
 URLs:
 - https://www.youtube.com/watch?v=XKfXsTkA71I
 ---
+Track: Phoenix Wright - Objection! 2001
+# JP: 成歩堂龍一　～異議あり！ 2001
+# Official release:
+#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
+# Reference:
+#   https://vgmdb.net/album/2600
+Artists:
+- Ace Attorney
+- Masakazu Sugimori
+Contributors:
+- Naoto Tanaka (arrangement)
+Duration: '1:22'
+URLs:
+- https://www.youtube.com/watch?v=_I34nshlOPk
+---
 Track: Pushing Onwards
 # Official release on Bandcamp (OK, also the guy's own site)
 # Reference:
@@ -1474,14 +1497,6 @@ Duration: '5:04'
 URLs:
 - https://www.youtube.com/watch?v=SmIdewKUmW4
 ---
-Track: Room of Dog
-# No official release, duration is from the in-game audio loop.
-Artists:
-- 'Toby Fox'
-Duration: '0:35'
-URLs:
-- https://www.youtube.com/watch?v=grGnVeKCcvc
----
 Track: Running Hell
 # The original Cave Story's soundtrack hasn't been officially released.
 Artists:
@@ -1966,21 +1981,6 @@ Duration: '3:29'
 URLs:
 - https://youtu.be/KYhA2RisjP0?t=43
 ---
-Track: Turnabout Sisters Theme 2001
-# JP: 綾里真宵　～逆転姉妹のテーマ 2001
-# Official release:
-#   逆転裁判＋逆転裁判２　オリジナル・サウンドトラック
-# Reference:
-#   https://vgmdb.net/album/2600
-Artists:
-- Ace Attorney
-- Masakazu Sugimori
-Contributors:
-- Naoto Tanaka (arrangement)
-Duration: '2:41'
-URLs:
-- https://www.youtube.com/watch?v=upOhRRYVGkA
----
 Track: Ultimate Koopa
 # JP: クッパ3号
 # Official release:
diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index e17ee025..f78fc450 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -33,6 +33,8 @@ Additional Files:
   - banner.png
   - bg.png
 ---
+Group: Main album
+---
 Track: A Scape
 Artists:
 - Marcy Nabors
@@ -150,3 +152,18 @@ URLs:
 Commentary: |-
     <i>Nat Wesley:</i>
     hues/tone is a track about houston get it
+---
+Group: Bonus tracks
+---
+Track: Audio Commentary Featuring David Ellis, Robert J! Lake, Yishan Mai, Marcy Nabors and Corbin Pangilinan
+Artists:
+- David Ellis
+- Robert J! Lake
+- Catboss
+- Marcy Nabors
+- Corbin Pangilinan
+Duration: '40:03'
+Has URLs: false
+Commentary: |-
+    <i>Niklink:</i>
+    The 'lyrics' to this track are deliberately ommitted. As commentary, providing a transcription would be essentially the same as providing the audio itself, which is purchase-only bonus material.
\ No newline at end of file
diff --git a/album/undertale-soundtrack.yaml b/album/undertale-soundtrack.yaml
index 40b06498..1eeb1612 100644
--- a/album/undertale-soundtrack.yaml
+++ b/album/undertale-soundtrack.yaml
@@ -838,7 +838,7 @@ URLs:
 - https://youtu.be/9nXCOhSYu38
 Referenced Tracks:
 - Dating Start!
-- Turnabout Sisters Theme 2001
+- Maya Fey - Turnabout Sisters 2001
 ---
 Track: Bereavement
 Artists: