diff --git a/Test/Songs/02 OpenTaiko Chapter II/049 - Overclocked/Overclocked.tja b/Test/Songs/02 OpenTaiko Chapter II/049 - Overclocked/Overclocked.tja
index eb673a7f..c586e405 100644
--- a/Test/Songs/02 OpenTaiko Chapter II/049 - Overclocked/Overclocked.tja	
+++ b/Test/Songs/02 OpenTaiko Chapter II/049 - Overclocked/Overclocked.tja	
@@ -1,19 +1,20 @@
 TITLE:Overclocked (Pocket Size)
 SUBTITLE:--DeBisco
 BPM:150
-OFFSET:0
-DEMOSTART:89.6
 WAVE:Overclocked.ogg
 PREIMAGE:Overclocked.jpg
+OFFSET:0
+DEMOSTART:89.6
 MAKER:Colin & Komi
 
 COURSE:Edit
 LEVEL:8
 BALLOON:80
+SCOREINIT:
+SCOREDIFF:
+NOTESDESIGNER4:Colin & Komi
 
 #START
-#MEASURE 4/4
-
 #SCROLL 0.75
 3000000000222220,
 2222202222202222,
@@ -23,7 +24,6 @@ BALLOON:80
 2222202222202222,
 1210121212101212,
 100000100100200200100000101010100000100100200200,
-
 #GOGOSTART
 #SCROLL 1
 1011201202102122,
@@ -34,10 +34,8 @@ BALLOON:80
 1011201202102122,
 1011201212102122,
 #GOGOEND
-
 #SCROLL 0.75
 2222202222202222,
-
 #GOGOSTART
 #SCROLL 1
 1011201212102122,
@@ -48,46 +46,40 @@ BALLOON:80
 1011201212102122,
 1011201212102122,
 1011201212102022,
-#GOGOEND
-
-
 #MEASURE 1/4
+#GOGOEND
 #SCROLL 0.8
-1000,
+1,
 #SCROLL 0.82
-1000,
+1,
 #SCROLL 0.84
 1022,
 #SCROLL 0.86
-1020,
-
+12,
 #SCROLL 0.88
-1000,
+1,
 #SCROLL 0.9
-1000,
+1,
 #SCROLL 0.92
 1002,
 #SCROLL 0.94
-1020,
-
+12,
 #SCROLL 0.96
-1000,
+1,
 #SCROLL 0.98
-1000,
+1,
 #SCROLL 1
 1022,
 #SCROLL 1.02
-1020,
-
+12,
 #SCROLL 1.04
-1000,
+1,
 #SCROLL 1.06
-1000,
+1,
 #SCROLL 1.08
 1002,
 #SCROLL 1.1
-1020,
-
+12,
 #MEASURE 1/8
 #SCROLL 0.9
 1,
@@ -105,10 +97,8 @@ BALLOON:80
 1,
 #SCROLL 1.04
 1,
-
 #SCROLL 1.06
 1,
-#SCCROL 1.08
 1,
 #SCROLL 1.1
 1,
@@ -122,7 +112,6 @@ BALLOON:80
 1,
 #SCROLL 1.2
 1,
-
 #MEASURE 1/16
 #SCROLL 1
 1,
@@ -158,7 +147,6 @@ BALLOON:80
 1,
 #MEASURE 4/4
 20001000202010102020100022002020,
-
 #GOGOSTART
 20214441,
 40004000400010002200200010102000,
@@ -168,64 +156,53 @@ BALLOON:80
 40004000400010002200200010102000,
 20214441,
 4040401011121222,
-
 #SCROLL 2
 400000
 #SCROLL 1.3
 100000200200100000400000004000000040000000,
-444
+404040
 #SCROLL 2
-608,
-
+600080,
 #SCROLL 1.3
 200200000200101020002000200020001000200010001000,
-444444,
+404040404040,
 100000000000200200200000400000004000000040000000,
-444
+404040
 #SCROLL 2
-608,
-
+600080,
 #SCROLL 1.3
 1011221020221120,
 404040101212,
-
-#GOGOEND
 #MEASURE 1/4
