diff --git a/ChangeLog b/ChangeLog
index 9191b21c..ffe50d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 <pre>
 date:
 	* version 0.4
+	* Esc now doesn't stop loading the webpage, use Ctrl-c instead, :stop command added
+	* changed hinttags to work with dict.leo.org and hintstyle to work with digg.com
 	* :back! goes to beginning of history now
 	* diabled firefox 3.0 support for now, as there are just too many small
 	  bugs
-	* :help <section> supported, :help set will show help for the :set command
+	* :help section supported, :help set will show help for the :set command
 	  (patch from Viktor Kojouharov)
 	* :source support, and auto-sourcing ~/.vimperatorrc on startup
+	* :javascript <<EOF support to execute multiline javascript code
 	* fixed saving of session
 	* fixed hints display when zooming in/out of a web page
 	* added 'B' command for continous buffer display
diff --git a/TODO b/TODO
index d18393cf..bea96474 100644
--- a/TODO
+++ b/TODO
@@ -11,9 +11,9 @@ BUGS:
 - reload/stop buttons don't update enabled state
 
 FEATURES:
-9 marks of a Location (also should work with directories), [m a-zA-Z] to set it, [' a-zA-Z] to go there
+9 marks of a Location, [m a-zA-Z] to set it, [` a-zA-Z] to go there
   [m 0-9] marks a buffer instead [' 0-9] goes there
-  also mark bookmarks (with mA-Z maybe and use only lowercase marks for inbuffer marks?)
+  also mark bookmarks (with M[a-zA-Z] maybe and use only lowercase marks for inbuffer marks?)
   also support :mark and :marks
 8 :open .. -> Up one directory, :cd goes to top location, [Backspace] command shortcut, use count (:3cd goes 3 levels up)
 8 downloading of links to filesystem (:save <filename>)
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index faff4038..54eaf3b5 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -326,6 +326,14 @@ var g_commands = [/*{{{*/
         source,
         function (filter) { return get_file_completions(filter); }
     ],
+    [
+        ["stop", "st"],
+        ["st[op]"],
+        "Stop loading<br/>" +
+        "Stop loading current web page.",
+        BrowserStop,
+        null
+    ],
     [
         ["tab"],
         ["tab {cmd}"],
@@ -830,12 +838,19 @@ var g_mappings = [/*{{{*/
         "When in 'ignorekeys' mode (activated by <code class=mapping>&lt;I&gt;</code>), <code class=mapping>&lt;C-v&gt;</code> will pass the next key to Vimperator instead of the webpage.",
         function(count) { addMode(MODE_ESCAPE_ONE_KEY); }
     ],
+    [ 
+        ["<C-c>"],
+        ["<C-c>"],
+        "Stop loading<br/>" +
+        "Stops loading the current webpage.",
+        BrowserStop,
+    ],
     [ 
         ["<Esc>", "<C-[>"], // if you ever add/remove keys here, also check them in the onVimperatorKeypress() function
         ["<Esc>", "<C-[>"],
         "Cancel any operation<br/>" +
-        "Stops loading the current webpage and exits any command line or hint mode.<br/>"+
-        "Also focuses the web page, in case a form field has focus, and eats our key presses.",
+        "Exits any command line or hint mode and returns to browser mode.<br/>"+
+        "Also focuses the web page, in case a form field has focus and eats our key presses.",
         onEscape
     ],
 
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 9b809076..7dde3bc4 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -733,7 +733,7 @@ function onEscape()
     if (!hasMode(MODE_ESCAPE_ONE_KEY))
     {
         setCurrentMode(MODE_NORMAL);
-        BrowserStop();
+        // BrowserStop(); -> moved to <C-c>
         hah.disableHahMode();
         focusContent(true, true);
     }