diff --git a/demo/index.html b/demo/index.html
index c3721a28..0d8efac3 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -17,13 +17,13 @@
         <div>
           <h2>Options</h2>
           <p>
-            <label>cursorBlink <input type="checkbox" id="option-cursor-blink"></label>
+            <label><input type="checkbox" id="option-cursor-blink"> cursorBlink</label>
           </p>
           <p>
             <label>scrollback <input type="number" id="option-scrollback" value="1000" /></label>
           </p>
           <p>
-            <label>tabStopWidth <input type="number" id="option-tabstopwidth" value="4" /></label>
+            <label>tabStopWidth <input type="number" id="option-tabstopwidth" value="8" /></label>
           </p>
           <div>
           	<h3>Size</h3>
diff --git a/demo/main.js b/demo/main.js
index fda6c809..b262ce53 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -16,8 +16,8 @@ var terminalContainer = document.getElementById('terminal-container'),
     rowsElement = document.getElementById('rows');
 
 function setTerminalSize () {
-  var cols = parseInt(colsElement.value),
-      rows = parseInt(rowsElement.value),
+  var cols = parseInt(colsElement.value, 10),
+      rows = parseInt(rowsElement.value, 10),
       width = (cols * charWidth).toString() + 'px',
       height = (rows * charHeight).toString() + 'px';
 
@@ -36,7 +36,7 @@ optionElements.scrollback.addEventListener('change', function () {
   term.setOption('scrollback', parseInt(optionElements.scrollback.value, 10));
 });
 optionElements.tabstopwidth.addEventListener('change', function () {
-  term.setOption('tabStopWidth', parseInt(optionElements.tabstopwidth.value));
+  term.setOption('tabStopWidth', parseInt(optionElements.tabstopwidth.value, 10));
 });
 
 createTerminal();
@@ -49,7 +49,7 @@ function createTerminal() {
   term = new Terminal({
     cursorBlink: optionElements.cursorBlink.checked,
     scrollback: parseInt(optionElements.scrollback.value, 10),
-    tabStopWidth: parseInt(optionElements.tabstopwidth.value)
+    tabStopWidth: parseInt(optionElements.tabstopwidth.value, 10)
   });
   term.on('resize', function (size) {
     if (!pid) {