diff --git a/game/script/1.first-two-days-anon-meets-fang.rpy b/game/script/1.first-two-days-anon-meets-fang.rpy
index 2d29243..e544229 100644
--- a/game/script/1.first-two-days-anon-meets-fang.rpy
+++ b/game/script/1.first-two-days-anon-meets-fang.rpy
@@ -3663,4 +3663,4 @@ label chapter_1:
     window auto
     pause 1.5
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/10.an-excellent-reason-to-start-abusing-mod-powers.rpy b/game/script/10.an-excellent-reason-to-start-abusing-mod-powers.rpy
index eed95dc..e525e4e 100644
--- a/game/script/10.an-excellent-reason-to-start-abusing-mod-powers.rpy
+++ b/game/script/10.an-excellent-reason-to-start-abusing-mod-powers.rpy
@@ -550,4 +550,4 @@ label chapter_10:
     window auto
     pause 1
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy
index ad78761..2b47b73 100644
--- a/game/script/11.school-assignment-and-route-lock.rpy
+++ b/game/script/11.school-assignment-and-route-lock.rpy
@@ -588,7 +588,7 @@ label chapter_11:
 
     if ending_score == 4: # Golden
         jump lSortingThings
-    elif _return == 3: # tradwife
+    elif ending_score == 3: # tradwife
         jump lMendingThings
     else:
         jump lBreakingThings # All else fails, go to shooter.
@@ -5468,7 +5468,7 @@ label chapter_11:
 
     # skip this segment if we're doing ending 1
     if ending_score == 1: #shooter
-        return
+        $ next_story_chapter()
     
     # the following segment makes sense in the context of 11B+11C+11D
     window hide
@@ -5564,4 +5564,4 @@ label chapter_11:
 
     A "Anyways, where were we?"
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/2.fourth-day-of-school.rpy b/game/script/2.fourth-day-of-school.rpy
index e5294d1..a3b192f 100644
--- a/game/script/2.fourth-day-of-school.rpy
+++ b/game/script/2.fourth-day-of-school.rpy
@@ -2604,4 +2604,4 @@ label chapter_2:
     "{cps=*.05}...{/cps}"
     pause .5
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy
index 51a28d8..695f311 100644
--- a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy
+++ b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy
@@ -2291,4 +2291,4 @@ label chapter_3:
 
     "{cps=*.1}...{/cps}"
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/4.anon-needs-help-during-music-period.rpy b/game/script/4.anon-needs-help-during-music-period.rpy
index cf2c459..a6533a1 100644
--- a/game/script/4.anon-needs-help-during-music-period.rpy
+++ b/game/script/4.anon-needs-help-during-music-period.rpy
@@ -1422,4 +1422,4 @@ label chapter_4:
     window auto
     pause .5
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
index 3345a24..1057c59 100644
--- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
+++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
@@ -4665,7 +4665,7 @@ label chapter_5:
     window auto
     pause 1
 
-    return
+    $ next_story_chapter()
 
 # I'm guessing this is for the gallery?
 label fang_movie:
diff --git a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy
index 74e31a7..87ccb2f 100644
--- a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy
+++ b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy
@@ -4677,4 +4677,4 @@ label chapter_6:
     window auto
     pause 1
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/7.concert-day.rpy b/game/script/7.concert-day.rpy
index 5d65fae..a974a75 100644
--- a/game/script/7.concert-day.rpy
+++ b/game/script/7.concert-day.rpy
@@ -1736,4 +1736,4 @@ label chapter_7:
     "{cps=*.1}...{/cps}"
     pause 0.5
 
-    return
+    $ next_story_chapter()
diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy
index 75c26ae..030dbcf 100644
--- a/game/script/8.anon-and-fang-study-together.rpy
+++ b/game/script/8.anon-and-fang-study-together.rpy
@@ -1567,7 +1567,7 @@ label chapter_8:
             window hide
             window auto
 
-        return
+        $ next_story_chapter()
 
     label lGetStartedOnStudy:
         pause 0.5
@@ -2156,4 +2156,5 @@ label chapter_8:
         "{cps=*.1}...{/cps}"
         window hide
         window auto
-        return
+
+        $ next_story_chapter()
diff --git a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy
index 1a88615..6e52427 100644
--- a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy
+++ b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy
@@ -2171,4 +2171,4 @@ label chapter_9:
     window auto
     pause .5
 
-    return
+    $ next_story_chapter()