Updates for part 2

comments.php

@@ -0,0 +1,27 @@
+<?php if ( post_password_required() ) {
+	return;
+} ?>
+	<div id="comments" class="comments-area">
+		<?php if ( have_comments() ) : ?>
+			<h3 class="comments-title">
+				<?php
+				printf( _nx( 'One comment on &ldquo;%2$s&rdquo;', '%1$s comments on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title'),
+					number_format_i18n( get_comments_number() ), get_the_title() );
+				?>
+			</h3>
+			<ul class="comment-list">
+				<?php 
+				wp_list_comments( array(
+					'short_ping'  => true,
+					'avatar_size' => 50,
+				) );
+				?>
+			</ul>
+		<?php endif; ?>
+		<?php if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
+			<p class="no-comments">
+				<?php _e( 'Comments are closed.' ); ?>
+			</p>
+		<?php endif; ?>
+		<?php comment_form(); ?>
+	</div>