diff --git a/lib/rocco.rb b/lib/rocco.rb
index 9e2a0eb..655d6c4 100644
--- a/lib/rocco.rb
+++ b/lib/rocco.rb
@@ -85,7 +85,7 @@ class Rocco
     }
     @options = defaults.merge(options)
     @sources = sources
-    @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars]}")
+    @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars]}\s?")
     @sections = highlight(split(parse(@data)))
   end
 
@@ -176,7 +176,7 @@ class Rocco
     # Do some post-processing on the pygments output to split things back
     # into sections and remove partial `<pre>` blocks.
     code_html = code_html.
-      split(/\n*<span class="c.">#{@options[:comment_chars]} DIVIDER<\/span>\n*/m).
+      split(/\n*<span class="c.?">#{@options[:comment_chars]} DIVIDER<\/span>\n*/m).
       map { |code| code.sub(/\n?<div class="highlight"><pre>/m, '') }.
       map { |code| code.sub(/\n?<\/pre><\/div>\n/m, '') }
 
diff --git a/lib/rocco/layout.mustache b/lib/rocco/layout.mustache
index 48c4af0..2f07f61 100644
--- a/lib/rocco/layout.mustache
+++ b/lib/rocco/layout.mustache
@@ -31,8 +31,8 @@
     {{#sections}}
     <tr id='section-{{ num }}'>
       <td class=docs>
-        <div class="octowrap">
-          <a class="octothorpe" href="#section-{{ num }}">#</a>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-{{ num }}">&#182;</a>
         </div>
         {{{ docs }}}
       </td>