diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index 087db8d07e..49e5c8ea9e 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -51,7 +51,7 @@
 										$metadata['height']
 									)
 								);
-							}							
+							}
 						?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-meta -->
@@ -82,7 +82,7 @@
 <?php else : ?>
 						<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
 <?php endif; ?>
-						</div>
+						</div><!-- .entry-attachment -->
 						<div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
 
 <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index bf36a2bc4a..c60744f2c0 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -32,12 +32,12 @@ if ( get_the_author_meta( 'description' ) ) : ?>
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
-						</div><!-- #author-avatar 	-->
+						</div><!-- #author-avatar -->
 						<div id="author-description">
 							<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
 						</div><!-- #author-description	-->
-					</div><!-- .entry-author-info -->
+					</div><!-- #entry-author-info -->
 <?php endif; ?>
 
 <?php
diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index d4290ab1e4..6604642356 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -16,7 +16,7 @@
 			<div id="comments">
 <?php if ( post_password_required() ) : ?>
 				<div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
-			</div><!-- .comments -->
+			</div><!-- #comments -->
 <?php
 		/* Stop the rest of comments.php from being processed,
 		 * but don't kill the script entirely -- we still have
@@ -40,7 +40,7 @@
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
-			</div>
+			</div> <!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
 			<ol class="commentlist">
@@ -59,7 +59,7 @@
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyten' ) ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyten' ) ); ?></div>
-			</div>
+			</div><!-- .navigation -->
 <?php endif; // check for comment navigation ?>
 
 <?php else : // or, if we don't have comments:
@@ -70,7 +70,7 @@
 	if ( ! comments_open() ) :
 ?>
 	<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
-<?php endif; // end ! comments_opened() ?>
+<?php endif; // end ! comments_open() ?>
 
 <?php endif; // end have_comments() ?>
 
diff --git a/wp-content/themes/twentyten/editor-style-rtl.css b/wp-content/themes/twentyten/editor-style-rtl.css
index 8858fffe04..2c69a7c508 100644
--- a/wp-content/themes/twentyten/editor-style-rtl.css
+++ b/wp-content/themes/twentyten/editor-style-rtl.css
@@ -1,3 +1,9 @@
+/*
+Theme Name: Twenty Ten
+*/
+/*
+Used to style the TinyMCE editor.
+*/
 html .mceContentBody{
 	direction:rtl;
 	unicode-bidi:embed;
diff --git a/wp-content/themes/twentyten/editor-style.css b/wp-content/themes/twentyten/editor-style.css
index 57a793872d..d8cae0ac98 100644
--- a/wp-content/themes/twentyten/editor-style.css
+++ b/wp-content/themes/twentyten/editor-style.css
@@ -1,3 +1,9 @@
+/*
+Theme Name: Twenty Ten
+*/
+/*
+Used to style the TinyMCE editor.
+*/
 html .mceContentBody {
 	max-width:640px;
 }
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index f6caf89421..61f2d9480e 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -26,7 +26,7 @@
 				<a href="<?php echo home_url( '/' ) ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
 					<?php bloginfo( 'name' ); ?>
 				</a>
-			</div>
+			</div><!-- #site-info -->
 
 			<div id="site-generator">
 				<?php do_action( 'twentyten_credits' ); ?>
@@ -34,14 +34,20 @@
 						title="<?php esc_attr_e('Semantic Personal Publishing Platform', 'twentyten'); ?>" rel="generator">
 					<?php printf( __('Proudly powered by %s.', 'twentyten'), 'WordPress' ); ?>
 				</a>
-			</div>
+			</div><!-- #site-generator -->
 
 		</div><!-- #colophon -->
 	</div><!-- #footer -->
 
 </div><!-- #wrapper -->
 
-<?php wp_footer(); ?>
+<?php
+	/* Always have wp_footer() just before the closing </body>
+	 * tag of your theme, or you will break many plugins, which
+	 * generally use this hook to reference JavaScript files.
+	 */
 
+	wp_footer();
+?>
 </body>
 </html>
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index e91c88d079..3f697becf4 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -31,7 +31,7 @@
  * }
  * </code>
  *
- * For more information on hooks, see http://codex.wordpress.org/Plugin_API.
+ * For more information on hooks, actions, and filters, see http://codex.wordpress.org/Plugin_API.
  *
  * @package WordPress
  * @subpackage Twenty_Ten
