diff --git a/404.php b/404.php
index 3a025190..9ad1b32f 100644
--- a/404.php
+++ b/404.php
@@ -14,7 +14,7 @@ get_header(); ?>
 			<article id="post-0" class="post error404 not-found">
 				<header class="entry-header">
 					<h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
-				</header>
+				</header><!-- .entry-header -->
 
 				<div class="entry-content">
 					<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', '_s' ); ?></p>
@@ -28,7 +28,7 @@ get_header(); ?>
 						<ul>
 						<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
 						</ul>
-					</div>
+					</div><!-- .widget -->
 
 					<?php
 					/* translators: %1$s: smilie */
@@ -39,7 +39,7 @@ get_header(); ?>
 					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
 
 				</div><!-- .entry-content -->
-			</article><!-- #post-0 -->
+			</article><!-- #post-0 .post .error404 .not-found -->
 
 		</div><!-- #content -->
 	</div><!-- #primary .site-content -->
diff --git a/archive.php b/archive.php
index cec3654e..dc79c492 100644
--- a/archive.php
+++ b/archive.php
@@ -65,7 +65,7 @@ get_header(); ?>
 								echo apply_filters( 'tag_archive_meta', '<div class="taxonomy-description">' . $tag_description . '</div>' );
 						}
 					?>
-				</header>
+				</header><!-- .page-header -->
 
 				<?php rewind_posts(); ?>
 
diff --git a/comments.php b/comments.php
index f70b6879..21d87d67 100644
--- a/comments.php
+++ b/comments.php
@@ -39,7 +39,7 @@
 			<h1 class="assistive-text"><?php _e( 'Comment navigation', '_s' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
-		</nav>
+		</nav><!-- #comment-nav-before .site-navigation .comment-navigation -->
 		<?php endif; // check for comment navigation ?>
 
 		<ol class="commentlist">
@@ -52,14 +52,14 @@
 				 */
 				wp_list_comments( array( 'callback' => '_s_comment' ) );
 			?>
-		</ol>
+		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
 		<nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation">
 			<h1 class="assistive-text"><?php _e( 'Comment navigation', '_s' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
-		</nav>
+		</nav><!-- #comment-nav-below .site-navigation .comment-navigation -->
 		<?php endif; // check for comment navigation ?>
 
 	<?php endif; // have_comments() ?>
diff --git a/content.php b/content.php
index 4ed33b31..06286ca4 100644
--- a/content.php
+++ b/content.php
@@ -57,5 +57,5 @@
 		<?php endif; ?>
 
 		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
-	</footer><!-- #entry-meta -->
+	</footer><!-- .entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/header.php b/header.php
index 90f9891e..76b62c1b 100644
--- a/header.php
+++ b/header.php
@@ -56,7 +56,7 @@
 			<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', '_s' ); ?>"><?php _e( 'Skip to content', '_s' ); ?></a></div>
 
 			<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
-		</nav>
+		</nav><!-- .site-navigation .main-navigation -->
 	</header><!-- #masthead .site-header -->
 
 	<div id="main">
\ No newline at end of file
diff --git a/image.php b/image.php
index 9f0da9c7..48f72fff 100644
--- a/image.php
+++ b/image.php
@@ -78,7 +78,7 @@ get_header();
 							<?php if ( ! empty( $post->post_excerpt ) ) : ?>
 							<div class="entry-caption">
 								<?php the_excerpt(); ?>
-							</div>
+							</div><!-- .entry-caption -->
 							<?php endif; ?>
 						</div><!-- .entry-attachment -->
 
@@ -106,6 +106,6 @@ get_header();
 			<?php endwhile; // end of the loop. ?>
 
 			</div><!-- #content -->
-		</div><!-- #primary .site-content -->
+		</div><!-- #primary .site-content .image-attachment -->
 
 <?php get_footer(); ?>
\ No newline at end of file
diff --git a/no-results.php b/no-results.php
index 08c38221..797459e3 100644
--- a/no-results.php
+++ b/no-results.php
@@ -31,4 +31,4 @@
 
 		<?php } ?>
 	</div><!-- .entry-content -->
-</article><!-- #post-0 -->
+</article><!-- #post-0 .post .no-results .not-found -->
diff --git a/search.php b/search.php
index 37236991..f4bedcd5 100644
--- a/search.php
+++ b/search.php
@@ -15,7 +15,7 @@ get_header(); ?>
 
 				<header class="page-header">
 					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', '_s' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
-				</header>
+				</header><!-- .page-header -->
 
 				<?php _s_content_nav( 'nav-above' ); ?>