diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index a70e5d86..af40f234 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1678,7 +1678,7 @@ table.settings th {\
         '<p align=center bgcolor=blue borderwidth=1><b>First there was a Navigator, then there was an Explorer. Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</b></p>'
 
     var introduction = '<h2>Introduction</h2>' +
-        '<p><a href="http://vimperator.mozdev.net">Vimperator</a> is a free browser add-on for Firefox, which makes it look and behave like the <a href="http://www.vim.org">Vim</a> text editor. ' +
+        '<p><a href="http://vimperator.mozdev.org">Vimperator</a> is a free browser add-on for Firefox, which makes it look and behave like the <a href="http://www.vim.org">Vim</a> text editor. ' +
         'It has similar key bindings, and you could call it a modal webbrowser, as key bindings differ according to which mode you are in.</p>' +
 
         '<p><font color=red><b>Warning:</b></font> To provide the most authentic Vim experience, the Firefox menubar and toolbar were hidden. If you really need them, type: <code class=command>:set guioptions=mT</code> to get it back. ' +
@@ -1713,7 +1713,7 @@ table.settings th {\
         var ret = "";
         for (var i=0; i < commands.length; i++)
         {
-            ret += '<tr>';
+            ret += '<tr valign="top">';
             var command = "<td>";
             for (var j=0; j < commands[i][0].length; j++)
             {
diff --git a/chrome/content/vimperator/hints.js b/chrome/content/vimperator/hints.js
index e09a5514..9bb8f67f 100644
--- a/chrome/content/vimperator/hints.js
+++ b/chrome/content/vimperator/hints.js
@@ -212,9 +212,13 @@ function hit_a_hint()
         if (linkCount == 0 && hintmode != HINT_MODE_ALWAYS)
         {
             beep();
-            linkNumString = '';
-            hintedElems = [];
-            isHahModeEnabled = false;
+            alert('h');
+            this.disableHahMode(win);
+            alert('g');
+//            setCurrentMode(MODE_NORMAL);
+//            linkNumString = '';
+//            hintedElems = [];
+//            isHahModeEnabled = false;
             return;
         }
 
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 74c2fe5b..fefb31c6 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -125,8 +125,8 @@ nsBrowserStatusHandler.prototype =
         },
     onLocationChange:function (aWebProgress, aRequest, aLocation)
         {
-            // firefox 3.0 doesn't seem to have them anymore
-            if (UpdateBackForwardButtons)
+            // firefox 3.0 doesn't seem to have this function anymore
+            if (typeof UpdateBackForwardButtons == "function")
                 UpdateBackForwardButtons();
 
             var url = aLocation.spec;