diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua
index b1f980d4..5f74a2c4 100644
--- a/parts/eventsets/classic_e.lua
+++ b/parts/eventsets/classic_e.lua
@@ -63,12 +63,12 @@ return{
         local D=P.modeData
         D.drought=P.lastPiece.id==7 and 0 or D.drought+1
         if P.stat.row>=D.target then
-            if D.target>=100 then 
+            if D.target>=100 then
                 D.lvl=D.lvl+1
             end
             local dropSpd=GetGravity(D.lvl)
-            if D.target==200 then P.win('finish') return
-            elseif dropSpd~=P.gameEnv.drop then 
+            if D.target==200 then P:win('finish') return
+            elseif dropSpd~=P.gameEnv.drop then
                 P.gameEnv.drop,P.gameEnv.lock=dropSpd,dropSpd
                 P.gameEnv.sddas,P.gameEnv.sdarr=dropSpd,dropSpd
                 SFX.play('warn_2',.7)
diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua
index 1ef87eca..ece855a7 100644
--- a/parts/eventsets/classic_h.lua
+++ b/parts/eventsets/classic_h.lua
@@ -63,12 +63,12 @@ return{
         local D=P.modeData
         D.drought=P.lastPiece.id==7 and 0 or D.drought+1
         if P.stat.row>=D.target then
-            if D.target>=100 then 
+            if D.target>=100 then
                 D.lvl=D.lvl+1
             end
             local dropSpd=GetGravity(D.lvl)
-            if D.target==200 then P.win('finish') return
-            elseif dropSpd~=P.gameEnv.drop then 
+            if D.target==200 then P:win('finish') return
+            elseif dropSpd~=P.gameEnv.drop then
                 P.gameEnv.drop,P.gameEnv.lock=dropSpd,dropSpd
                 P.gameEnv.sddas,P.gameEnv.sdarr=dropSpd,dropSpd
                 SFX.play('warn_1')
diff --git a/parts/eventsets/classic_l.lua b/parts/eventsets/classic_l.lua
index 8562a0d9..885405ab 100644
--- a/parts/eventsets/classic_l.lua
+++ b/parts/eventsets/classic_l.lua
@@ -67,7 +67,7 @@ return{
                 D.lvl=D.lvl+1
             --end
             local dropSpd=GetGravity(D.lvl)
-            if dropSpd~=P.gameEnv.drop then 
+            if dropSpd~=P.gameEnv.drop then
                 P.gameEnv.drop,P.gameEnv.lock=dropSpd,dropSpd
                 P.gameEnv.sddas,P.gameEnv.sdarr=dropSpd,dropSpd
                 SFX.play('warn_1')
diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua
index 6cc9095f..205da78b 100644
--- a/parts/eventsets/classic_u.lua
+++ b/parts/eventsets/classic_u.lua
@@ -62,8 +62,8 @@ return{
     hook_drop=function(P)
         local D=P.modeData
         D.drought=P.lastPiece.id==7 and 0 or D.drought+1
-        if P.stat.row>=D.target then 
-            if D.target>=200 then P.win('finish') return end
+        if P.stat.row>=D.target then
+            if D.target>=200 then P:win('finish') return end
             SFX.play('reach')
             D.lvl=D.lvl+1
             D.target=D.target+10
diff --git a/parts/eventsets/master_instinct.lua b/parts/eventsets/master_instinct.lua
index 8338a1c7..5a42febb 100644
--- a/parts/eventsets/master_instinct.lua
+++ b/parts/eventsets/master_instinct.lua
@@ -20,7 +20,7 @@ return{
         local D=P.modeData
 
         local c=#P.clearedRow
-        if c==0 and D.pt%100==99 then 
+        if c==0 and D.pt%100==99 then
             if D.pt<1000 then
                 hidetimer=0-inv_wait[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]
                 if c>0 then hidetimer=hidetimer-inv_fall[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]end
diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua
index ebf2e4bf..1a9d5bfe 100644
--- a/parts/language/lang_ja.lua
+++ b/parts/language/lang_ja.lua
@@ -96,7 +96,7 @@ return{
 
     noScore="スコア無し",
     modeLocked="ロック",
-    unlockHint="ランクB以上を取得すると解放されるよ!", 
+    unlockHint="ランクB以上を取得すると解放されるよ!",
     highScore="最高得点",
     newRecord="新記録!",
 
diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua
index 8fc6c077..0ce0088a 100644
--- a/parts/language/lang_zh_trad.lua
+++ b/parts/language/lang_zh_trad.lua
@@ -778,7 +778,7 @@ return{
         ['dig_eff_10l']=    {"挖掘",        "效率 10L", "挖掘10行用最少的件數"},
         ['dig_eff_40l']=    {"挖掘",        "效率 40L", "挖掘40行用最少的件數"},
         ['dig_eff_100l']=   {"挖掘",        "效率 100L","挖掘100行用最少的件數"},
-        ['dig_eff_400l']=   {"挖掘",        "效率 400L","挖掘400行用最少的件數"}, 
+        ['dig_eff_400l']=   {"挖掘",        "效率 400L","挖掘400行用最少的件數"},
         ['drought_n']=      {"乾旱",        "100L",     "你I沒了"},
         ['drought_l']=      {"乾旱+",       "100L",     "後 媽 發 牌"},
         ['marathon_n']=     {"馬拉松",       "普通",      "200行加速馬拉松"},
diff --git a/parts/modes.lua b/parts/modes.lua
index 338e5eb6..af00e59c 100644
--- a/parts/modes.lua
+++ b/parts/modes.lua
@@ -9,7 +9,7 @@ return{
     {name='sprintPenta',   x=180,       y=-160,     size=40,shape=3,icon="sprint_pento"},
     {name='sprintMPH',     x=220,       y=-300,     size=40,shape=3,icon="sprint2"},
     {name='sprint123',     x=180,       y=-440,     size=40,shape=1,icon="sprint_tri"},
-    
+
     {name='secret_grade',  x=-200,      y=-400,     size=40,shape=1,icon="secret_grade"},
 
     {name='drought_n',     x=-600,      y=400,      size=40,shape=1,icon="drought",     unlock={'drought_l'}},
@@ -19,7 +19,7 @@ return{
     {name='dig_40l',       x=-400,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_100l'}},
     {name='dig_100l',      x=-600,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_400l'}},
     {name='dig_400l',      x=-800,      y=-200,     size=40,shape=1,icon="dig_sprint"},
-    
+
     {name='dig_eff_10l',   x=-400,      y=0,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_eff_40l'}},
     {name='dig_eff_40l',   x=-600,      y=0,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_eff_100l'}},
     {name='dig_eff_100l',  x=-800,      y=0,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_eff_400l'}},