diff --git a/documentation/index.html.erb b/documentation/index.html.erb
index 4f9c0f18..1f64a377 100644
--- a/documentation/index.html.erb
+++ b/documentation/index.html.erb
@@ -65,7 +65,7 @@
         <a href="#cake">Cake, and Cakefiles</a>
         <a href="#scripts">"text/coffeescript" Script Tags</a>
         <a href="#resources">Books, Screencasts, Examples and Resources</a>
-        <a href="#change_log">Change Log</a>
+        <a href="#changelog">Change Log</a>
       </div>
     </div>
     <div class="navigation try">
@@ -1082,7 +1082,7 @@ Expressions
     </p>
 
     <h2>
-      <span id="change_log" class="bookmark"></span>
+      <span id="changelog" class="bookmark"></span>
       Change Log
     </h2>
     
diff --git a/index.html b/index.html
index 3e657445..0cf5db48 100644
--- a/index.html
+++ b/index.html
@@ -43,7 +43,7 @@
         <a href="#cake">Cake, and Cakefiles</a>
         <a href="#scripts">"text/coffeescript" Script Tags</a>
         <a href="#resources">Books, Screencasts, Examples and Resources</a>
-        <a href="#change_log">Change Log</a>
+        <a href="#changelog">Change Log</a>
       </div>
     </div>
     <div class="navigation try">
@@ -93,7 +93,7 @@
 
     <p>
       <b>CoffeeScript is a little language that compiles into JavaScript.</b> Underneath
-      all those awkward braces and semicolons, JavaScript has always had
+      all of those embarrassing braces and semicolons, JavaScript has always had
       a gorgeous object model at its heart. CoffeeScript is an attempt to expose
       the good parts of JavaScript in a simple way.
     </p>
@@ -102,9 +102,8 @@
       The golden rule of CoffeeScript is: <i>"It's just JavaScript"</i>. The code
       compiles one-to-one into the equivalent JS, and there is
       no interpretation at runtime. You can use any existing JavaScript library
-      seamlessly from CoffeeScript (and vice-versa). The compiled output is 
-      readable and pretty-printed, passes through 
-      <a href="http://www.javascriptlint.com/">JavaScript Lint</a>
+      seamlessly (and vice-versa). The compiled output is readable and pretty-printed,
+      passes through <a href="http://www.javascriptlint.com/">JavaScript Lint</a>
       without warnings, will work in every JavaScript implementation, and tends
       to run as fast or faster than the equivalent handwritten JavaScript.
     </p>
@@ -301,7 +300,8 @@ sudo bin/cake install</pre>
         <td width="25%"><code>-i, --interactive</code></td>
         <td>
           Launch an interactive CoffeeScript session to try short snippets.
-          Identical to calling <tt>coffee</tt> with no arguments.
+          More pleasant if wrapped with
+          <a href="http://utopia.knoware.nl/~hlub/uck/rlwrap/rlwrap.html">rlwrap</a>.
         </td>
       </tr>
       <tr>
@@ -322,8 +322,8 @@ sudo bin/cake install</pre>
       <tr>
         <td><code>-w, --watch</code></td>
         <td>
-          Watch files for changes, rerunning the specified command when any
-          file is updated.
+          Watch the modification times of the coffee-scripts, recompiling as
+          soon as a change occurs.
         </td>
       </tr>
       <tr>
@@ -368,8 +368,8 @@ sudo bin/cake install</pre>
       <tr>
         <td><code>-b, --bare</code></td>
         <td>
-          Compile the JavaScript without the 
-          <a href="#lexical_scope">top-level function safety wrapper</a>.
+          Compile the JavaScript without the top-level function safety wrapper.
+          (Used for CoffeeScript as a Node.js module.)
         </td>
       </tr>
       <tr>
@@ -410,9 +410,9 @@ Expressions
 
     <ul>
       <li>
