diff --git a/index.html b/index.html
index fbcde40..d891871 100644
--- a/index.html
+++ b/index.html
@@ -205,6 +205,8 @@
             </div>
             <p>Game speed:
                 <select name="speed">
+                    <option value="100">100× faster</option>
+                    <option value="50">50× faster</option>
                     <option value="20">20× faster</option>
                     <option value="10">10× faster</option>
                     <option value="5">5× faster</option>
diff --git a/js/format-c2g.js b/js/format-c2g.js
index 472bddb..a54a642 100644
--- a/js/format-c2g.js
+++ b/js/format-c2g.js
@@ -32,7 +32,10 @@ class CC2Demo {
             l--;
         }
         for (let p = 3; p < l; p += 2) {
-            duration += this.bytes[p];
+            let delay = this.bytes[p];
+            if (delay === 0xff)
+                break;
+            duration += delay;
         }
         duration = Math.floor(duration / 3);
 
@@ -66,15 +69,18 @@ class CC2Demo {
         // TODO maybe turn this into, like, a type, or something
         return {
             inputs: inputs,
+            final_input: input,
             length: duration,
             get(t) {
-                if (t >= this.inputs.length) {
-                    return new Set;
+                let input;
+                if (t < this.inputs.length) {
+                    input = this.inputs[t];
                 }
                 else {
-                    let input = this.inputs[t];
-                    return new Set(Object.entries(CC2_DEMO_INPUT_MASK).filter(([action, bit]) => input & bit).map(([action, bit]) => action));
+                    // Last input is implicitly repeated indefinitely
+                    input = this.final_input;
                 }
+                return new Set(Object.entries(CC2_DEMO_INPUT_MASK).filter(([action, bit]) => input & bit).map(([action, bit]) => action));
             },
         };
     }