diff --git a/comments.php b/comments.php
index 0205a27..5957769 100644
--- a/comments.php
+++ b/comments.php
@@ -1,72 +1,100 @@
-<?php
-/**
- * The template for displaying Comments.
- *
- * The area of the page that contains both current comments
- * and the comment form.  The actual display of comments is
- * handled by a callback to twentyten_comment which is
- * located in the functions.php file.
- */
-?>
-<div id="comments">
-<?php if ( post_password_required() ) : ?>
-				<p><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
-<?php
-		/* Stop the rest of comments.php from being processed,
-		 * but don't kill the script entirely -- we still have
-		 * to fully load the template.
-		 */
-		return;
-	endif;
-?>
-
-<?php
-	// You can start editing here -- including this comment!
-?>
-
-<?php if ( have_comments() ) : ?>
-			<!-- STARKERS NOTE: The following h3 id is left intact so that comments can be referenced on the page -->
-			
-			<h3 id="comments-title"><?php
-			printf( _n( 'One response to %2$s', '%1$s responses to %2$s', get_comments_number(), 'twentyten' ),
-			number_format_i18n( get_comments_number() ), '' . get_the_title() . '' );
-			?></h3>
-
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-				<?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?>
-				<?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?>
-<?php endif; // check for comment navigation ?>
-
-			<ol>
-				<?php
-					/* Loop through and list the comments. Tell wp_list_comments()
-					 * to use twentyten_comment() to format the comments.
-					 * If you want to overload this in a child theme then you can
-					 * define twentyten_comment() and that will be used instead.
-					 * See twentyten_comment() in twentyten/functions.php for more.
-					 */
-					wp_list_comments( array( 'callback' => 'twentyten_comment' ) );
-				?>
-			</ol>
-
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-				<?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?>
-				<?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?>
-<?php endif; // check for comment navigation ?>
-
-<?php else : // or, if we don't have comments:
-
-	/* If there are no comments and comments are closed,
-	 * let's leave a little note, shall we?
-	 */
-	if ( ! comments_open() ) :
-?>
-	<p><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
-<?php endif; // end ! comments_open() ?>
-
-<?php endif; // end have_comments() ?>
-
-
-<?php comment_form(); ?>
-
-</div><!--.comments-->
\ No newline at end of file
+<?php
+/**
+ * Template for displaying Comments
+ *
+ * The area of the page that contains both current comments
+ * and the comment form. The actual display of comments is
+ * handled by a callback to melville_comment which is
+ * located in the functions.php file.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Ten
+ * @since Twenty Ten 1.0
+ */
+ 
+ 
+ 
+ 
+ 
+?>
+
+			<div id="comments">
+<?php if ( post_password_required() ) : ?>
+				<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
+			</div><!-- #comments -->
+	<?php
+		/*
+		 * Stop the rest of comments.php from being processed,
+		 * but don't kill the script entirely -- we still have
+		 * to fully load the template.
+		 */
+		return;
+	endif;
+?>
+
+<?php
+	// You can start editing here -- including this comment!
+?>
+
+<?php if ( have_comments() ) : ?>
+			<h3 id="comments-title">
+			<?php
+			if ( 1 === get_comments_number() ) {
+				printf(
+					/* translators: %s: The post title. */
+					__( 'One Response to %s', 'twentyten' ),
+					'<em>' . get_the_title() . '</em>'
+				);
+			} else {
+				printf(
+					/* translators: %1$s: The number of comments. %2$s: The post title. */
+					_n( '%1$s Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
+					number_format_i18n( get_comments_number() ),
+					'<em>' . get_the_title() . '</em>'
+				);
+			}
+			?>
+			</h3>
+
+	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+			<div class="navigation">
+				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
+				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+			</div> <!-- .navigation -->
+	<?php endif; // Check for comment navigation. ?>
+
+			<ol class="commentlist">
+				<?php
+					/*
+					 * Loop through and list the comments. Tell wp_list_comments()
+					 * to use twentyten_comment() to format the comments.
+					 * If you want to overload this in a child theme then you can
+					 * define twentyten_comment() and that will be used instead.
+					 * See twentyten_comment() in twentyten/functions.php for more.
+					 */
+					wp_list_comments( array( 'callback' => 'melville_comment' ) );
+				?>
+			</ol>
+
+	<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+			<div class="navigation">
+				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
+				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
+			</div><!-- .navigation -->
+	<?php endif; // Check for comment navigation. ?>
+
+	<?php
+	/*
+	 * If there are no comments and comments are closed, let's leave a little note, shall we?
+	 * But we only want the note on posts and pages that had comments in the first place.
+	 */
+	if ( ! comments_open() && get_comments_number() ) :
+		?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
+	<?php endif; ?>
+
+<?php endif; // End have_comments(). ?>
+
+<?php comment_form(); ?>
+
+</div><!-- #comments -->
diff --git a/functions.php b/functions.php
index 80e203f..a3bb69c 100644
--- a/functions.php
+++ b/functions.php
@@ -13,14 +13,16 @@ add_action( 'wp_enqueue_scripts', 'melville_theme_styles' );
 
 //include 'plugins/drop-caps/wp_drop_caps.php';
 if (!function_exists('arl_kottke_archives')) {
-include 'plugins/arl_kottke_archives.php';
+	include 'plugins/arl_kottke_archives.php';
 }
+
 /**
  * Set the content width based on the theme's design and stylesheet.
  *
  * Used to set the width of images and content. Should be equal to the width the theme
  * is designed for, generally via the style.css stylesheet.
  */
+
 if ( ! isset( $content_width ) )
 	$content_width = 640;
 
diff --git a/style.css b/style.css
index f8b9540..4091788 100644
--- a/style.css
+++ b/style.css
@@ -455,8 +455,10 @@ border-color: #aaaaaa;
 
 /* @group Comments */
 
+
+
 form#commentform {
-	width: 400px;
+	width: 80%;
 }
 
 h3#reply-title, h3#comments-title {
