diff --git a/index.html b/index.html
index a28a7a7..ebf75bb 100755
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport"
-        content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no, width=device-width"/>
+        content="initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0, width=device-width"/>
   <title>Tetr.js</title>
   <link rel="stylesheet" href="style.css">
   <!--<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-554c83a8661bf358" async="async"></script>-->
@@ -64,7 +64,7 @@ <h3>Hold</h3>
     </div>
 
     <nav class="menu on">
-      <h1>Tetr.js - Dig v0.56</h1>
+      <h1>Tetr.js - Dig v0.58</h1>
 
       <p>forked from: <a class="link" href="http://simon.lc/tetr.js/">&gt;&gt;simonlc</a><br/>
         farter's Dig Mod</p>
@@ -77,9 +77,9 @@ <h1>Tetr.js - Dig v0.56</h1>
         <a class="btn" onclick="init(4,{digraceType:'easy'})"><i class="material-icons">&#xE91D;</i> Dig Race 挖掘练习</a>
         <a class="btn" onclick="init(5)"><i class="material-icons">&#xE2C3;</i> Zen 修仙模式</a>
 
-        <a class="btn" onclick="menu(6,1)"><i class="material-icons">&#xE04A;</i> Replay 录像回放</a>
         <a class="btn" onclick="menu(2)" id="btnbinds"><i class="material-icons">&#xE021;</i> Controls 调整按键</a>
         <a class="btn" onclick="menu(1)"><i class="material-icons">&#xE869;</i> Settings 调整设定</a>
+        <a class="btn" onclick="menu(6,1)"><i class="material-icons">&#xE04A;</i> Replay 录像回放</a>
         <a class="btn highlight" onclick="menu(7,1);this.classList.remove('highlight')"><i class="material-icons">&#xE8E5;</i> Harder 更厉害的</a>
       </div>
     </nav>
@@ -153,7 +153,7 @@ <h2>Controls 调整按键</h2>
     <nav id="go" class="menu">
       <div class="btn-container btn-container-bottom">
         <a class="btn" onclick="init(gametype,gameparams)">Retry 再来</a>
-        <a class="btn btn-inline" onclick="init('replay')" style="width: 50%;">Replay 回放 </a><a class="btn btn-inline" onclick="showreplaydata()" style="width: calc(25% - .7rem); margin-left: .7rem"><i class="material-icons">&#xE161;</i></a>
+        <a class="btn btn-inline" onclick="init('replay')" style="width: 50%;">Replay 回放 </a><a class="btn btn-inline" onclick="showreplaydata(curreplaydata())" style="width: calc(25% - .7rem); margin-left: .7rem"><i class="material-icons">&#xE161;</i></a>
         <a class="btn highlight" onclick="menu(5,1);this.classList.remove('highlight')">Rankings 排行</a>
         <a class="btn" onclick="menu(0)">Back 回菜单</a>
       </div>
@@ -196,9 +196,11 @@ <h1>Tetr.js - Dig</h1>
         <a class="btn" onclick="init(4,{digraceType:'checker'})"><i class="material-icons">&#xE540;</i> Dig Hard 疯狂挖掘</a>
         <a class="btn" onclick="init(6)"><i class="material-icons">&#xE01F;</i> 20G 瞬降模式</a>
         <a class="btn" onclick="init(7)"><i class="material-icons">&#xE034;</i> Dig Zen 沉思挖掘</a>
-        <a class="btn" onclick="init(0,{pieceSet:1})"><i class="material-icons"></i> Sprnt 困难40行</a>
-        <a class="btn" onclick="init(0,{pieceSet:2})"><i class="material-icons"></i> i 简单40行</a>
-        
+        <a class="btn" onclick="init(0,{pieceSet:1})"><i class="material-icons"></i> Spr_nt 困难40行</a>
+        <a class="btn" onclick="init(0,{pieceSet:2})"><i class="material-icons"></i> Heaven 简单40行</a>
+        <a class="btn" onclick="init(0,{backFire:1})"><i class="material-icons"></i> Backfire 自攻自受</a>
+        <a class="btn" onclick="init(0,{backFire:2})"><i class="material-icons"></i> Backfire2 自攻自受2</a>
+        <a class="btn" onclick="init(0,{backFire:3})"><i class="material-icons"></i> Backfire3 自攻自受3</a>
         
         <a class="btn" onclick="menu(void 0,-1)">Back 返回</a>
       </div>
@@ -227,8 +229,5 @@ <h3>Next</h3>
 <script type="text/javascript" src="sound.js"></script>
 <script type="text/javascript" src="touch.js"></script>
 
-<!--
-<script>_gaq=[['_setAccount','UA-30472693-1'],['_trackPageview']];(function(d){var g=d.createElement('script'),s=d.scripts[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)})(document)</script>
--->
 </body>
 </html>