-        Compile a directory tree of <tt>.coffee</tt> files in <tt>src</tt> into a parallel
-        tree of <tt>.js</tt> files in <tt>lib</tt>:<br />
-        <tt>coffee --compile --output lib/ src/</tt>
+        Compile a directory tree of <tt>.coffee</tt> files into a parallel
+        tree of <tt>.js</tt>, in <tt>lib</tt>:<br />
+        <tt>coffee -o lib/ -c src/</tt>
       </li>
       <li>
         Watch a file for changes, and recompile it every time the file is saved:<br />
@@ -426,10 +426,6 @@ Expressions
         Print out the compiled JS from a one-liner:<br />
         <tt>coffee -bpe "alert i for i in [0..10]"</tt>
       </li>
-      <li>
-        All together now, watch and recompile an entire project as you work on it:<br />
-        <tt>coffee -o lib/ -cw src/</tt>
-      </li>
       <li>
         Start the CoffeeScript REPL:<br />
         <tt>coffee</tt>
@@ -2095,18 +2091,8 @@ task(<span class="String"><span class="String">'</span>build:parser<span class="
     <h2>
       Examples
     </h2>
-    
-    <p>
-      The <a href="https://github.com/languages/coffeescript">best list of 
-      open-source CoffeeScript examples</a> can be found on GitHub. But just
-      to throw out few more:
-    </p>
 
     <ul>
-      <li>
-        <b>github</b>'s <a href="http://hubot.github.com/">Hubot</a>,
-        a friendly IRC robot that can perform any number of useful and useless tasks.
-      </li>
       <li>
         <b>sstephenson</b>'s <a href="http://pow.cx/">Pow</a>,
         a zero-configuration Rack server, with comprehensive annotated source.
@@ -2122,7 +2108,7 @@ task(<span class="String"><span class="String">'</span>build:parser<span class="
       </li>
       <li>
         <b>assaf</b>'s <a href="http://zombie.labnotes.org/">Zombie.js</a>,
-        a headless, full-stack, faux-browser testing library for Node.js.
+        A headless, full-stack, faux-browser testing library for Node.js.
       </li>
       <li>
         <b>jashkenas</b>' <a href="documentation/docs/underscore.html">Underscore.coffee</a>, a port
@@ -2195,7 +2181,7 @@ task(<span class="String"><span class="String">'</span>build:parser<span class="
     </p>
 
     <h2>
-      <span id="change_log" class="bookmark"></span>
+      <span id="changelog" class="bookmark"></span>
       Change Log
     </h2>
     
@@ -2210,34 +2196,19 @@ task(<span class="String"><span class="String">'</span>build:parser<span class="
           out and keep it readable, as you can see in the examples on this page.
         </li>
         <li>
-          You can now call <tt>super</tt> in class level methods in class bodies, 
-          and bound class methods now preserve their correct context.
+          
         </li>
         <li>
-          JavaScript has always supported octal numbers <tt>010 is 8</tt>,
-          and hexadecimal numbers <tt>0xf is 15</tt>, but CoffeeScript now
-          also supports binary numbers: <tt>0b10 is 2</tt>.
+          
         </li>
         <li>
-          The CoffeeScript module has been nested under a subdirectory to make 
-          it easier to <tt>require</tt> individual components separately, without
-          having to use <b>npm</b>. For example, after adding the CoffeeScript
-          folder to your path: <tt>require('coffee-script/lexer')</tt>
+          
         </li>
         <li>
-          There's a new "link" feature in Try CoffeeScript on this webpage. Use
-          it to get a shareable permalink for your example script.
+          
         </li>
         <li>
-          The <tt>coffee --watch</tt> feature now only works on Node.js 0.6.0 
-          and higher, but now also works properly on Windows.
-        </li>
-        <li>
-          Lots of small bug fixes from 
-          <b><a href="https://github.com/michaelficarra">@michaelficarra</a></b>,
-          <b><a href="https://github.com/geraldalewis">@geraldalewis</a></b>,
-          <b><a href="https://github.com/satyr">@satyr</a></b>, and
-          <b><a href="https://github.com/trevorburnham">@trevorburnham</a></b>.
+          
         </li>
       </ul>
     </p>