diff --git a/functions.php b/functions.php
index 5972e95..54c9c21 100644
--- a/functions.php
+++ b/functions.php
@@ -771,10 +771,16 @@ if ( function_exists('register_sidebar') ) {
 	) as $label) {
 		register_sidebar(array(
 			'name'=> $label,
-			'before_widget' => '<div id="%1$s">'."\r\n".'<div class="widget-head"><div>'."\r\n".'<div class="widget %2$s">'."\r\n",
-			'after_widget'  => '</div>'."\r\n".'<div class="widget-foot"></div>'."\r\n".'</div>'."\r\n",
-			'before_title'  => '<h2 class="widgettitle">'."\r\n",
-			'after_title'   => '</h2>'."\r\n"
+			'before_widget' => '
+	<div class="widget-head"></div>
+	<div id="%1$s" class="widget %2$s">
+',
+			'after_widget'  => '
+	</div>
+	<div class="widget-foot"></div>
+',
+			'before_title'  => '		<h2 class="widgettitle">',
+			'after_title'   => '</h2>'
 		));
 	}
 }
diff --git a/index.php b/index.php
index 5f8e36f..2208cd9 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,6 @@
 	if (have_posts()) {
 		while (have_posts()) : the_post();
 			comicpress_display_post();
-			comments_template();
 		endwhile; 
 	}
 	Restore(); 
@@ -26,7 +25,7 @@
 	<div id="blogheader"><!-- This area can be used for a heading above your main page blog posts --></div>
 <?php } ?>
 
-<?php if (!$comicpress_options[disable_blog_frontpage]) {
+<?php if (!$comicpress_options['disable_blog_frontpage']) {
 	global $blog_postcount; 
 	Protect();
 		if (!$comicpress_options['split_column_in_two']) {