\ No newline at end of file
diff --git a/menu.js b/menu.js
index 59cb80b..91ca820 100644
--- a/menu.js
+++ b/menu.js
@@ -4,105 +4,105 @@ var arrowReleased = true;
 var arrowDelay    = 0;
 
 var key = {
-    8:   'Backspace',
-    9:   'Tab',
-    13:  'Enter',
-    16:  'Shift',
-    17:  'Ctrl',
-    18:  'Alt',
-    19:  'Pause',
-    20:  'Caps Lock',
-    27:  'Esc',
-    32:  'Space',
-    33:  'PgUp',
-    34:  'PgDn',
-    35:  'End',
-    36:  'Home',
-    37:  '←',
-    38:  '↑',
-    39:  '→',
-    40:  '↓',
-    45:  'Insert',
-    46:  'Delete',
-    48:  '0',
-    49:  '1',
-    50:  '2',
-    51:  '3',
-    52:  '4',
-    53:  '5',
-    54:  '6',
-    55:  '7',
-    56:  '8',
-    57:  '9',
-    59:  ';',
-    61:  '=',
-    65:  'A',
-    66:  'B',
-    67:  'C',
-    68:  'D',
-    69:  'E',
-    70:  'F',
-    71:  'G',
-    72:  'H',
-    73:  'I',
-    74:  'J',
-    75:  'K',
-    76:  'L',
-    77:  'M',
-    78:  'N',
-    79:  'O',
-    80:  'P',
-    81:  'Q',
-    82:  'R',
-    83:  'S',
-    84:  'T',
-    85:  'U',
-    86:  'V',
-    87:  'W',
-    88:  'X',
-    89:  'Y',
-    90:  'Z',
-    96:  '0kpad',
-    97:  '1kpad',
-    98:  '2kpad',
-    99:  '3kpad',
-    100: '4kpad',
-    101: '5kpad',
-    102: '6kpad',
-    103: '7kpad',
-    104: '8kpad',
-    105: '9kpad',
-    106: '*',
-    107: '+',
-    109: '-',
-    110: '.',
-    111: '/',
-    112: 'F1',
-    113: 'F2',
-    114: 'F3',
-    115: 'F4',
-    116: 'F5',
-    117: 'F6',
-    118: 'F7',
-    119: 'F8',
-    120: 'F9',
-    121: 'F10',
-    122: 'F11',
-    123: 'F12',
-    173: '-',
-    186: ';',
-    187: '=',
-    188: ',',
-    189: '-',
-    190: '.',
-    191: '/',
-    192: '`',
-    219: '[',
-    220: '\\',
-    221: ']',
-    222: "'",
-    undefined: "---",
-    0: "---"
+  8:   'Backspace',
+  9:   'Tab',
+  13:  'Enter',
+  16:  'Shift',
+  17:  'Ctrl',
+  18:  'Alt',
+  19:  'Pause',
+  20:  'Caps Lock',
+  27:  'Esc',
+  32:  'Space',
+  33:  'PgUp',
+  34:  'PgDn',
+  35:  'End',
+  36:  'Home',
+  37:  '←',
+  38:  '↑',
+  39:  '→',
+  40:  '↓',
+  45:  'Insert',
+  46:  'Delete',
+  48:  '0',
+  49:  '1',
+  50:  '2',
+  51:  '3',
+  52:  '4',
+  53:  '5',
+  54:  '6',
+  55:  '7',
+  56:  '8',
+  57:  '9',
+  59:  ';',
+  61:  '=',
+  65:  'A',
+  66:  'B',
+  67:  'C',
+  68:  'D',
+  69:  'E',
+  70:  'F',
+  71:  'G',
+  72:  'H',
+  73:  'I',
+  74:  'J',
+  75:  'K',
+  76:  'L',
+  77:  'M',
+  78:  'N',
+  79:  'O',
+  80:  'P',
+  81:  'Q',
+  82:  'R',
+  83:  'S',
+  84:  'T',
+  85:  'U',
+  86:  'V',
+  87:  'W',
+  88:  'X',
+  89:  'Y',
+  90:  'Z',
+  96:  '0kpad',
+  97:  '1kpad',
+  98:  '2kpad',
+  99:  '3kpad',
+  100: '4kpad',
+  101: '5kpad',
+  102: '6kpad',
+  103: '7kpad',
+  104: '8kpad',
+  105: '9kpad',
+  106: '*',
+  107: '+',
+  109: '-',
+  110: '.',
+  111: '/',
+  112: 'F1',
+  113: 'F2',
+  114: 'F3',
+  115: 'F4',
+  116: 'F5',
+  117: 'F6',
+  118: 'F7',
+  119: 'F8',
+  120: 'F9',
+  121: 'F10',
+  122: 'F11',
+  123: 'F12',
+  173: '-',
+  186: ';',
+  187: '=',
+  188: ',',
+  189: '-',
+  190: '.',
+  191: '/',
+  192: '`',
+  219: '[',
+  220: '\\',
+  221: ']',
+  222: "'",
+  undefined: "---",
+  0: "---"
 };
 
 /**
@@ -111,30 +111,30 @@ var key = {
 var menus     = document.getElementsByClassName('menu');
 var menuStack = [];
 function menu(menuIndex, stackOper) {
-    var current = void 0;
-    for (var i = 0, len = menus.length; i < len; i++) {
-        if (menus[i].classList.contains('on')) {
-            current = i;
-        }
-        menus[i].classList.remove('on');
+  var current = void 0;
+  for (var i = 0, len = menus.length; i < len; i++) {
+    if (menus[i].classList.contains('on')) {
+      current = i;
     }
+    menus[i].classList.remove('on');
+  }
 
-    if (menuIndex !== void 0) {
-        menus[menuIndex].classList.add('on');
-    }
+  if (menuIndex !== void 0) {
+    menus[menuIndex].classList.add('on');
+  }
 
-    if (stackOper === 1) {
-        if (current !== void 0) {
-            menuStack.push(current);
-        }
-    } else if (stackOper === -1) {
-        current = menuStack.pop();
-        if ((current !== void 0) && (menuIndex === void 0)) {
-            menus[current].classList.add('on');
-        }
-    } else if (stackOper !== 0) {
-        menuStack = [];
+  if (stackOper === 1) {
+    if (current !== void 0) {
+      menuStack.push(current);
+    }
+  } else if (stackOper === -1) {
+    current = menuStack.pop();
+    if ((current !== void 0) && (menuIndex === void 0)) {
+      menus[current].classList.add('on');
     }
+  } else if (stackOper !== 0) {
+    menuStack = [];
+  }
 }
 
 /**
@@ -143,166 +143,170 @@ function menu(menuIndex, stackOper) {
 var newKey, currCell, tempKey, controls = document.getElementById('controls'), controlCells = controls.getElementsByTagName('td');
 // Give controls an event listener.
 for (var i = 0, len = controlCells.length; i < len; i++) {
-    controlCells[i].onclick = function () {
-        // First check if we're already waiting for an input.
-        if (currCell) {
-            // TODO DRY
-            // Make this into a function and call it when we press Esc.
-            binds[currCell.id] = tempKey;
-            $setText(currCell, key[tempKey] || tempKey);
-        }
-        tempKey        = binds[this.id];
-        $setText(this, 'Press key');
-        currCell       = this;
+  controlCells[i].onclick = function () {
+    // First check if we're already waiting for an input.
+    if (currCell) {
+      // TODO DRY
+      // Make this into a function and call it when we press Esc.
+      binds[currCell.id] = tempKey;
+      $setText(currCell, key[tempKey] || tempKey);
     }
+    tempKey        = binds[this.id];
+    $setText(this, 'Press key');
+    currCell       = this;
+  }
 }
 // Listen for key input if a control has been clicked on.
 addEventListener('keyup', function (e) {
-    // if click outside of cell or press esc clear currCell
-    // reset binds button.
-    if (currCell) {
-				var newKey=e.keyCode;
-				if(newKey===8){
-						newKey=void 0;
-				}
-        // Checks if key already in use, and unbinds it.
-        if(newKey){
-						for (var i in binds) {
-								if (newKey === binds[i]) {
-										binds[i] = void 0;
-										$setText($$(i), key[void 0]);
-								}
-						}
-				}
-        // Binds the key and saves the data.
-        binds[currCell.id] = newKey;
-        $setText(currCell, key[newKey] || newKey);
-        localStorage.setItem('binds', JSON.stringify(binds));
-        currCell           = 0;
+  // if click outside of cell or press esc clear currCell
+  // reset binds button.
+  if (currCell) {
+    var newKey=e.keyCode;
+    if(newKey===8){
+      newKey=void 0;
     }
+    // Checks if key already in use, and unbinds it.
+    if(newKey){
+      for (var i in binds) {
+        if (newKey === binds[i]) {
+          binds[i] = void 0;
+          $setText($$(i), key[void 0]);
+        }
+      }
+    }
+    // Binds the key and saves the data.
+    binds[currCell.id] = newKey;
+    $setText(currCell, key[newKey] || newKey);
+    localStorage.setItem('binds', JSON.stringify(binds));
+    currCell           = 0;
+  }
 }, false);
 
 /**
  * Settings Menu
  */
 function settingsLoop() {
-    if (arrowReleased || arrowDelay >= 6) {
-        if (settingsArrow) {
-            mySettings[s] = (mySettings[s] === 0) ? setting[s].length - 1 : mySettings[s] - 1;
-        } else {
-            mySettings[s] = (mySettings[s] === setting[s].length - 1) ? 0 : mySettings[s] + 1;
-        }
-        saveSetting(s);
-        arrowReleased = false;
+  if (arrowReleased || arrowDelay >= 6) {
+    if (settingsArrow) {
+      mySettings[s] = (mySettings[s] === 0) ? setting[s].length - 1 : mySettings[s] - 1;
     } else {
-        arrowDelay++;
+      mySettings[s] = (mySettings[s] === setting[s].length - 1) ? 0 : mySettings[s] + 1;
     }
-    setLoop = setTimeout(settingsLoop, 50);
+    saveSetting(s);
+    arrowReleased = false;
+  } else {
+    arrowDelay++;
+  }
+  setLoop = setTimeout(settingsLoop, 50);
 }
 var s;
 var settingsArrow;
 // TODO DRY this.
 function arrowRelease(e) {
-    resize();
-    arrowReleased = true;
-    arrowDelay    = 0;
-    clearTimeout(setLoop);
-    if (e && e.preventDefault) {
-        e.preventDefault();
-    } //avoid selection by touch
+  resize();
+  arrowReleased = true;
+  arrowDelay    = 0;
+  clearTimeout(setLoop);
+  this.onmouseup     = void 0;
+  this.onmouseout    = void 0;
+  this.ontouchend    = void 0;
+  this.ontouchcancel = void 0;
+  if (e && e.preventDefault) {
+    e.preventDefault();
+  } //avoid selection by touch
 }
 function left(e) {
-    settingsArrow      = 1;
-    s                  = this.parentNode.id;
-    this.onmouseup     = arrowRelease;
-    this.onmouseout    = arrowRelease;
-    this.ontouchend    = arrowRelease;
-    this.ontouchcancel = arrowRelease;
-    if (e && e.preventDefault) {
-        e.preventDefault();
-    } //avoid selection by touch
-    settingsLoop();
+  settingsArrow      = 1;
+  s                  = this.parentNode.id;
+  this.onmouseup     = arrowRelease;
+  this.onmouseout    = arrowRelease;
+  this.ontouchend    = arrowRelease;
+  this.ontouchcancel = arrowRelease;
+  if (e && e.preventDefault) {
+    e.preventDefault();
+  } //avoid selection by touch
+  settingsLoop();
 }
 function right(e) {
-    settingsArrow      = 0;
-    s                  = this.parentNode.id;
-    this.onmouseup     = arrowRelease;
-    this.onmouseout    = arrowRelease;
-    this.ontouchend    = arrowRelease;
-    this.ontouchcancel = arrowRelease;
-    if (e && e.preventDefault) {
-        e.preventDefault();
-    } //avoid selection by touch
-    settingsLoop();
+  settingsArrow      = 0;
+  s                  = this.parentNode.id;
+  this.onmouseup     = arrowRelease;
+  this.onmouseout    = arrowRelease;
+  this.ontouchend    = arrowRelease;
+  this.ontouchcancel = arrowRelease;
+  if (e && e.preventDefault) {
+    e.preventDefault();
+  } //avoid selection by touch
+  settingsLoop();
 }
 
 /**
  * LocalStorage functions
  */
 function saveSetting(s) {
-    if (localStorage === void 0) {
-        localStorage = {};
-    }
-    localStorage['version'] = version;
+  if (localStorage === void 0) {
+    localStorage = {};
+  }
+  localStorage['version'] = version;
 
-    $setText($$(s).getElementsByTagName('span')[0], setting[s][mySettings[s]]);
+  $setText($$(s).getElementsByTagName('span')[0], setting[s][mySettings[s]]);
 
-    localStorage['settings'] = JSON.stringify(mySettings);
+  localStorage['settings'] = JSON.stringify(mySettings);
 }
 function loadLocalData() {
-    if (localStorage === void 0) {
-        localStorage = {};
-    }
-    if (localStorage['binds']) {
-        binds = JSON.parse(localStorage.getItem('binds'));
-        for (var i = 0, len = controlCells.length; i < len; i++) {
-						var keycode=binds[controlCells[i].id];
-            $setText(controlCells[i], key[keycode] || keycode);
-        }
-    }else{
-				$$("btnbinds").classList.add("highlight");
-    }
-    // TODO When new version just update with new stuff, rest stays unchanged.
-    if (localStorage['version'] !== version) {
-        localStorage.removeItem('settings');
-        localStorage.removeItem('binds');
+  if (localStorage === void 0) {
+    localStorage = {};
+  }
+  if (localStorage['binds']) {
+    binds = JSON.parse(localStorage.getItem('binds'));
+    for (var i = 0, len = controlCells.length; i < len; i++) {
+      var keycode=binds[controlCells[i].id];
+      $setText(controlCells[i], key[keycode] || keycode);
     }
-    if (localStorage['settings']) {
-        var storedSettings = JSON.parse(localStorage.getItem('settings'));
-        for (var i in mySettings) {
-            if (i in storedSettings) {
-                mySettings[i] = storedSettings[i];
-            }
-        }
+  }else{
+    $$("btnbinds").classList.add("highlight");
+  }
+  // TODO When new version just update with new stuff, rest stays unchanged.
+  if (localStorage['version'] !== version) {
+    localStorage.removeItem('settings');
+    localStorage.removeItem('binds');
+  }
+  if (localStorage['settings']) {
+    var storedSettings = JSON.parse(localStorage.getItem('settings'));
+    for (var i in mySettings) {
+      if (i in storedSettings) {
+        mySettings[i] = storedSettings[i];
+      }
     }
+  }
 
 }
 
 loadLocalData();
 for (var s in mySettings) {
-    if (mySettings.hasOwnProperty(s)) {
-        var div    = document.createElement('div');
-        var sname  = document.createElement('b');
-        var iLeft  = document.createElement('i');
-        var span   = document.createElement('span');
-        var iRight = document.createElement('i');
+  if (mySettings.hasOwnProperty(s)) {
+    var div    = document.createElement('div');
+    var sname  = document.createElement('b');
+    var iLeft  = document.createElement('i');
+    var span   = document.createElement('span');
+    var iRight = document.createElement('i');
 
-        div.id              = s;
-        $setText(sname, settingName[s]);
-        $setText(span, setting[s][mySettings[s]]);
-        iLeft.className     = 'material-icons left';
-        iRight.className    = 'material-icons right';
-        $setText(iLeft, "\uE314");
-        $setText(iRight, "\uE315");
-        iLeft.onmousedown   = left;
-        iLeft.ontouchstart  = left;
-        iRight.onmousedown  = right;
-        iRight.ontouchstart = right;
+    div.id              = s;
+    $setText(sname, settingName[s]);
+    $setText(span, setting[s][mySettings[s]]);
+    iLeft.className     = 'material-icons left';
+    iRight.className    = 'material-icons right';
+    $setText(iLeft, "\uE314");
+    $setText(iRight, "\uE315");
+    iLeft.onmousedown   = left;
+    iLeft.ontouchstart  = left;
+    iRight.onmousedown  = right;
+    iRight.ontouchstart = right;
 
-        set.appendChild(div);
-        div.appendChild(sname);
-        div.appendChild(iLeft);
-        div.appendChild(span);
-        div.appendChild(iRight);
-    }
+    set.appendChild(div);
+    div.appendChild(sname);
+    div.appendChild(iLeft);
+    div.appendChild(span);
+    div.appendChild(iRight);
+  }
 }
\ No newline at end of file
diff --git a/piece.js b/piece.js
index 053a4c7..7715803 100644
--- a/piece.js
+++ b/piece.js
@@ -61,13 +61,6 @@ Piece.prototype.new = function(index) {
   } else {
     this.tetro = pieces[index].tetro[this.pos];
   }
-  
-  // TODO ---------------- snip
-
-  //TODO Do this better. (make grabbag object)
-  // Preview.next(); == grabbag.next()
-  // Preview.draw();
-  //preview.next();
 
   this.lockDelayLimit = setting['Lock Delay'][settings['Lock Delay']];
   if (gametype === 6) { //Death
@@ -77,19 +70,12 @@ Piece.prototype.new = function(index) {
         30, 25, 22, 20, 20, 18, 17, 17, 15, 15,
         13, 13, 13, 13, 13, 12, 12, 12, 11, 11
       ][level];
-      this.areLimit = [
-        18, 18, 18, 15, 15, 12, 12, 12, 12, 12,
-        12, 12, 10, 10, 10,  8,  8,  8,  8,  8
-      ][level];
     } else {
       this.lockDelayLimit = 11;
-      this.areLimit = 6;
     }
   } else if (settings.Gravity !== 0) {
-    this.areLimit = 0;
     this.gravity = gravityArr[settings.Gravity - 1];
   } else if (gametype === 1) { //Marathon
-    this.areLimit = 0;
     if (level < 20) {
       this.gravity = [
         1/60, 1/30, 1/25, 1/20, 1/15, 1/12, 1/10, 1/8,  1/6,  1/6,
@@ -101,7 +87,6 @@ Piece.prototype.new = function(index) {
        this.lockDelayLimit = ~~(30 * Math.pow(0.93, (Math.pow(level-20, 0.8)))); // magic!
     }
   } else {
-    this.areLimit = 0;
     this.gravity = gravityUnit;
   }
   if (gametype === 0){
@@ -120,18 +105,19 @@ Piece.prototype.new = function(index) {
     return;
   }
   
-  //real 20G !
+  //real 20G
   if(this.gravity >= 20) {
     this.checkFall();
   }
   if (flags.moveDown & keysDown) {
     var grav = gravityArr[settings['Soft Drop'] + 1];
-    if (grav >= 20) // 20G softdrop vs. 20G das
+    if (grav >= 20) // 20G softdrop = 20G gravity
       this.y += this.getDrop(grav);
     //piece.finesse++;
   }
   landed = !this.moveValid(0, 1, this.tetro);
   
+  // die-in-one-frame!
   if(landed && (this.lockDelay >= this.lockDelayLimit)) {
     this.checkLock();
   }
@@ -165,7 +151,7 @@ Piece.prototype.rotate = function(direction) {
   var offsetY =
     RotSys[settings.RotSys].offset[this.index][newPos][1] -
     RotSys[settings.RotSys].offset[this.index][curPos][1];
-  if (settings.RotSys === 2) { //ARS
+  if (settings.RotSys === 2 || settings.RotSys === 14) { //ARS, Plus
     var kickList = [];
     if (this.index === PieceI.index) {
       if(curPos === 1 || curPos === 3)
@@ -188,6 +174,8 @@ Piece.prototype.rotate = function(direction) {
       kickList = WKTableSRS[this.index][kickIndex][curPos];
     else if (settings.RotSys === 1)
       kickList = WKTableCultris;
+    else if (settings.RotSys === 15)
+      kickList = WKTableDX[kickIndex][curPos]
     else
       kickList = WKTableDRS[kickIndex];
     this.tryKickList(kickList, rotated, newPos, offsetX, offsetY);
@@ -238,6 +226,11 @@ Piece.prototype.checkShift = function() {
   // Handle events
   /* farter */
   // here problem causes it taking 2 frames to move 1 grid even ARR=1
+  var dascut = [false,true][(settings.DASCut || 0)]
+  //if (dascut) {
+  //  this.ShiftDir = 0;
+  //  console.log("interrupt")
+  //}
   if (this.shiftDir) {
     // 1. When key pressed instantly move over once.
     if (this.shiftReleased && settings.DAS !== 0) {
@@ -249,9 +242,11 @@ Piece.prototype.checkShift = function() {
       this.shiftDelay++;
     // 3. Once the delay is complete, move over once.
     //     Increment delay so this doesn't run again.
+    // if arr=0, repeat here, not entering 4
+    // but if dascut, let shiftdelay == das + 1 and arrdelay = 0 which is not < arr
     } else if (this.shiftDelay === settings.DAS) {
       this.shift(this.shiftDir);
-      if (settings.ARR !== 0) this.shiftDelay++;
+      if (settings.ARR !== 0 || dascut) this.shiftDelay++;
     // 4. Apply ARR delay
     } else if (this.arrDelay < settings.ARR) {
       this.arrDelay++;
@@ -388,25 +383,45 @@ Piece.prototype.checkLock = function() {
   if (landed) {
     this.y = Math.floor(this.y); //@sega
     if (this.lockDelay >= this.lockDelayLimit) {
+      this.dead = true;
       stack.addPiece(this.tetro);
       sound.playse("lock");
-      this.dead = true;
       this.dirty = true;
       if(gameState === 9){ // lockout! don't spawn next piece
-				return;
+        return;
       }else{
-				this.held = false;
-				if (this.areLimit === 0) {
-					this.new(preview.next()); // consider move to main update
-				} else {
-					gameState = 4;
-					this.are = 0;
-				}
-			}
+        this.held = false;
+        /* farter */
+        // Win?
+        checkWin();
+        if (gameState === 0 && piece.dead) { // still playing, then spawn the next piece
+          // determine next ARE limit
+          if (gametype === 6) { //Death
+            if (level < 20) {
+              this.areLimit = [
+                18, 18, 18, 15, 15, 12, 12, 12, 12, 12,
+                12, 12, 10, 10, 10,  8,  8,  8,  8,  8
+              ][level];
+            } else {
+              this.lockDelayLimit = 11;
+              this.areLimit = 6;
+            }
+          } else {
+            this.areLimit = 0;
+          }
+          if (this.areLimit === 0) { // IRS IHS not possible
+            this.new(preview.next()); // may die-in-one-frame
+          } else {
+            gameState = 4;
+            this.are = 0;
+          }
+        }
+      }
       /* farter */
     }
   }
 }
+
 Piece.prototype.update = function() {
   if (this.moveValid(0, 1, this.tetro)) {
     this.checkFall();
@@ -417,6 +432,7 @@ Piece.prototype.update = function() {
   }
   this.checkLock();
 }
+
 Piece.prototype.draw = function() {
   clear(activeCtx);
   if (!this.dead) {
@@ -433,6 +449,7 @@ Piece.prototype.draw = function() {
     }
   }
 }
+
 Piece.prototype.drawGhost = function() {
   activeCtx.globalAlpha = 0.4;
   if (settings.Ghost === 0 && !landed) {
diff --git a/preview.js b/preview.js
index 7bd8211..424bb74 100644
--- a/preview.js
+++ b/preview.js
@@ -11,6 +11,7 @@ Preview.prototype.init = function() {
   if (this.grabBag.length <= 7) {
     this.grabBag.push.apply(this.grabBag, this.gen());
   }
+  this.dirty = true;
   this.draw();
 }
 Preview.prototype.next = function() {
@@ -19,7 +20,7 @@ Preview.prototype.next = function() {
   if (this.grabBag.length <= 7) {
     this.grabBag.push.apply(this.grabBag, this.gen());
   }
-  this.draw();
+  this.dirty = true;
   return next;
   //TODO Maybe return the next piece?
 }
@@ -56,16 +57,17 @@ Preview.prototype.draw = function() {
   for (var i = 0; i < drawCount; i++) {
     var p = this.grabBag[i];
     var initInfo = RotSys[settings.RotSys].initinfo[p];
+    var r = initInfo[2];
     var rect = pieces[p].rect;
     draw(
-      pieces[p].tetro[initInfo[2]],
-      -rect[initInfo[2]][0] + (4 - rect[initInfo[2]][2] + rect[initInfo[2]][0]) / 2,
-      -rect[initInfo[2]][1] +
-        (3 - rect[initInfo[2]][3] + rect[initInfo[2]][1]) / 2 +
-        i*3,
+      pieces[p].tetro[r],
+      -rect[r][0] + (4 - rect[r][2] + rect[r][0]) / 2,
+      -rect[r][1] + (3 - rect[r][3] + rect[r][1]) / 2 + i*3,
       previewCtx,
       RotSys[settings.RotSys].color[p]
     );
+    //if(p===0)console.log(-rect[r][0], (4 - rect[r][2] + rect[r][0]) / 2);
   }
+  this.dirty = false;
 }
 var preview = new Preview();
diff --git a/ranking.js b/ranking.js
index dfb69c0..12864ff 100644
--- a/ranking.js
+++ b/ranking.js
@@ -1,143 +1,200 @@
-function XMLHTTP(url,obj)
+function XMLHTTP(url,obj,fun)
 {
   var xmlhttp=null;
-  var state_Change = function()
+  var handler=function(){
+    fun(xmlhttp);
+  }
+  if (window.XMLHttpRequest)
+  {// code for all new browsers
+    xmlhttp=new XMLHttpRequest();
+  }
+  else if (window.ActiveXObject)
+  {// code for IE5 and IE6
+    xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+  }
+  if (xmlhttp!=null)
+  {
+    xmlhttp.onreadystatechange=handler;
+    xmlhttp.open("POST",url,true);
+    xmlhttp.send(JSON.stringify(obj));
+  }
+  else
   {
-    if (xmlhttp.readyState==4)
-    {// 4 = "loaded"
-      if (xmlhttp.status==200)
+    alert("Your browser does not support XMLHTTP.");
+  }
+}
+
+function handleranking(xmlhttp)
+{
+  if (xmlhttp.readyState==4)
+  {// 4 = "loaded"
+    if (xmlhttp.status==200)
+    {
+      var res;
+      try
       {
-        var res;
-        try
+        res = JSON.parse(xmlhttp.responseText);
+        if(res.msg==="fail")
+        {
+          $setText(leaderboard, "error: "+res.info);
+        }
+        else if(res.msg==="ok")
         {
-          res = JSON.parse(xmlhttp.responseText);
-          if(res.msg==="fail")
+          leaderboard.innerHTML = "";
+          var ranks = res.ranks;
+          var now = (new Date()).getTime();
+          var gettimedifftext = function(t)
           {
-            $setText(leaderboard, "error: "+res.info);
+            t=Math.round(t/(60*1000));
+            if(t<100)
+              return t<=0?"!":(t+"m");
+            else if(t<99*60)
+              return Math.round(t/60)+"h";
+            else
+              return Math.round(t/(60*24))+"d";
           }
-          else if(res.msg==="ok")
+          var gettimetext = function(t)
           {
-            leaderboard.innerHTML = "";
-            var ranks = res.ranks;
-            var now = (new Date()).getTime();
-            var gettimedifftext = function(t)
-            {
-              t=Math.round(t/(60*1000));
-              if(t<100)
-                return t<=0?"!":(t+"m");
-              else if(t<99*60)
-                return Math.round(t/60)+"h";
-              else
-                return Math.round(t/(60*24))+"d";
+            var hs=Math.round(t/10);
+            var s=~~(hs/100);
+            var m=~~(s/60);
+            hs-=s*100;
+            s-=m*60;
+            if(m==0)
+              return s+"."+((hs>9?"":"0")+hs);
+            else if(m<10)
+              return m+":"+((s>9?"":"0")+s)+"."+((hs>9?"":"0")+hs);
+            else
+              return m+":"+((s>9?"":"0")+s)+"."+(~~(hs/10)); //
+          }
+          var getlinetxt = function(l)
+          {
+            if(l<1000)
+              return l+"L";
+            else
+              return l+"";
+          }
+          var getscoretext = function(s)
+          {
+            var arr=s.split("");
+            for(var i=arr.length-1-3;i>=0;i-=3){
+              arr[i]+=" ";
             }
-            var gettimetext = function(t)
+            return arr.join("");
+          }
+          for (var i=0;i<ranks.length;i++) {
+            var div = document.createElement('div');
+            var spanname = document.createElement('span');
+            var spanlines = document.createElement('span');
+            var spantime = document.createElement('span');
+            var spandate = document.createElement('span');
+            var spanscore = document.createElement('span');
+            $setText(spanname,ranks[i].name);
+            spanname.style.width = "6em";
+            spanname.style["text-align"] = "left";
+            $setText(spanlines,ranks[i].lines + "L");
+            spanlines.style.width = "2.5em";
+            $setText(spantime,gettimetext(ranks[i].time));
+            spantime.style.width = "4em";
+            $setText(spandate,gettimedifftext(now-ranks[i].date));
+            spandate.style.width = "2.5em";
+            spandate.style["font-weight"] = "normal";
+            if(res.mode==="score")
             {
-              var hs=Math.round(t/10);
-              var s=~~(hs/100);
-              var m=~~(s/60);
-              hs-=s*100;
-              s-=m*60;
-              if(m==0)
-                return s+"."+((hs>9?"":"0")+hs);
-              else if(m<10)
-                return m+":"+((s>9?"":"0")+s)+"."+((hs>9?"":"0")+hs);
-              else
-                return m+":"+((s>9?"":"0")+s)+"."+(~~(hs/10)); //
+              $setText(spanscore,scorestring(ranks[i].score, 7));
+              spanscore.style.width = "15em";
+              spanscore.classList.add("rank-score");
             }
-            var getlinetxt = function(l)
+            
+            div.appendChild(spanname);
+            div.appendChild(spanlines);
+            div.appendChild(spantime);
+            div.appendChild(spandate);
+            if(res.mode==="score")
             {
-              if(l<1000)
-                return l+"L";
-              else
-                return l+"";
+              div.appendChild(spanscore);
             }
-            var getscoretext = function(s)
+            if(typeof res.ranks[i].replay==="string")
             {
-              var arr=s.split("");
-              for(var i=arr.length-1-3;i>=0;i-=3){
-                arr[i]+=" ";
-              }
-              return arr.join("");
+              div.classList.add("has-replay");
+              var replaykey=ranks[i].replay;
+              var closure=function(a){return a}
+              div.addEventListener("click",function(k){
+                return function(){
+                  fetchreplay(k);
+                }
+              }(replaykey));
             }
-            for (var i=0;i<ranks.length;i++) {
-              var div = document.createElement('div');
-              var spanname = document.createElement('span');
-              var spanlines = document.createElement('span');
-              var spantime = document.createElement('span');
-              var spandate = document.createElement('span');
-              var spanscore = document.createElement('span');
-              $setText(spanname,ranks[i].name);
-              spanname.style.width = "6em";
-              spanname.style["text-align"] = "left";
-              $setText(spanlines,ranks[i].lines + "L");
-              spanlines.style.width = "2.5em";
-              $setText(spantime,gettimetext(ranks[i].time));
-              spantime.style.width = "4em";
-              $setText(spandate,gettimedifftext(now-ranks[i].date));
-              spandate.style.width = "2.5em";
-              spandate.style["font-weight"] = "normal";
-              if(res.mode==="score")
-              {
-                $setText(spanscore,scorestring(ranks[i].score, 7));
-                spanscore.style.width = "15em";
-                spanscore.classList.add("rank-score");
-              }
-              
-              div.appendChild(spanname);
-              div.appendChild(spanlines);
-              div.appendChild(spantime);
-              div.appendChild(spandate);
-              if(res.mode==="score")
-              {
-                div.appendChild(spanscore);
-              }
-              leaderboard.appendChild(div);
-              if(res.mode==="score" && i+1===5)
-              {
-                break;
-              }
+            leaderboard.appendChild(div);
+            if(res.mode==="score" && i+1===5)
+            {
+              break;
             }
           }
-          else
-          {
-            $setText(leaderboard, "Problem retrieving leaderboard data\n" + 
-              xmlhttp.status + "\n" + xmlhttp.readyState + "\n" + xmlhttp.statusText + "\n" +
-              xmlhttp.responseText
-            );
-          }
         }
-        catch(e)
+        else
         {
           $setText(leaderboard, "Problem retrieving leaderboard data\n" + 
-            e.toString()
+            xmlhttp.status + "\n" + xmlhttp.readyState + "\n" + xmlhttp.statusText + "\n" +
+            xmlhttp.responseText
           );
         }
       }
+      catch(e)
+      {
+        $setText(leaderboard, "Problem retrieving leaderboard data\n" + 
+          e.toString()
+        );
+      }
     }
   }
-  if (window.XMLHttpRequest)
-  {// code for all new browsers
-    xmlhttp=new XMLHttpRequest();
-  }
-  else if (window.ActiveXObject)
-  {// code for IE5 and IE6
-    xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
-  }
-  if (xmlhttp!=null)
-  {
-    xmlhttp.onreadystatechange=state_Change;
-    xmlhttp.open("POST",url,true);
-    xmlhttp.send(JSON.stringify(obj));
-  }
-  else
-  {
-    alert("Your browser does not support XMLHTTP.");
+}
+function handlereplay(xmlhttp)
+{
+  if (xmlhttp.readyState==4)
+  {// 4 = "loaded"
+    if (xmlhttp.status==200)
+    {
+      var res;
+      try
+      {
+        res = JSON.parse(xmlhttp.responseText);
+        if(res.msg==="fail")
+        {
+          alert("error: "+res.info);
+        }
+        else if(res.msg==="ok")
+        {
+          showreplaydata(res.replay);
+        }
+        else
+        {
+          console.log("Problem retrieving leaderboard data\n" + 
+            xmlhttp.status + "\n" + xmlhttp.readyState + "\n" + xmlhttp.statusText + "\n" +
+            xmlhttp.responseText
+          );
+        }
+      }
+      catch(e)
+      {
+        console.log("Problem retrieving leaderboard data\n" + 
+          e.toString()
+        );
+      }
+    }
   }
 }
 
+var hostaddr=
+  "http://farter.tk:8888";
+  //"http://localhost:8888";
+
 function submitscore(obj)
 {
   console.log(obj);
-  XMLHTTP("http://farter.tk:8888", obj);
-  //XMLHTTP("http://localhost:8888", obj);
+  XMLHTTP(hostaddr, obj, handleranking);
+}
+function fetchreplay(key)
+{
+  XMLHTTP(hostaddr, {req:"replay", replaykey:key}, handlereplay);
 }
\ No newline at end of file
diff --git a/sound.js b/sound.js
index 364b161..5e63e5d 100644
--- a/sound.js
+++ b/sound.js
@@ -1,42 +1,42 @@
 function Sound() {
-	var itworks=false;
-	var wavenames="bravo,endingstart,erase1,erase2,erase3,erase4,gameover,garbage,lock,tspin0,tspin1,tspin2,tspin3".split(",");
-	var waves={};
-	this.init=function(){
-		if(itworks===false){
-			try{
-				for(var i=0;i<wavenames.length;i++){
-					var iname = wavenames[i];
-					var wave = document.createElement("AUDIO");
-					wave.src="se/"+iname+".mp3";
-					wave.load();
-					waves[iname] = wave;
-				}
-				itworks=true;
-			}catch(e){
-				alert("sound doesn't work.")
-			};
-		}
-	};
-	this.playse=function(name,arg){
-		if(itworks){
-			try{
-				if(typeof arg !== "undefined"){
-					name+=arg;
-				}
-				if(typeof waves[name] !== "undefined"){
-					if(settings.Sound){
-						waves[name].volume=settings.Volume/100;
-						waves[name].currentTime=0;
-						waves[name].play();
-					}
-				}
-			}
-			catch(e){
-				alert("sound error"+e.toString());
-			}
-		}
-	}
+  var itworks=false;
+  var wavenames="bravo,endingstart,erase1,erase2,erase3,erase4,gameover,garbage,lock,tspin0,tspin1,tspin2,tspin3".split(",");
+  var waves={};
+  this.init=function(){
+    if(itworks===false){
+      try{
+        for(var i=0;i<wavenames.length;i++){
+          var iname = wavenames[i];
+          var wave = document.createElement("AUDIO");
+          wave.src="se/"+iname+".mp3";
+          wave.load();
+          waves[iname] = wave;
+        }
+        itworks=true;
+      }catch(e){
+        alert("sound doesn't work.")
+      };
+    }
+  };
+  this.playse=function(name,arg){
+    if(itworks){
+      try{
+        if(typeof arg !== "undefined"){
+          name+=arg;
+        }
+        if(typeof waves[name] !== "undefined"){
+          if(settings.Sound){
+            waves[name].volume=settings.Volume/100;
+            waves[name].currentTime=0;
+            waves[name].play();
+          }
+        }
+      }
+      catch(e){
+        console.error("sound error"+e.toString());
+      }
+    }
+  }
 }
 
 var sound = new Sound();
\ No newline at end of file
diff --git a/stack.js b/stack.js
index a52e265..6d42384 100644
--- a/stack.js
+++ b/stack.js
@@ -13,6 +13,8 @@ Stack.prototype.new = function(x, y, hy) {
   this.height = hy + y;
   this.hiddenHeight = hy;
   this.grid = cells;
+  
+  this.dirty = true;
 }
 /**
  * Adds tetro to the stack, and clears lines if they fill up.
@@ -21,6 +23,11 @@ Stack.prototype.addPiece = function(tetro) {
   var lineClear = 0;
   var isSpin = false;
   var once = false;
+  
+  var bottomRow = []; // for backfire
+  for (var x = 0; x < this.width; x++) {
+    bottomRow.push(this.grid[x][this.height - 1]);
+  }
 
   // spin check
   if (
@@ -93,6 +100,7 @@ Stack.prototype.addPiece = function(tetro) {
   }
 
   var scoreAdd = bigInt(level + 1);
+  var garbage = 0;
   if (lineClear !== 0) {
     //console.log("C"+combo+" B"+b2b)
     if (isSpin) {
@@ -100,13 +108,15 @@ Stack.prototype.addPiece = function(tetro) {
         bigInt([800,1200,1600,2000][lineClear - 1])
           .mul(bigInt(2).pow(b2b + combo))
       );
+      garbage = [[2,4,6,8],[3,6,9,12]][b2b != 0 ? 1 : 0][lineClear - 1];
       b2b += 1;
       sound.playse("tspin",lineClear);
-    } else if(lineClear === 4) {
+    } else if (lineClear === 4) {
       scoreAdd = scoreAdd.mul(
         bigInt(800)
           .mul(bigInt(2).pow(b2b + combo))
       );
+      garbage = [4,5][b2b != 0 ? 1 : 0];
       b2b += 1;
       sound.playse("erase",lineClear);
     } else {
@@ -115,8 +125,10 @@ Stack.prototype.addPiece = function(tetro) {
           .mul(bigInt(2).pow(combo))
       );
       b2b = 0;
+      garbage = [0,1,2,4][lineClear - 1];
       sound.playse("erase",lineClear);
     }
+    garbage += ~~(combo / 2); //[0,0,1,1,2,2,3,3,4,4,5,5,6,6,...]
     combo += 1;
   } else {
     if (isSpin) {
@@ -131,10 +143,10 @@ Stack.prototype.addPiece = function(tetro) {
     combo = 0;
   }
   lines += lineClear;
-	if (gametype === 1 || gametype === 6) {
+  if (gametype === 1 || gametype === 6) {
     level = ~~(lines / 10);
   } else if (gametype === 7) {
-		level = ~~(lines / 30);
+    level = ~~(lines / 30);
   }
   score = score.add(scoreAdd.mul(bigInt(16).pow(allclear)));
   
@@ -147,6 +159,29 @@ Stack.prototype.addPiece = function(tetro) {
     score = score.add(bigInt(1000000).mul(bigInt(16).pow(allclear)));
     allclear ++;
     sound.playse("bravo");
+    garbage += 10;
+  }
+  
+  if(gameparams&&gameparams.backFire){
+    if(gameparams.backFire === 1){
+      garbage = [0, 0,1,2,4][lineClear];
+    }else if(gameparams.backFire === 3){
+      garbage *= ~~(lines/2);
+    }
+    if(garbage !== 0) {
+      if(gameparams.backFire === 1){
+        for(var y = 0; y < garbage; y++){
+          this.rowRise(bottomRow, piece);
+        }
+      }else if(gameparams.backFire === 2 || gameparams.backFire === 3){
+        var hole = ~~(rng.next() * 10);
+        var arrRow = [8,8,8,8,8,8,8,8,8,8];
+        arrRow[hole] = 0;
+        for(var y = 0; y < garbage; y++){
+          this.rowRise(arrRow, piece);
+        }
+      }
+    }
   }
   
   //if (scoreAdd.cmp(0) > 0)
@@ -157,9 +192,7 @@ Stack.prototype.addPiece = function(tetro) {
   // TODO Might not need this (same for in init)
   column = 0;
 
-  statisticsStack();
-
-  this.draw();
+  this.dirty = true;
 }
 /**
  * Raise a garbage line. farter
@@ -190,17 +223,19 @@ Stack.prototype.rowRise = function(arrRow, objPiece) {
   if(!isEmpty) {
     digLines.push(this.height - 1);
   }
-  if (!piece.moveValid(0, 0, piece.tetro)) {
-    piece.y-=1;
-    if (piece.y + pieces[piece.index].rect[3] <= this.hiddenHeight - 2) { // the bottom is >=2 cell away from visible part
-      gameState = 9;
-      $setText(msg,'OOPS!');
-      menu(3);
-      sound.playse("gameover");
+  if (!piece.dead) {
+    if (!piece.moveValid(0, 0, piece.tetro)) {
+      piece.y-=1;
+      if (piece.y + pieces[piece.index].rect[3] <= this.hiddenHeight - 2) { // the bottom is >=2 cell away from visible part
+        gameState = 9;
+        $setText(msg,'OOPS!');
+        menu(3);
+        sound.playse("gameover");
+      }
     }
+    piece.dirty = true;
   }
-  piece.dirty = true;
-  this.draw();
+  this.dirty = true;
 }
 /**
  * Draws the stack.
@@ -301,5 +336,9 @@ Stack.prototype.draw = function() {
     stackCtx.globalCompositeOperation = 'source-over';
     stackCtx.drawImage(lineCanvas, 0, 0);
   }
+  
+  statisticsStack();
+  
+  this.dirty = false;
 }
 var stack = new Stack();
diff --git a/style.css b/style.css
index 2d76a48..e12bf54 100755
--- a/style.css
+++ b/style.css
@@ -108,6 +108,7 @@ body {
   background-attachment: fixed;
   -webkit-font-smoothing: antialiased;
   color: #FFF;
+  -webkit-touch-callout: none;
 }
 body, span, a, p, div, h2, h3, h4, h5, h6 {
   font-family: 'Roboto', 'Trebuchet MS', 'Microsoft Yahei', 'Hiragino Sans GB', sans-serif;
@@ -117,6 +118,11 @@ span.rank-score {
   color: #ffabab;
 }
 
+div.has-replay:hover span {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
 a.btn i {
   float: left;
 }
@@ -378,6 +384,7 @@ nav li {
               margin .2s ease;
   transform: translateX(-100%);
   -webkit-transform: translateX(-100%);
+  -webkit-overflow-scrolling: touch;
   pointer-events: none;
 }
 .on {
diff --git a/tetris.js b/tetris.js
index 9cce34a..bd7ee0b 100644
--- a/tetris.js
+++ b/tetris.js
@@ -18,14 +18,14 @@ function ObjectClone(obj) {
   return copy;
 }
 function $$(id){
-	return document.getElementById(id);
+  return document.getElementById(id);
 }
 function $setText(elm,s){
-	if(typeof elm.innerText==="string"){
-		elm.innerText=s;
-	}else{
-		elm.textContent=s;
-	}
+  if(typeof elm.innerText==="string"){
+    elm.innerText=s;
+  }else{
+    elm.textContent=s;
+  }
 }
 
 /**
@@ -137,7 +137,7 @@ var TetroZ = [
   [[0,7,0,0],[0,7,7,0],[0,0,7,0],[0,0,0,0]],
   [[0,7,7,0],[7,7,0,0],[0,0,0,0],[0,0,0,0]]];
 // [r][MINX MINY MAXX MAXY]
-var RectI = [[0,1,4,2],[1,0,2,4],[0,2,4,3],[2,0,3,4]]; // hacked for next display
+var RectI = [[0,1,4,2],[2,0,3,4],[0,2,4,3],[1,0,2,4]]; // hacked for next display
 var RectJ = [[0,0,3,2],[1,0,3,3],[0,1,3,3],[0,0,2,3]];
 var RectL = [[0,0,3,2],[1,0,3,3],[0,1,3,3],[0,0,2,3]];
 var RectO = [[1,0,3,2],[1,0,3,2],[1,0,3,2],[1,0,3,2]];
@@ -185,6 +185,11 @@ var WKTableDRS_R = [[ 0, 0],[+1, 0],[-1, 0],[ 0,+1],[+1,+1],[-1,+1],[ 0,-1]];
 var WKTableDRS_L = [[ 0, 0],[-1, 0],[+1, 0],[ 0,+1],[-1,+1],[+1,+1],[ 0,-1]];
 var WKTableDRS = [WKTableDRS_R,WKTableDRS_L,WKTableDRS_L];
 
+var WKTableDX_R = [[[0, 0], [-1, -1]], [[0, 0], [+1, -1]], [[0, 0], [+1, +1]], [[0, 0], [-1, +1]]];
+var WKTableDX_L = [[[0, 0], [+1, -1]], [[0, 0], [+1, +1]], [[0, 0], [-1, +1]], [[0, 0], [-1, -1]]];
+var WKTableDX_2 = [[[0, 0], [ 0, -2]], [[0, 0], [-2,  0]], [[0, 0], [ 0, +2]], [[0, 0], [+2,  0]]];
+var WKTableDX = [WKTableDX_R,WKTableDX_L,WKTableDX_2];
+
 var OffsetSRS = [
   [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
   [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
@@ -257,6 +262,38 @@ var OffsetE60 = [
   [[+1,+1],[+1, 0],[+1, 0],[+2, 0]],
   [[+1, 0],[+1, 0],[+1, 0],[+1, 0]],
   [[+1,+1],[+1, 0],[+1, 0],[+2, 0]]];
+var OffsetJJSRS = [
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[+1, 0],[+1, 0],[+1, 0],[+1, 0]],
+  [[+1, 0],[+1, 0],[+1, 0],[+1, 0]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[+1, 0],[+1, 0],[+1, 0],[+1, 0]],
+  [[+1, 0],[+1, 0],[+1, 0],[+1, 0]],
+  [[+1, 0],[+1, 0],[+1, 0],[+1, 0]]];
+var Offset5000 = [
+  [[ 0,+1],[-1, 0],[ 0, 0],[ 0, 0]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0,+1],[ 0,+1],[ 0,+1],[ 0,+1]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0, 0],[ 0, 0],[ 0,-1],[+1, 0]],
+  [[ 0,+1],[-1, 0],[ 0,-1],[+1, 0]],
+  [[ 0, 0],[ 0, 0],[ 0,-1],[+1, 0]]];
+var OffsetPlus = [
+  [[ 0, 0],[ 0, 0],[ 0,-1],[+1, 0]],
+  [[+1,+1],[+1, 0],[+1, 0],[+1, 0]],
+  [[+1,+1],[+1, 0],[+1, 0],[+1, 0]],
+  [[ 0,+1],[ 0,+1],[ 0,+1],[ 0,+1]],
+  [[+1,+1],[ 0, 0],[+1, 0],[+1, 0]],
+  [[+1,+1],[+1, 0],[+1, 0],[+1, 0]],
+  [[+1,+1],[+1, 0],[+1, 0],[+2, 0]]];
+var OffsetDX = [
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0,+1],[ 0,+1],[ 0,+1],[ 0,+1]],
+  [[ 0, 0],[ 0, 0],[ 0, 0],[ 0, 0]],
+  [[ 0,+1],[ 0,+1],[ 0,+1],[ 0,+1]]];
 
 //x, y, r
 var InitInfoSRS = [[ 0, 0, 0],[ 0, 0, 0],[ 0, 0, 0],[ 0, 0, 0],[ 0, 0, 0],[ 0, 0, 0],[ 0, 0, 0]];
@@ -268,10 +305,14 @@ var InitInfoNBlox = [[ 0, 0, 0],[ 0, 0, 2],[ 0, 0, 2],[ 0,+1, 0],[ 0,+1, 0],[ 0,
 var InitInfoNintendo = [[ 0, 0, 0],[+1, 0, 2],[+1, 0, 2],[ 0,+1, 0],[+1,+1, 0],[+1, 0, 2],[+1,+1, 0]];
 var InitInfoMS = [[ 0, 0, 0],[+1, 0, 2],[+1, 0, 2],[ 0,+1, 0],[+1,+1, 0],[+1, 0, 2],[+1,+1, 0]];
 var InitInfoE60 = [[ 0, 0, 0],[+1, 0, 2],[+1, 0, 2],[ 0,+1, 0],[+1,+1, 0],[+1, 0, 2],[+1,+1, 0]];
+var InitInfoJJSRS = [[ 0, 0, 0],[+1, 0, 0],[+1, 0, 0],[ 0, 0, 0],[+1, 0, 0],[+1, 0, 0],[+1, 0, 0]];
+var InitInfo5000 = [[ 0, 0, 3],[ 0, 0, 1],[+1, 0, 3],[ 0, 0, 0],[ 0, 0, 0],[ 0, -1, 2],[ 0, 0, 0]];
+var InitInfoPlus = [[ 0, 0, 0],[+1, 0, 2],[+1, 0, 2],[ 0,+1, 0],[+1,+1, 0],[+1, 0, 2],[+1,+1, 0]];
+var InitInfoDX = [[ 0, 0, 0],[ 0, 0, 2],[ 0, 0, 2],[ 0,+1, 0],[ 0,+1, 0],[ 0, 0, 2],[ 0,+1, 0]];
 
 var ColorSRS = [1, 2, 3, 4, 5, 6, 7];
 var ColorARS = [7, 2, 3, 4, 6, 1, 5];
-var ColorQRS = [7, 1, 4, 3, 5, 6, 2];
+var ColorQRS = [7, 1, 3, 4, 5, 6, 2];
 var ColorTengen = [7, 3, 6, 2, 5, 4, 1];
 var ColorAtari = [7, 4, 6, 2, 1, 5, 3];
 var ColorNBlox = [3, 6, 2, 7, 1, 4, 5];
@@ -279,7 +320,10 @@ var ColorC2 = [5, 2, 6, 4, 1, 7, 9];
 var ColorNintendo = [9, 2, 7, 9, 2, 9, 7];
 var ColorMS = [7, 6, 4, 1, 2, 8, 5];
 var ColorE60 = [5, 5, 5, 5, 5, 5, 5];
-var ColorIBM = [7, 8, 6, 2, 5, 3, 1];
+var ColorIBM = [7, 9, 6, 2, 5, 3, 1];
+var ColorJJSRS = [5, 1, 3, 4, 7, 6, 2];
+var Color5000 = [7, 6, 8, 4, 5, 1, 2];
+var ColorDX = [9, 7, 2, 4, 3, 5, 6];
 
 //SRS, C2, ARS, QRS, DRS
 var RotSys = [
@@ -343,6 +387,26 @@ var RotSys = [
     offset: OffsetE60,
     color: ColorIBM,
   },
+  {
+    initinfo: InitInfoJJSRS,
+    offset: OffsetJJSRS,
+    color: ColorJJSRS,
+  },
+  {
+    initinfo: InitInfo5000,
+    offset: Offset5000,
+    color: Color5000,
+  },
+  {
+    initinfo: InitInfoPlus,
+    offset: OffsetPlus,
+    color: ColorARS,
+  },
+  {
+    initinfo: InitInfoDX,
+    offset: OffsetDX,
+    color: ColorDX,
+  }
 ];
 
 // Define shapes and spawns.
@@ -464,7 +528,9 @@ var mySettings = {
   Block: 2,
   Ghost: 1,
   Grid: 1,
-  Outline: 1
+  Outline: 1,
+  DASCut: 0,
+  NextSide: 0
 };
 
 var settings = mySettings; // initialized by reference; replaced when game starts and replay
@@ -483,7 +549,9 @@ var settingName = {
   Block: "Block 样式",
   Ghost: "Ghost 影子",
   Grid: "Grid 网格",
-  Outline: "Outline 方块边缘"
+  Outline: "Outline 方块边缘",
+  DASCut: "DAS Cut 加速打断",
+  NextSide: "Next Side 预览位置"
 };
 var setting = {
   DAS: range(0,31),
@@ -507,15 +575,17 @@ var setting = {
     return array;
   })(),
   'Lock Delay': range(0, 101),
-  RotSys: ['Super', 'C2', 'Arika*', 'DTET', 'QQ', 'Atari', 'Tengen', 'N-Blox', 'Nintendo', 'MS', "E-60", "IBM PC"],
+  RotSys: ['Super', 'C2', 'Arika*', 'DTET', 'QQ', 'Atari', 'Tengen', 'N-Blox', 'Nintendo', 'MS', 'E-60', 'IBM PC', 'JJ', '5000', 'Plus', 'DX'],
   Next: ['-', '1', '2', '3', '4', '5', '6'],
-  Size: ['Auto', 'Small', 'Medium', 'Large'],
+  Size: ['Full', 'Small', 'Medium', 'Large', 'Larger'],
   Sound: ['Off', 'On'],
   Volume: range(0, 101),
   Block: ['Shaded', 'Solid', 'Glossy', 'Arika', 'World'],
   Ghost: ['Normal', 'Colored', 'Off', 'Hidden'],
   Grid: ['Off', 'On'],
-  Outline: ['Off', 'On', 'Hidden', 'Only']
+  Outline: ['Off', 'On', 'Hidden', 'Only'],
+  DASCut: ['Off', 'On'],
+  NextSide: ['Right', 'Left']
 };
 var arrRowGen = {
   'simple':
@@ -620,11 +690,11 @@ var arrStages = [
 ];
 
 var sprintRanks= [
-	{t:600, u:"修仙去吧", b:"Zen"},
-	{t:540, u:"求进9分钟", b:"9 min...?"},
-	{t:480, u:"求进8分钟", b:"8 min...?"},
-	{t:420, u:"求进7分钟", b:"7 min...?"},
-	{t:360, u:"求进6分钟", b:"6 min...?"},
+  {t:600, u:"修仙去吧", b:"Zen"},
+  {t:540, u:"求进9分钟", b:"9 min...?"},
+  {t:480, u:"求进8分钟", b:"8 min...?"},
+  {t:420, u:"求进7分钟", b:"7 min...?"},
+  {t:360, u:"求进6分钟", b:"6 min...?"},
   {t:300, u:"求进5分钟", b:"5 min...?"},
   {t:240, u:"终于……", b:"Finally..."},
   {t:210, u:"<small>你一定是在逗我</small>", b:"Too slow."},
@@ -769,8 +839,21 @@ function resize() {
   var a = $$('a');
   var b = $$('b');
   var c = $$('c');
+  var d = $$('d');
   var content = $$('content');
-
+  
+  if (settings.NextSide === 1) {
+    content.innerHTML = "";
+    content.appendChild(c);
+    content.appendChild(b);
+    content.appendChild(d);
+  } else {
+    content.innerHTML = "";
+    content.appendChild(d);
+    content.appendChild(b);
+    content.appendChild(c);
+  }
+  
   // TODO Finalize this.
   // Aspect ratio: 1.024
   var padH = 12;
@@ -779,10 +862,11 @@ function resize() {
   if (screenWidth > window.innerWidth)
     screenHeight = ~~(window.innerWidth / 1.0);
 
-  if (settings.Size === 1 && screenHeight > 602) cellSize = 15;
-  else if (settings.Size === 2 && screenHeight > 602) cellSize = 30;
-  else if (settings.Size === 3 && screenHeight > 902) cellSize = 45;
-  else cellSize = Math.max(~~(screenHeight / 20), 10);
+  cellSize = Math.max(~~(screenHeight / 20), 10);
+  if (settings.Size === 1 && cellSize >= 16) cellSize = 16;
+  else if (settings.Size === 2 && cellSize >= 24) cellSize = 24;
+  else if (settings.Size === 3 && cellSize >= 32) cellSize = 32;
+  else if (settings.Size === 4 && cellSize >= 48) cellSize = 48;
 
   var pad = (window.innerHeight - (cellSize * 20 + 2));
   var padFinal = Math.min(pad/2, padH);
@@ -828,9 +912,9 @@ function resize() {
     h3[i].style.lineHeight = (cellSize * 2) + 'px';
     h3[i].style.fontSize = stats.style.fontSize;
   }
-  stats.style.width = h3[0].clientWidth + 'px';
+  stats.style.width = d.clientWidth + 'px';
 
-  timeCanvas.width = h3[0].clientWidth;
+  timeCanvas.width = d.clientWidth;
   timeCanvas.height = timeCanvas.clientHeight || timeCanvas.offsetHeight || timeCanvas.getBoundingClientRect().height;
   timeCtx.fillStyle = "#fff";
   timeCtx.font = 'bold 1.125em Roboto, "Trebuchet MS"';
@@ -998,8 +1082,8 @@ function init(gt, params) {
     //stack.draw(); //resize
   }
   if (gametype === 7){
-		lastPiecesSet = 0;
-		digZenBuffer = 0;
+    lastPiecesSet = 0;
+    digZenBuffer = 0;
   }
 
   menu();
@@ -1095,13 +1179,17 @@ function scorestring(s, n){
   return strsplit.join("");
 }
 
+function updateScoreTime(){
+  scoreTime = Date.now() - scoreStartTime - pauseTime;
+}
+
 /**
  * Draws the stats next to the tetrion.
  */
 function statistics() {
 
   var time = scoreTime || 0;
-  var seconds = (time / 1000 % 60).toFixed(2);
+  var seconds = ((time % 60000) / 1000).toFixed(2);
   var minutes = ~~(time / 60000);
   var displayTime =
     (minutes < 10 ? '0' : '') + minutes +
@@ -1129,13 +1217,13 @@ function statisticsStack() {
     $setText(statsLines, lineLimit - lines);
     $setText(statsLevel, "");
   }else if(gametype === 1 || gametype === 6 || gametype === 7){
-		$setText(statsLines, lines);
+    $setText(statsLines, lines);
     $setText(statsLevel, "Lv. " + level);
   }else if (gametype === 3){
     if (gameparams["digOffset"] || gameparams["digOffset"] !== 0){
       $setText(statsLevel, gameparams["digOffset"] + "+");
     }else{
-			$setText(statsLevel, "");
+      $setText(statsLevel, "");
     }
     $setText(statsLines, lines);
   }//else if (gametype === 4){
@@ -1418,147 +1506,102 @@ function update() {
   //  piece.new(preview.next());
   //}
 
+  do { // for breaking
+    if (!(lastKeys & flags.holdPiece) && flags.holdPiece & keysDown) {
+      piece.hold(); // may cause death
+    }
+    if (gameState === 9) {
+      break;
+    }
 
-  if (!(lastKeys & flags.holdPiece) && flags.holdPiece & keysDown) {
-    piece.hold();
-  }
-
-  if (flags.rotLeft & keysDown && !(lastKeys & flags.rotLeft)) {
-    piece.rotate(-1);
-    piece.finesse++;
-  } else if (flags.rotRight & keysDown && !(lastKeys & flags.rotRight)) {
-    piece.rotate(1);
-    piece.finesse++;
-  } else if (flags.rot180 & keysDown && !(lastKeys & flags.rot180)) {
-    piece.rotate(2);
-    piece.finesse++;
-  }
+    if (flags.rotLeft & keysDown && !(lastKeys & flags.rotLeft)) {
+      piece.rotate(-1);
+      piece.finesse++;
+    } else if (flags.rotRight & keysDown && !(lastKeys & flags.rotRight)) {
+      piece.rotate(1);
+      piece.finesse++;
+    } else if (flags.rot180 & keysDown && !(lastKeys & flags.rot180)) {
+      piece.rotate(2);
+      piece.finesse++;
+    }
 
-  piece.checkShift();
+    piece.checkShift();
 
-  if (flags.moveDown & keysDown) {
-    piece.shiftDown();
-    //piece.finesse++;
-  }
-  if (!(lastKeys & flags.hardDrop) && flags.hardDrop & keysDown) {
-    frameLastHarddropDown = frame;
-    piece.hardDrop();
-  }
+    if (flags.moveDown & keysDown) {
+      piece.shiftDown();
+      //piece.finesse++;
+    }
+    if (!(lastKeys & flags.hardDrop) && flags.hardDrop & keysDown) {
+      frameLastHarddropDown = frame;
+      piece.hardDrop();
+    }
 
-  piece.update();
+    piece.update(); // may turn to locked, even lock out death.
+    if (gameState === 9) {
+      break;
+    }
 
-	if(gametype === 3) { //Dig
-    var fromLastRise = frame-frameLastRise;
-    var fromLastHD = (flags.hardDrop & keysDown)?(frame-frameLastHarddropDown):0;
+    if(gametype === 3) { //Dig
+      var fromLastRise = frame-frameLastRise;
+      var fromLastHD = (flags.hardDrop & keysDown)?(frame-frameLastHarddropDown):0;
 
-    var arrRow = [8,8,8,8,8,8,8,8,8,8];
-    var curStage = 0, objCurStage;
+      var arrRow = [8,8,8,8,8,8,8,8,8,8];
+      var curStage = 0, objCurStage;
 
-    while(curStage<arrStages.length && arrStages[curStage].begin <= lines + (gameparams["digOffset"] || 0)) {
-      curStage++;
-    }
-    curStage--;
-    objCurStage = arrStages[curStage];
-    if(fromLastRise >= objCurStage.delay || (fromLastHD >= 20 && fromLastRise >= 15)) {
-      //IJLOSTZ
-      var arrRainbow=[
-        2,-1,1,5,4,3,7,6,-1,8,
-        8,8,8,6,6,2,1,5,8,-1,
-        7,7,-1,8,8];
-      var idxRainbow,flagAll,colorUsed;
-      idxRainbow = ~~(objCurStage.begin/100);
-      flagAll = (~~(objCurStage.begin/50))%2;
-      if(idxRainbow >= arrRainbow.length) {
-        idxRainbow = arrRainbow.length - 1;
+      while(curStage<arrStages.length && arrStages[curStage].begin <= lines + (gameparams["digOffset"] || 0)) {
+        curStage++;
       }
-      colorUsed = arrRainbow[idxRainbow];
-      for(var x=0; x<stack.width; x+=(flagAll===1?1:(stack.width-1))) {
-        if(colorUsed===-1) {
-          arrRow[x]=~~(rng.next()*8+1);
-        } else {
-          arrRow[x]=colorUsed;
+      curStage--;
+      objCurStage = arrStages[curStage];
+      if(fromLastRise >= objCurStage.delay || (fromLastHD >= 20 && fromLastRise >= 15)) {
+        //IJLOSTZ
+        var arrRainbow=[
+          2,-1,1,5,4,3,7,6,-1,8,
+          8,8,8,6,6,2,1,5,8,-1,
+          7,7,-1,8,8];
+        var idxRainbow,flagAll,colorUsed;
+        idxRainbow = ~~(objCurStage.begin/100);
+        flagAll = (~~(objCurStage.begin/50))%2;
+        if(idxRainbow >= arrRainbow.length) {
+          idxRainbow = arrRainbow.length - 1;
+        }
+        colorUsed = arrRainbow[idxRainbow];
+        for(var x=0; x<stack.width; x+=(flagAll===1?1:(stack.width-1))) {
+          if(colorUsed===-1) {
+            arrRow[x]=~~(rng.next()*8+1);
+          } else {
+            arrRow[x]=colorUsed;
+          }
         }
-      }
 
-      objCurStage.gen(arrRow);
-      stack.rowRise(arrRow, piece);
-      frameLastRise=frame;
-      sound.playse("garbage");
-    }
-  }else if(gametype===7) { //dig zen
-		for(;lastPiecesSet<piecesSet;lastPiecesSet++){
-			digZenBuffer++;
-			var piecePerRise=[
-				8,6.5,4,3.5,10/3,
-				3,2.8,2.6,2.4,2.2,
-				2][level>10?10:level];
-			if(digZenBuffer-piecePerRise > -0.000000001){
-				digZenBuffer-=piecePerRise;
-				if(Math.abs(digZenBuffer) < -0.000000001){
-					digZenBuffer = 0;
-				}
-				var arrRow=[8,8,8,8,8,8,8,8,8,8];
-				arrRow[~~(rng.next()*10)]=0;
-
-				stack.rowRise(arrRow, piece);
-				sound.playse("garbage");
-			}
-		}
-  }
+        objCurStage.gen(arrRow);
+        stack.rowRise(arrRow, piece);
+        frameLastRise=frame;
+        sound.playse("garbage");
+      }
+    }else if(gametype===7) { //dig zen
+      for(;lastPiecesSet<piecesSet;lastPiecesSet++){
+        digZenBuffer++;
+        var piecePerRise=[
+          8,6.5,4,3.5,10/3,
+          3,2.8,2.6,2.4,2.2,
+          2][level>10?10:level];
+        if(digZenBuffer-piecePerRise > -0.000000001){
+          digZenBuffer-=piecePerRise;
+          if(Math.abs(digZenBuffer) < -0.000000001){
+            digZenBuffer = 0;
+          }
+          var arrRow=[8,8,8,8,8,8,8,8,8,8];
+          arrRow[~~(rng.next()*10)]=0;
 
-  // Win
-  // TODO
-  if (gametype === 0) { // 40L
-    if (lines >= lineLimit) {
-      gameState = 1;
-      var rank = null;
-      var time = (Date.now() - scoreStartTime - pauseTime) / 1000;
-      for (var i in sprintRanks) {
-        if (time > sprintRanks[i].t) {
-          rank = sprintRanks[i];
-          break;
+          stack.rowRise(arrRow, piece);
+          sound.playse("garbage");
         }
       }
-      msg.innerHTML = rank.u + "<br /><small>" + rank.b +"</small>";
-      piece.dead = true;
-      menu(3);
-      sound.playse("endingstart");
     }
-  } else {
-		var isend=false;
-		if (gametype === 1) { // Marathon
-			if (settings.Gravity !== 0 && lines>=200) { // not Auto, limit to 200 Lines
-				isend=true;
-			}
-		} else if (gametype === 5) { // Score Attack
-			if (lines>=lineLimit) { // not Auto, limit to 200 Lines
-				isend=true;
-			}
-		} else if (gametype === 4) { // Dig race
-			if (digLines.length === 0) {
-				isend=true;
-			}
-		} else if (gametype === 6) { // 20G
-			if (lines>=300) { // 200 + 100
-				isend=true;
-			}
-		} else if (gametype === 7) { // dig zen
-			if (lines>=400) { // 300 + 100
-				isend=true;
-			}
-		}
-		if(isend){
-			gameState = 1;
-			$setText(msg,'GREAT!');
-			piece.dead = true;
-			menu(3);
-			sound.playse("endingstart");
-		}
-  }
-  /* farter */
+  } while(false) // break when game over
 
-  scoreTime = Date.now() - scoreStartTime - pauseTime;
-  statistics();
+  updateScoreTime();
 
   if (lastKeys !== keysDown) {
     lastKeys = keysDown;
@@ -1577,6 +1620,8 @@ function gameLoop() {
     var repeat = ~~((Date.now() - startTime - pauseTime)/1000*fps) - frame;
     if (repeat>1) {
       frameSkipped += repeat-1;
+    } else if (repeat<=0) {
+      frameSkipped += repeat-1;
     }
 
     for (var repf=0;repf<repeat;repf++) {
@@ -1588,22 +1633,6 @@ function gameLoop() {
 
           update();
 
-        // TODO improve this with 'dirty' flags.
-        /* farter */ // as you draw for lock delay brightness gradient... give this up..
-
-        if (piece.x !== lastX ||
-        Math.floor(piece.y) !== lastY ||
-        piece.pos !== lastPos ||
-        piece.lockDelay !== lastLockDelay ||
-        piece.dirty) {
-          piece.draw();
-        }
-        lastX = piece.x;
-        lastY = Math.floor(piece.y);
-        lastPos = piece.pos;
-        lastLockDelay = piece.lockDelay;
-        piece.dirty = false;
-
       } else if (gameState === 2 || gameState === 4) {
 
         if (lastKeys !== keysDown && !watchingReplay) {
@@ -1659,13 +1688,14 @@ function gameLoop() {
         } else {
           // are
           piece.are++;
-          scoreTime = Date.now() - scoreStartTime - pauseTime;
+          updateScoreTime();
         }
         if (
           (gameState === 2 && frame >= fps*10/6) ||
           (gameState === 4 && piece.are >= piece.areLimit)
         ) {
           gameState = 0;
+          // console.time("123");
           if (piece.ihs) {
             piece.index = preview.next();
             piece.hold();
@@ -1673,11 +1703,11 @@ function gameLoop() {
             piece.new(preview.next());
           }
           piece.draw();
-          scoreTime = Date.now() - scoreStartTime - pauseTime;
+          // console.timeEnd("123");
+          // console.log(frame);
+          updateScoreTime();
         }
 
-        statistics();
-
       } else if (gameState === 9 || gameState === 1) {
         if (toGreyRow >= stack.hiddenHeight) {
           /**
@@ -1702,12 +1732,93 @@ function gameLoop() {
       }
       frame++;
     }
+    
+    statistics();
+    
+    // TODO improve this with 'dirty' flags.
+    /* farter */ // as you draw for lock delay brightness gradient... give this up..
+
+    if (piece.x !== lastX ||
+    Math.floor(piece.y) !== lastY ||
+    piece.pos !== lastPos ||
+    piece.lockDelay !== lastLockDelay ||
+    piece.dirty) {
+      piece.draw();
+    }
+    lastX = piece.x;
+    lastY = Math.floor(piece.y);
+    lastPos = piece.pos;
+    lastLockDelay = piece.lockDelay;
+    piece.dirty = false;
+    
+    if (stack.dirty) {
+      stack.draw();
+    }
+    if (preview.dirty) {
+      preview.draw();
+    }
+    
   } else {
     console.log("stop inloop",inloop)
     inloop = false;
   }
 }
 
+// called after piece lock, may be called multple times when die-in-one-frame
+function checkWin(){
+  if (gametype === 0) { // 40L
+    if (lines >= lineLimit) {
+      gameState = 1;
+      if (gameparams && gameparams.backFire){
+        msg.innerHTML = "GREAT!";
+      } else {
+        var rank = null;
+        var time = (Date.now() - scoreStartTime - pauseTime) / 1000;
+        for (var i in sprintRanks) {
+          if (time > sprintRanks[i].t) {
+            rank = sprintRanks[i];
+            break;
+          }
+        }
+        msg.innerHTML = rank.u + "<br /><small>" + rank.b +"</small>";
+      }
+      piece.dead = true;
+      menu(3);
+      sound.playse("endingstart");
+    }
+  } else {
+    var isend=false;
+    if (gametype === 1) { // Marathon
+      if (settings.Gravity !== 0 && lines>=200) { // not Auto, limit to 200 Lines
+        isend=true;
+      }
+    } else if (gametype === 5) { // Score Attack
+      if (lines>=lineLimit) { // not Auto, limit to 200 Lines
+        isend=true;
+      }
+    } else if (gametype === 4) { // Dig race
+      if (digLines.length === 0) {
+        isend=true;
+      }
+    } else if (gametype === 6) { // 20G
+      if (lines>=300) { // 200 + 100
+        isend=true;
+      }
+    } else if (gametype === 7) { // dig zen
+      if (lines>=400) { // 300 + 100
+        isend=true;
+      }
+    }
+    if(isend){
+      gameState = 1;
+      $setText(msg,'GREAT!');
+      piece.dead = true;
+      menu(3);
+      sound.playse("endingstart");
+    }
+  }
+}
+
 var playername=void 0;
 
 function requireplayername(){
@@ -1722,11 +1833,13 @@ function requireplayername(){
 function trysubmitscore() {
   if(watchingReplay)
     return;
-  var obj={};
+  var obj={req:"ranking"};
   var time = scoreTime;
 
   if(gametype===0) // 40L
-    obj.mode="sprint" + (gameparams&&gameparams.pieceSet?["","noi","alli"][gameparams.pieceSet]:"");
+    obj.mode="sprint" + 
+      (gameparams&&gameparams.pieceSet?["","noi","alli"][gameparams.pieceSet]:"") +
+      (gameparams&&gameparams.backFire?["","bf1","bf2","bf3"][gameparams.backFire]:"");
   else if(gametype===3) // dig
     obj.mode="dig" + (gameparams&&gameparams.digOffset?gameparams.digOffset:"");
   else if(gametype===4) // dig race
@@ -1736,9 +1849,9 @@ function trysubmitscore() {
   else if(gametype===5) // score attack
     obj.mode="score";
   else if(gametype===6) // 20g
-		obj.mode="marathon20g";
-	else if(gametype===7) // dig zen
-		obj.mode="digzen";
+    obj.mode="marathon20g";
+  else if(gametype===7) // dig zen
+    obj.mode="digzen";
   else
     return;
 
@@ -1757,6 +1870,7 @@ function trysubmitscore() {
     obj.time=time;
     obj.score=score.toString();
     obj.name=playername;
+    obj.replay=curreplaydata();
 
     submitscore(obj);
   }else{
@@ -1774,13 +1888,7 @@ function tryreplaydata() {
   init('replay',strreplay);
 }
 
-function showreplaydata() {
-  //var strreplay = Compress(JSON.stringify(replay));
-  var objKeys = replay.keys;
-  replay.keys = keysEncode(replay.keys);
-  var strreplay = JSON.stringify(replay);
-  replay.keys = objKeys;
-  //strreplay = strreplay + Compress(strreplay);
+function showreplaydata(strreplay) {
   /*
   var objblob = new Blob([strreplay],{type:"text/plain"});
   var url=URL.createObjectURL(objblob);
@@ -1789,4 +1897,14 @@ function showreplaydata() {
   replaydata.value = strreplay;
   replaydata.select();
   menu(6,1);
+}
+
+function curreplaydata() {
+  //var strreplay = Compress(JSON.stringify(replay));
+  var objKeys = replay.keys;
+  replay.keys = keysEncode(replay.keys);
+  var strreplay = JSON.stringify(replay);
+  replay.keys = objKeys;
+  //strreplay = strreplay + Compress(strreplay);
+  return strreplay;
 }
\ No newline at end of file