@@ -110,7 +110,8 @@ function twentyten_setup() {
 	define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
 
 	// We'll be using post thumbnails for custom header images on posts and pages.
-	// We want them to be 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit).
+	// We want them to be 940 pixels wide by 198 pixels tall.
+	// Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
 	set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
 
 	// Don't support text inside the header image.
@@ -133,43 +134,43 @@ function twentyten_setup() {
 		'cherryblossom' => array(
 			'url' => '%s/images/headers/cherryblossoms.jpg',
 			'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Cherry Blossoms', 'twentyten' )
 		),
 		'concave' => array(
 			'url' => '%s/images/headers/concave.jpg',
 			'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Concave', 'twentyten' )
 		),
 		'fern' => array(
 			'url' => '%s/images/headers/fern.jpg',
 			'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Fern', 'twentyten' )
 		),
 		'forestfloor' => array(
 			'url' => '%s/images/headers/forestfloor.jpg',
 			'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Forest Floor', 'twentyten' )
 		),
 		'inkwell' => array(
 			'url' => '%s/images/headers/inkwell.jpg',
 			'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Inkwell', 'twentyten' )
 		),
 		'path' => array(
 			'url' => '%s/images/headers/path.jpg',
 			'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Path', 'twentyten' )
 		),
 		'sunset' => array(
 			'url' => '%s/images/headers/sunset.jpg',
 			'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
-			/* translators: header image description */			
+			/* translators: header image description */
 			'description' => __( 'Sunset', 'twentyten' )
 		)
 	) );
@@ -288,7 +289,7 @@ function twentyten_comment( $comment, $args, $depth ) {
 		<div class="comment-author vcard">
 			<?php echo get_avatar( $comment, 40 ); ?>
 			<?php printf( __( '%s <span class="says">says:</span>', 'twentyten' ), sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ) ); ?>
-		</div>
+		</div><!-- .comment-author .vcard -->
 		<?php if ( $comment->comment_approved == '0' ) : ?>
 			<em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
 			<br />