+#GOGOEND
 7,
 #SCROLL 1
 0,
-0,
-0,
-
-0,
-0,
-0,
-0,
-
-0,
-0,
-0,
-0,
-
-0,
-0,
-0,
-0,
-
-0,
-0,
-0,
-0,
-
-00,
-00,
-00,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
 08,
-
 #MEASURE 4/4
 200000200100000200100000101000101000200200200200,
 100000000000200000200000200000000000100000000000100000000000200020000200200200000000000000000000,
-
 #GOGOSTART
 1021201210102122,
 1011201212102022,
@@ -243,7 +220,6 @@ BALLOON:80
 1011201212102022,
 1021201210102122,
 1011201212102022,
-
 #GOGOEND
 1000101020010010,
 01000000,
@@ -277,51 +253,51 @@ NOTESDESIGNER3:Colin
 #SCROLL 5
 3,
 #SCROLL 4.83333
-,
+0,
 #SCROLL 4.66667
-,
+0,
 #SCROLL 4.5
-,
+0,
 #SCROLL 4.33333
-,
+0,
 #SCROLL 4.16667
-,
+0,
 #SCROLL 4
-,
+0,
 #SCROLL 3.83333
-,
+0,
 #SCROLL 3.66667
-,
+0,
 #SCROLL 3.5
-,
+0,
 #SCROLL 3.33333
-,
+0,
 #SCROLL 3.16667
-,
+0,
 #SCROLL 3
-,
+0,
 #SCROLL 2.83333
-,
+0,
 #SCROLL 2.66667
-,
+0,
 #SCROLL 2.5
-,
+0,
 #SCROLL 2.33333
-,
+0,
 #SCROLL 2.16667
-,
+0,
 #SCROLL 2
-,
+0,
 #SCROLL 1.83333
-,
+0,
 #SCROLL 1.66667
-,
+0,
 #SCROLL 1.5
-,
+0,
 #SCROLL 1.33333
-,
+0,
 #SCROLL 1.16667
-,
+0,
 #MEASURE 4/4
 #SCROLL 1
 2210212122102122,
@@ -352,6 +328,7 @@ NOTESDESIGNER3:Colin
 33333333,
 60000008,
 7008700870083000,
+#GOGOSTART
 1010212030303000,
 33303330,
 1010212030303000,
@@ -369,6 +346,7 @@ NOTESDESIGNER3:Colin
 1011200010221210,
 303030303030,
 #MEASURE 24/4
+#GOGOEND
 300000,
 #MEASURE 4/4
 2002002011112212,
@@ -416,30 +394,29 @@ LEVEL:6
 BALLOON:3,2,1
 SCOREINIT:
 SCOREDIFF:
-NOTESDESIGNER2:Colin
-
+NOTESDESIGNER2:Colin & Komi
 
 #START
 #MEASURE 32/4
 30000000,
 #MEASURE 4/4
 #GOGOSTART
-1010200010001011,
-1010202220102022,
+11201111,
+21201122,
 10210120,
-1010002020202011,
+11210120,
 1010200010001011,
-1010202220102022,
+11201122,
 10210120,
-1010002020202011,
-1010200010001011,
-1010202220102022,
+11221122,
+11201111,
+21201122,
 10210120,
-1010002020202011,
+11210120,
 1010200010001011,
-1010202220102022,
-11211121,
-11022221,
+11201122,
+10210120,
+1010201110201010,
 #GOGOEND
 3333,
 3333,
@@ -448,43 +425,45 @@ NOTESDESIGNER2:Colin
 33333333,
 33333333,
 60000008,
-7008700870083000,
-10206008,
-60086008,
-1010222060000080,
-6000008010202220,
-1010222060000080,
-6000008010202220,
-1010222060000080,
-6000008010202220,
-1250,
-00000008,
-1102200050000000,
-00000008,
-1022200050000000,
-00000008,
-1022200050000000,
-0000000000000008,
+78787830,
+#GOGOSTART
+10202220,
+22202220,
+1022200020202000,
+22201220,
+1010222020202000,
+2020200010202220,
+11202220,
+2020200010202220,
+100200202020,
+202020600080,
+1100202010002020,
+202020202020,
+100200202020,
+202020600080,
+1022200010222000,
+202020101010,
 #MEASURE 32/4
