diff --git a/IPython/html/static/notebook/js/tour.js b/IPython/html/static/notebook/js/tour.js
index 8281f28..9d4b1ad 100644
--- a/IPython/html/static/notebook/js/tour.js
+++ b/IPython/html/static/notebook/js/tour.js
@@ -55,39 +55,36 @@ var tour_steps = [
     title: "Edit Mode",
     placement: 'bottom',
     onShow: function(tour) { IPython.notebook.edit_mode(); },
-    content: "By pressing Enter or clicking in the input area of cell, a we switched to Edit Mode."
-  }, {    
-    element: "#modal_indicator",
-    title: "Edit Mode",
-    placement: 'bottom',
-    content: "Regular typing will go into the currently active cell."
+    content: "Pressing Enter or clicking in the input text area of the cell switches to Edit Mode."
   }, {
     element: '.selected',
     title: "Edit Mode",
     placement: 'bottom',
     content: "Notice that the border around the currently active cell changed color."
-  }, {
-    element: '.selected',
+  }, {    
+    element: ".selected",
     title: "Edit Mode",
     placement: 'bottom',
-    onHide: function(tour) { IPython.notebook.command_mode(); },
-    content: "Typing in edit mode"
+    content: "Regular typing will insert text into the currently active cell."
   }, {
     element: '.selected',
     title: "back to Command Mode",
     placement: 'bottom',
     onShow: function(tour) { IPython.notebook.command_mode(); },
-    content: "Pressing Esc or clicking outside of the input text area takes you back to command mode."
+    onHide: function(tour) { $('#help_menu').parent().find('a').first().click(); },
+    content: "Pressing Esc or clicking outside of the input text area takes you back to Command Mode."
   }, {
-    element: '.selected',
-    title: "Command Mode",
+    element: '#keyboard_shortcuts',
+    title: "Keyboard Shortcuts",
     placement: 'bottom',
-    onHide: function(tour) { IPython.notebook.command_mode(); },
-    content: "This mode exposes many keyboard shortcuts."
+    onHide: function(tour) { $('#help_menu').parent().find('a').first().click(); },
+    content: "You can click here to get a list of all of the keyboard shortcuts."
   }, {
     element: "#kernel_indicator",
     title: "Kernel indicator",
     placement: 'bottom',
+    onShow: function(tour) { $([IPython.events]).trigger('status_idle.Kernel');},
+
     content: "This is the Kernel indicator. It looks like this when the Kernel is idle.",
   }, {
     element: "#kernel_indicator",
diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html
index 71e4e34..c06648a 100644
--- a/IPython/html/templates/notebook.html
+++ b/IPython/html/templates/notebook.html
@@ -215,7 +215,7 @@ class="notebook_app"
         </li>
         <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">Help</a>
             <ul  id="help_menu" class="dropdown-menu">
-                <li id="notebook_tour" title="A quick tour of the notebook user interfaces"><a href="#">User Interace Tour</a></li>
+                <li id="notebook_tour" title="A quick tour of the notebook user interface"><a href="#">User Interface Tour</a></li>
                 <li id="keyboard_shortcuts" title="Opens a tooltip with all keyboard shortcuts"><a href="#">Keyboard Shortcuts</a></li>
                 <li class="divider"></li>
                 {% set