@@ -299,14 +300,14 @@ function twentyten_comment( $comment, $args, $depth ) {
 				/* translators: 1: date, 2: time */
 				printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' );
 			?>
-		</div>
+		</div><!-- .comment-meta .commentmetadata -->
 
 		<div class="comment-body"><?php comment_text(); ?></div>
 
 		<div class="reply">
 			<?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-		</div>
-	</div>
+		</div><!-- .reply -->
+	</div><!-- #comment-##  -->
 
 	<?php else : ?>
 	<li class="post pingback">
@@ -325,7 +326,7 @@ endif;
  * @uses register_sidebar
  */
 function twentyten_widgets_init() {
-	// Area 1
+	// Area 1, located at the top of the sidebar.
 	register_sidebar( array(
 		'name' => __( 'Primary Widget Area', 'twentyten' ),
 		'id' => 'primary-widget-area',
@@ -336,7 +337,7 @@ function twentyten_widgets_init() {
 		'after_title' => '</h3>',
 	) );
 
-	// Area 2
+	// Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
 	register_sidebar( array(
 		'name' => __( 'Secondary Widget Area', 'twentyten' ),
 		'id' => 'secondary-widget-area',
@@ -347,7 +348,7 @@ function twentyten_widgets_init() {
 		'after_title' => '</h3>',
 	) );
 
-	// Area 3
+	// Area 3, located in the footer. Empty by default.
 	register_sidebar( array(
 		'name' => __( 'First Footer Widget Area', 'twentyten' ),
 		'id' => 'first-footer-widget-area',
@@ -358,7 +359,7 @@ function twentyten_widgets_init() {
 		'after_title' => '</h3>',
 	) );
 
-	// Area 4
+	// Area 4, located in the footer. Empty by default.
 	register_sidebar( array(
 		'name' => __( 'Second Footer Widget Area', 'twentyten' ),
 		'id' => 'second-footer-widget-area',
@@ -369,7 +370,7 @@ function twentyten_widgets_init() {
 		'after_title' => '</h3>',
 	) );
 
-	// Area 5
+	// Area 5, located in the footer. Empty by default.
 	register_sidebar( array(
 		'name' => __( 'Third Footer Widget Area', 'twentyten' ),
 		'id' => 'third-footer-widget-area',
@@ -380,7 +381,7 @@ function twentyten_widgets_init() {
 		'after_title' => '</h3>',
 	) );
 
-	// Area 6
+	// Area 6, located in the footer. Empty by default.
 	register_sidebar( array(
 		'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
 		'id' => 'fourth-footer-widget-area',
@@ -422,13 +423,12 @@ function twentyten_posted_on() {
 			esc_attr( get_the_time() ),
 			get_the_date()
 		),
-		sprintf( '</span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 
+		sprintf( '</span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
 			get_author_posts_url( get_the_author_meta( 'ID' ) ),
 			sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
 			get_the_author()
 		)
 	);
-	
 }
 endif;
 
@@ -453,6 +453,6 @@ function twentyten_posted_in() {
 		$tag_list,
 		get_permalink(),
 		the_title_attribute( 'echo=0' )
-	);	
+	);
 }
 endif;
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index b23e361d9c..9075db46a3 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -13,30 +13,44 @@
 <head>
 	<meta charset="<?php bloginfo( 'charset' ); ?>" />
 	<title>
-	<?php
-		if ( is_single() ) {
+	<?php // Returns the title based on what is being viewed
+		if ( is_single() ) { // single posts
 			single_post_title(); echo ' | '; bloginfo( 'name' );
+		// The home page or, if using a static front page, the blog posts page.
 		} elseif ( is_home() || is_front_page() ) {
-			bloginfo( 'name' ); 
-			if( get_bloginfo( 'description' ) ) 
-				echo ' | ' ; bloginfo( 'description' ); 
+			bloginfo( 'name' );
+			if( get_bloginfo( 'description' ) )
+				echo ' | ' ; bloginfo( 'description' );
 			twentyten_the_page_number();
-		} elseif ( is_page() ) {
+		} elseif ( is_page() ) { // WordPress Pages
 			single_post_title( '' ); echo ' | '; bloginfo( 'name' );
-		} elseif ( is_search() ) {
+		} elseif ( is_search() ) { // Search results
 			printf( __( 'Search results for %s', 'twentyten' ), '"'.get_search_query().'"' ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
-		} elseif ( is_404() ) {
+		} elseif ( is_404() ) {  // 404 (Not Found)
 			_e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
-		} else {
+		} else { // Otherwise:
 			wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
 		}
 	?>
 	</title>
 	<link rel="profile" href="http://gmpg.org/xfn/11" />
 	<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
-	<?php if ( is_singular() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?>
 	<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
-	<?php wp_head(); ?>
+<?php
+	/* We add some JavaScript to pages with the comment form
+	 * to support sites with threaded comments (when in use).
+	 */
+	if ( is_singular() && get_option( 'thread_comments' ) )
+		wp_enqueue_script( 'comment-reply' );
+
+	/* Always have wp_head() just before the closing </head>
+	 * tag of your theme, or you will break many plugins, which
+	 * generally use this hook to add elements to <head> such
+	 * as styles, scripts, and meta tags.
+	 */
+
+	wp_head();
+?>
 </head>
 
 <body <?php body_class(); ?>>
@@ -66,7 +80,9 @@
 			</div><!-- #branding -->
 
 			<div id="access" role="navigation">
+			  <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
+				<?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu.  The menu assiged to the primary position is the one used.  If none is assigned, the menu with the lowest ID is used.  */ ?>
 				<?php wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
 			</div><!-- #access -->
 		</div><!-- #masthead -->
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 74a3fc40b2..b31d30f4bf 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -7,6 +7,12 @@
  * http://codex.wordpress.org/Template_Tags to understand
  * the tags used in it.
  *
+ * This can be overridden in child themes with loop.php or
+ * loop-template.php, where 'template' is the loop context
+ * requested by a template. For example, loop-index.php would
+ * be used if it exists and we ask for the loop with:
+ * <code>get_template_part( 'loop', 'index' );</code>
+ *
  * @package WordPress
  * @subpackage Twenty_Ten
  * @since Twenty Ten 1.0
@@ -68,7 +74,7 @@
 	$image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
 ?>
 					<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
-				</div>
+				</div><!-- .gallery-thumb -->
 				<p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
 						'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
 						$total_images
@@ -82,8 +88,8 @@
 				<span class="meta-sep">|</span>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-			</div><!-- #entry-utility -->
-		</div>
+			</div><!-- .entry-utility -->
+		</div><!-- #post-## -->
 
 <?php /* How to display posts in the asides category */ ?>
 
@@ -105,8 +111,8 @@
 				<span class="meta-sep">|</span>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-			</div><!-- #entry-utility -->
-		</div><!-- #post-(id) -->
+			</div><!-- .entry-utility -->
+		</div><!-- #post-## -->
 
 <?php /* How to display all other posts. */ ?>
 
@@ -147,7 +153,7 @@
 				<?php endif; ?>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-			</div><!-- #entry-utility -->
+			</div><!-- .entry-utility -->
 		</div><!-- #post-<?php the_ID(); ?> -->
 
 		<?php comments_template( '', true ); ?>
diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php
index e8dcc14694..38560b9e3f 100644
--- a/wp-content/themes/twentyten/search.php
+++ b/wp-content/themes/twentyten/search.php
@@ -29,7 +29,7 @@
 						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
 						<?php get_search_form(); ?>
 					</div><!-- .entry-content -->
-				</div>
+				</div><!-- #post-0 -->
 <?php endif; ?>
 			</div><!-- #content -->
 		</div><!-- #container -->
diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php
index ac15e28123..7a330fd30f 100644
--- a/wp-content/themes/twentyten/single.php
+++ b/wp-content/themes/twentyten/single.php
@@ -46,14 +46,14 @@
 								</a>
 							</div><!-- #author-link	-->
 						</div><!-- #author-description -->
-					</div><!-- .entry-author-info -->
+					</div><!-- #entry-author-info -->
 <?php endif; ?>
 
 					<div class="entry-utility">
 						<?php twentyten_posted_in(); ?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-utility -->
-				</div><!-- #post-(id) -->
+				</div><!-- #post-## -->
 
 				<div id="nav-below" class="navigation">
 					<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>