-00000000,
+#GOGOEND
+10000000,
 #MEASURE 4/4
 #GOGOSTART
-1010200010001011,
-1010202220102022,
-10210120,
-1010002020202011,
-1010200010001011,
-1010202220102022,
-10210120,
-1010002020202011,
-1010200010001011,
-1010202220102022,
-10210120,
-1010002020202011,
-1010200010001011,
-1010202220102022,
-11211121,
-11022221,
+1011101020020010,
+0010000110102000,
+1011102020020020,
+02121020,
+1011101020020010,
+0010000110102010,
+1020201010010020,
+02011222,
+1110201000201010,
+1110201000201010,
+1110201000201010,
+1110101011101010,
+2001102000201000,
+2020102011101020,
+1010201010010020,
+0020002220102000,
 #GOGOEND
 1000101020010010,
 01000000,
@@ -507,33 +486,32 @@ NOTESDESIGNER2:Colin
 #END
 
 COURSE:Normal
-LEVEL:2
+LEVEL:4
 SCOREINIT:
 SCOREDIFF:
-NOTESDESIGNER1:Colin
-
+NOTESDESIGNER1:Colin & Komi
 
 #START
 #MEASURE 32/4
 30000000,
 #MEASURE 4/4
 #GOGOSTART
-1110,
-1110,
-1210,
-1110,
-1210,
-1210,
-1110,
-2220,
-1110,
-1110,
-1211,
-1110,
-1210,
-1210,
+10201110,
+10201110,
 1010,
-1111,
+1010,
+10201110,
+10201110,
+1010,
+20020020,
+10201110,
+10201110,
+1212,
+1212,
+10201110,
+10201110,
+1212,
+10101011,
 #GOGOEND
 3030,
 3030,
@@ -543,42 +521,44 @@ NOTESDESIGNER1:Colin
 3333,
 6,
 0008,
+#GOGOSTART
+20001110,
+11101010,
+20001110,
+11101010,
+20001110,
+11101010,
+20001110,
+11102000,
+2010,
+10001110,
+2010,
 1010,
-1,
-1010,
-1,
-1010,
-1,
-1020,
-1,
+1210,
+10001110,
 2020,
-2,
-2020,
-2,
-2220,
-2220,
-2020,
-2,
+1011,
 #MEASURE 32/4
+#GOGOEND
 20000000,
 #MEASURE 4/4
 #GOGOSTART
-1110,
-1110,
-1210,
-1110,
-1210,
-1210,
-1110,
-2220,
-1110,
-1110,
-1211,
-1110,
-1210,
-1210,
-1010,
-1120,
+10201110,
+10101110,
+10201110,
+10101110,
+10201110,
+10101110,
+10201110,
+2222,
+20111010,
+20111010,
+20111010,
+1111,
+2101,
+20102220,
+1212,
+10102220,
 #GOGOEND
 2,
 2220,
@@ -596,14 +576,12 @@ NOTESDESIGNER1:Colin
 2,
 2020,
 2,
-0500,
-08000000,
+00222002,
+02000000,
 #END
 
-
 COURSE:Easy
 LEVEL:2
-BALLOON:
 SCOREINIT:
 SCOREDIFF:
 NOTESDESIGNER0:Colin
@@ -638,6 +616,7 @@ NOTESDESIGNER0:Colin
 3030,
 6,
 0008,
+#GOGOSTART
 1,
 1,
 1,
@@ -655,6 +634,7 @@ NOTESDESIGNER0:Colin
 2020,
 2,
 #MEASURE 32/4
+#GOGOEND
 20000000,
 #MEASURE 4/4
 #GOGOSTART
@@ -691,13 +671,6 @@ NOTESDESIGNER0:Colin
 2,
 2020,
 2,
-0500,
-08000000,
+,
+02000000,
 #END
-
-
-
-
-
-
-