diff --git a/documentation/index.html.erb b/documentation/index.html.erb
index f3670c4c32..b4185c50c6 100644
--- a/documentation/index.html.erb
+++ b/documentation/index.html.erb
@@ -40,8 +40,8 @@
     <p>
       <b>Disclaimer:</b>
       CoffeeScript is just for fun and seriously alpha. I'm sure that there are still
-      plenty of holes in the lexer and leaks in the syntax. <i>There is no guarantee,
-      explicit or implied, of its suitability for any purpose.</i> That said,
+      plenty of holes in the walls and leaks in the roof. <i>There are no guarantees
+      that the syntax won't change between versions.</i> That said,
       it compiles into clean JavaScript (the good parts) that can use existing
       JavaScript libraries seamlessly, and passes through
       <a href="http://www.jslint.com/">JSLint</a> without warnings. The compiled
@@ -537,12 +537,15 @@ coffee --print app/scripts/*.coffee > concatenation.js</pre>
     <ul>
       <li>
         <a href="http://github.com/jashkenas/coffee-script/">Source Code</a><br />
-        Use <tt>bin/coffee</tt> to test your changes, or <tt>rake gem:install</tt> to
-        create and install a custom version of the gem. If you're hacking on the
-        parser, use <tt>rake build:parser</tt> to rebuild it.
+        After checking out the source, make sure to run <tt>rake build:parser</tt>
+        to generate an up-to-date version of the Racc parser.
+        Use <tt>bin/coffee</tt> to test your changes, 
+        <tt>rake test</tt> to run the test suite,
+        and <tt>rake gem:install</tt> to
+        create and install a custom version of the gem.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs and Feature Requests</a>
+        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs, Feature Requests, and General Discussion</a>
       </li>
       <li>
         <a href="http://github.com/jnicklas/bistro_car">BistroCar</a><br />
diff --git a/index.html b/index.html
index 189bf2f779..7748866dd7 100644
--- a/index.html
+++ b/index.html
@@ -26,8 +26,8 @@ <h1><sub style="font-size: 100px;">&#9749;</sub> CoffeeScript</h1>
     <p>
       <b>Disclaimer:</b>
       CoffeeScript is just for fun and seriously alpha. I'm sure that there are still
-      plenty of holes in the lexer and leaks in the syntax. <i>There is no guarantee,
-      explicit or implied, of its suitability for any purpose.</i> That said,
+      plenty of holes in the walls and leaks in the roof. <i>There are no guarantees
+      that the syntax won't change between versions.</i> That said,
       it compiles into clean JavaScript (the good parts) that can use existing
       JavaScript libraries seamlessly, and passes through
       <a href="http://www.jslint.com/">JSLint</a> without warnings. The compiled
@@ -1227,12 +1227,15 @@ <h2 id="resources">Resources</h2>
     <ul>
       <li>
         <a href="http://github.com/jashkenas/coffee-script/">Source Code</a><br />
-        Use <tt>bin/coffee</tt> to test your changes, or <tt>rake gem:install</tt> to
-        create and install a custom version of the gem. If you're hacking on the
-        parser, use <tt>rake build:parser</tt> to rebuild it.
+        After checking out the source, make sure to run <tt>rake build:parser</tt>
+        to generate an up-to-date version of the Racc parser.
+        Use <tt>bin/coffee</tt> to test your changes, 
+        <tt>rake test</tt> to run the test suite,
+        and <tt>rake gem:install</tt> to
+        create and install a custom version of the gem.
       </li>
       <li>
-        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs and Feature Requests</a>
+        <a href="http://github.com/jashkenas/coffee-script/issues">Bugs, Feature Requests, and General Discussion</a>
       </li>
       <li>
         <a href="http://github.com/jnicklas/bistro_car">BistroCar</a><br />
diff --git a/test/fixtures/execution/test_funky_comments.coffee b/test/fixtures/execution/test_funky_comments.coffee
index 038c450a25..2072847e5e 100644
--- a/test/fixtures/execution/test_funky_comments.coffee
+++ b/test/fixtures/execution/test_funky_comments.coffee
@@ -7,4 +7,11 @@ func: =>
 # comment
   true
 
+switch 'string'
+  # comment
+  when false then something()
+  # comment
+  when null
+    something_else()
+
 print(func())