diff --git a/Readme.md b/Readme.md
index 0841f109..10b84fc9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -20,7 +20,7 @@ Features
 Take Ace for a spin!
 --------------------
 
-Check out the Ace live [demo](http://ajaxorg.github.com/ace/editor-build.html) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.
+Check out the Ace live [demo](http://ajaxorg.github.com/ace/build/editor.html) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.
 
 History
 -------
@@ -45,7 +45,7 @@ The easiest version is simply:
     <div id="editor">some text</div>
     <script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
     <script>
-    document.onload = function() {
+    window.onload = function() {
         var editor = ace.edit("editor");
     };
     </script>
@@ -64,6 +64,7 @@ By default the editor only supports plain text mode. However all other language
     
 the mode can be used like this:
 
+    var JavaScriptMode = require("ace/mode/javascript").Mode;
     editor.getSession().setMode(new JavaScriptMode());
 
 Running Ace
diff --git a/build/Readme.md b/build/Readme.md
index 0841f109..10b84fc9 100644
--- a/build/Readme.md
+++ b/build/Readme.md
@@ -20,7 +20,7 @@ Features
 Take Ace for a spin!
 --------------------
 
-Check out the Ace live [demo](http://ajaxorg.github.com/ace/editor-build.html) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.
+Check out the Ace live [demo](http://ajaxorg.github.com/ace/build/editor.html) or get a [Cloud9 IDE account](http://run.cloud9ide.com) to experience Ace while editing one of your own GitHub projects.
 
 History
 -------
@@ -45,7 +45,7 @@ The easiest version is simply:
     <div id="editor">some text</div>
     <script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
     <script>
-    document.onload = function() {
+    window.onload = function() {
         var editor = ace.edit("editor");
     };
     </script>
@@ -64,6 +64,7 @@ By default the editor only supports plain text mode. However all other language
     
 the mode can be used like this:
 
+    var JavaScriptMode = require("ace/mode/javascript").Mode;
     editor.getSession().setMode(new JavaScriptMode());
 
 Running Ace
diff --git a/build/editor.html b/build/editor.html
index cbd4bc55..333cbcfa 100644
--- a/build/editor.html
+++ b/build/editor.html
@@ -21,13 +21,13 @@
 <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
 <script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
 <script>
-document.addEventListener("DOMContentLoaded", function() {
+window.onload = function() {
     var editor = ace.edit("editor");
     editor.setTheme("ace/theme/twilight");
     
     var JavaScriptMode = require("ace/mode/javascript").Mode;
     editor.getSession().setMode(new JavaScriptMode());
-}, false);
+};
 </script>
 
 </body>
diff --git a/build_support/editor.html b/build_support/editor.html
index cbd4bc55..333cbcfa 100644
--- a/build_support/editor.html
+++ b/build_support/editor.html
@@ -21,13 +21,13 @@
 <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
 <script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
 <script>
-document.addEventListener("DOMContentLoaded", function() {
+window.onload = function() {
     var editor = ace.edit("editor");
     editor.setTheme("ace/theme/twilight");
     
     var JavaScriptMode = require("ace/mode/javascript").Mode;
     editor.getSession().setMode(new JavaScriptMode());
-}, false);
+};
 </script>
 
 </body>
diff --git a/index.html b/index.html
index 25089119..cbd71fc9 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
 <br/>
 <br/>      </p>
 <h2>Demo</h2>
-Check out the <a href="editor-build.html">demo</a>.
+Check out the <a href="build/editor.html">demo</a>.
 <h2>Contact</h2>
 <p>Fabian Jakobs (fabian.jakobs@web.de)
 <br/>      </p>