@@ -481,7 +483,6 @@ p.comment-notes {
 	height: 17px;
 	width: 280px;
 	padding: 3px;
-	float:right;
 	margin: 0 50px 0 0;
 	border: 1px solid #dddddd;
 	background-color: #fcfcfc;
@@ -497,7 +498,6 @@ p.comment-notes {
 #commentform input#submit {
 	clear: both;
 	float: none;
-	width: 95px;
 	height: 22px;
 	margin: 20px 0 0 255px;
 	-webkit-border-radius: 03px;
@@ -554,6 +554,78 @@ p.form-allowed-tags {
 	display: none;
 }
 
+/* Comments form */
+input[type="submit"] {
+	color: #333;
+}
+#respond {
+	border-top: 1px solid #e7e7e7;
+	margin: 24px 0;
+	overflow: hidden;
+	position: relative;
+}
+#respond p {
+	margin: 0;
+}
+#respond .comment-notes {
+	margin-bottom: 1em;
+}
+.form-allowed-tags {
+	line-height: 1em;
+}
+.children #respond {
+	margin: 0 48px 0 0;
+}
+h3#reply-title {
+	margin: 18px 0;
+}
+#comments-list #respond {
+	margin: 0 0 18px 0;
+}
+#comments-list ul #respond {
+	margin: 0;
+}
+#cancel-comment-reply-link {
+	font-size: 12px;
+	font-weight: normal;
+	line-height: 18px;
+}
+#respond .required {
+	color: #ff4b33;
+	font-weight: bold;
+}
+#respond label {
+	color: #777;
+	font-size: 12px;
+}
+#respond input {
+	margin: 0 0 9px;
+	width: 98%;
+}
+#respond textarea {
+	width: 98%;
+}
+#respond .form-allowed-tags {
+	color: #777;
+	font-size: 12px;
+	line-height: 18px;
+}
+#respond .form-allowed-tags code {
+	font-size: 11px;
+}
+#respond .form-submit {
+	margin: 12px 0;
+}
+#respond .form-submit input {
+	font-size: 14px;
+	width: auto;
+}
+#respond #wp-comment-cookies-consent {
+	width: auto;
+	margin: 0 10px 0 0;
+}
+
+
 /* @end */
 
 /* @group Menu */
@@ -611,21 +683,46 @@ span.older-posts a, span.newer-posts a{
 }
 
 /* NEW THINGS! */
-
-#site-title {
-	padding-top: 30px;
-}
+#site-title { padding-top: 30px; }
 
 /* menu styles */
-.melville_menu ul {list-style: none; padding:0px;}
-.melville_menu ul ul {display: none;position:absolute;background-color: white;}
-.melville_menu li {display:inline-block; padding-right: 20px;}
-.melville_menu li a {text-decoration: none;}
-.melville_menu li:hover ul {display: block;}
-.melville_menu li li {display:block; text-align: left; padding-top: 10px; padding-left: 5px;}
+.melville_menu ul
+{
+	list-style: none;
+	padding: 0px;
+}
 
-.melville_menu li ul {}
-.melville_menu li li a {}
-.melville_menu { text-align: center; font-variant: small-caps;}
+.melville_menu ul ul
+{
+	display: none;
+	position: absolute;
+	background-color: white;
+}
 
-/* @end */
+.melville_menu li
+{
+	display: inline-block;
+	padding-right: 20px;
+}
+
+.melville_menu li a { text-decoration: none; }
+.melville_menu li:hover ul { display: block; }
+
+.melville_menu li li
+{
+	display: block;
+	text-align: left;
+	padding-top: 10px;
+	padding-left: 5px;
+}
+
+.melville_menu li ul { }
+.melville_menu li li a { }
+
+.melville_menu
+{
+	text-align: center;
+	font-variant: small-caps;
+}
+
+/* @end */
\ No newline at end of file