diff --git a/Sprites/Objects/minecart.asm b/Sprites/Objects/minecart.asm
index ae267a9..e3bf967 100644
--- a/Sprites/Objects/minecart.asm
+++ b/Sprites/Objects/minecart.asm
@@ -202,8 +202,8 @@ Sprite_Minecart_Prep:
   .inRoom
 
   ; Check if the coordinates match, if not kill the sprite.
-  ; If cart isn't appearring in room, check here for values to match
-  ; against the MiencartTrack table values.
+  ; If cart isn't appearing in room, check here for values to match
+  ; against the MinecartTrack table values.
   ; print "MinecartPrep_CheckCoords ", pc
   LDA.w !MinecartTrackX, Y : CMP.w SprCachedX : BNE .killMinecart
     LDA.w !MinecartTrackY, Y : CMP.w SprCachedY : BNE .killMinecart
@@ -308,7 +308,7 @@ Sprite_Minecart_Prep:
   ; This is which room each track should start in if it hasn't already
   ; been given a track.
   .TrackStartingRooms
-  dw $0098, $0088, $0089, $0088, $0089, $0089, $0089, $0089
+  dw $0098, $0088, $0087, $0088, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
   dw $0089, $0089, $0089, $0089, $0089, $0089, $0089, $0089
diff --git a/Sprites/Objects/switch_track.asm b/Sprites/Objects/switch_track.asm
index 29bfd0e..a98143f 100644
--- a/Sprites/Objects/switch_track.asm
+++ b/Sprites/Objects/switch_track.asm
@@ -50,7 +50,7 @@ Sprite_RotatingTrack_Prep:
 {
   PHB : PHK : PLB
   LDA.b #$80 : STA.w SprDefl, X
-  
+
   ; Setup Minecart position to look for tile IDs
   ; We use AND #$F8 to clamp to a 8x8 grid.
   ; Subtract 8 from the Y position to get the tile right above instead.
@@ -94,8 +94,7 @@ Sprite_RotatingTrack_Main:
   dw BottomLeftToTopLeft
   dw TopRightToBottomRight
   dw BottomRightToBottomLeft
-  
-  ; -------------------------------------------------------
+
   ; 00 = TopLeft -> TopRight
   TopLeftToTopRight:
   {
@@ -107,7 +106,6 @@ Sprite_RotatingTrack_Main:
     RTS
   }
 
-  ; -------------------------------------------------------
   ; 01 = BottomLeft -> TopLeft
   BottomLeftToTopLeft:
   {
@@ -119,7 +117,6 @@ Sprite_RotatingTrack_Main:
     RTS
   }
 
-  ; -------------------------------------------------------
   ; 02 = TopRight -> BottomRight
   TopRightToBottomRight:
   {
@@ -131,7 +128,6 @@ Sprite_RotatingTrack_Main:
     RTS
   }
 
-  ; -------------------------------------------------------
   ; 03 = BottomRight -> BottomLeft
   BottomRightToBottomLeft:
   {
@@ -217,4 +213,3 @@ Sprite_RotatingTrack_Draw:
     db $BD
 }
 
-; =========================================================