diff --git a/archive-blog-year.php b/archive-blog-year.php
index 2349274..e98e680 100644
--- a/archive-blog-year.php
+++ b/archive-blog-year.php
@@ -11,8 +11,8 @@ if (isset($_GET['archive_year'])) {
 } else { 
 	$latest_comic = get_terminal_post_in_category(get_all_comic_categories_as_cat_string(),false); 
 	$archive_year = get_post_time('Y', false, $latest_comic, true); 
-	if (empty($archive_year)) $archive_year = date('Y'); 
 }
+if (empty($archive_year)) $archive_year = date('Y'); 
 ?> 
 
 
diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index a1f7032..7857760 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -13,11 +13,10 @@ $dayWidth = 22; //set to .cpcal-day total width in pixels including: width, left
 	if (isset($_GET['archive_year'])) { 
 		$archive_year = (int)$_GET['archive_year']; 
 	} else { 
-		$latest_comic = get_terminal_post_in_category(get_all_comic_categories_as_cat_string(),false); 
+		$latest_comic = get_terminal_post_in_category(get_all_comic_categories_as_cat_string(),true); 
 		$archive_year = get_post_time('Y', false, $latest_comic, true); 
-		if (empty($archive_year)) $archive_year = date('Y'); 
 	}
-
+	if (empty($archive_year)) $archive_year = date('Y'); 
 
 
 $firstDayMargins = array();
@@ -46,7 +45,7 @@ function leapYear($yr) {
 		} else {
 			if ($yr % 400 != 0) {
 				return 28;
-			} else {
+            } else {
 				return 29;
 			}
 		}
@@ -93,12 +92,12 @@ $month['12'] = array('month' => 'December', 'days' => '31');
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-	<?php while (have_posts()) : the_post() ?>
+	<?php if (have_posts()): ?>
 		<div class="entry">
 			<h2 class="pagetitle"><?php the_title() ?></h2>
 			<?php the_content(); ?>
 		</div>
-	<?php endwhile; ?>
+	<?php endif; ?>
 
 		<div class="archive-yearlist">| 
 <?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
diff --git a/archive-comic-year.php b/archive-comic-year.php
index 341c590..1e21eab 100644
--- a/archive-comic-year.php
+++ b/archive-comic-year.php
@@ -11,8 +11,8 @@ Template Name: Comic Year Archive
 	} else { 
 		$latest_comic = get_terminal_post_in_category(get_all_comic_categories_as_cat_string(),false); 
 		$archive_year = get_post_time('Y', false, $latest_comic, true); 
-		if (empty($archive_year)) $archive_year = date('Y'); 
 	}
+	if (empty($archive_year)) $archive_year = date('Y'); 
 ?> 
 
 
diff --git a/archive.php b/archive.php
index ab7e6c8..ba95b6a 100644
--- a/archive.php
+++ b/archive.php
@@ -21,10 +21,10 @@
 		<div id="content" class="narrowcolumn">
 			<div class="column">
 	<?php } ?>
-<?php
-$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
-$count = $tmp_search->post_count;
-    ?>
+		<?php
+		$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
+		$count = $tmp_search->post_count;
+			?>
 		<?php if (!$count) $count = "no"; ?>
 		<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div>
 
@@ -62,18 +62,19 @@ $count = $tmp_search->post_count;
 				<div class="post-comic-head"></div>
 				<div class="post-comic">
 					<div class="post-info">
-						<div class="post-date">
-							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
-						</div>
+						<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
+							<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<?php } ?>
+						<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+						<?php if ($enable_comic_post_calendar == 'yes') { ?>
+							<div class="post-date">
+								<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+							</div>
+						<?php } ?>
 						<div class="post-text">
 							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-							<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-						</div>
-						<div class="clear"></div>
-					</div>
-					<div class="post-extras">
-						<div class="tags">
-							<?php the_tags('&#9492; Tags: ',', ','<br />'); ?> Posted in: <?php the_category(','); ?>
+							<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+							<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 						</div>
 						<div class="clear"></div>
 					</div>
@@ -88,21 +89,31 @@ $count = $tmp_search->post_count;
 
 				<div class="post-head"></div>
 				<div class="post">
-					<div class="post-info">
+				<div class="post-info">
+					<?php if ($enable_post_author_gravatar == 'yes') { ?>
+						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+					<?php } ?>
+					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+					<?php if ($enable_post_calendar == 'yes') { ?>
 						<div class="post-date">
 							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
 						</div>
-						<div class="post-text">
-							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-							<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-						</div>
-						<div class="clear"></div>
+					<?php } ?>
+					<div class="post-text">
+						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+						<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+						<?php if ($disable_categories_in_posts != 'yes') { ?>
+							<small> Posted In: <?php the_category(','); ?></small><br />
+						<?php } ?>
+						<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
 					</div>
+					<div class="clear"></div>
+				</div>
 					<?php the_excerpt() ?>
 					<br class="clear-margins" />
 					<div class="post-extras">
 						<div class="tags">
-							<?php the_tags('&#9492; Tags: ',',','<br />');?> Posted in: <?php the_category(','); ?>
+							<?php the_tags('&#9492; Tags: ',',','<br />');?>
 						</div>
 						<div class="clear"></div>
 					</div>
diff --git a/search-transcript.php b/search-transcript.php
index 74634cc..5324621 100644
--- a/search-transcript.php
+++ b/search-transcript.php
@@ -24,12 +24,12 @@
 	
   <div class="post-page-head"></div>
   <div class="post-page">			
-    <?php
-		$tmp_search = new WP_Query('s=' . wp_specialchars($_GET['s']) . '&show_posts=-1&posts_per_page=-1');
-		$count = $tmp_search->post_count;
-		if (!$count) $count = "no";
-    ?>
-	<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div>
+<?php
+$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
+$count = $tmp_search->post_count;
+			?>
+		<?php if (!$count) $count = "no"; ?>
+		<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div>
     <h2 class="pagetitle">Transcript search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
 	
   <?php if (have_posts()) : ?>
@@ -41,19 +41,25 @@
 
 			<div class="post-comic-head"></div>
 			<div class="post-comic">
-				<div class="post-info">
-					<div class="post-date">
-						<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
-					</div>
-					<div class="post-text">
-						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-						<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-					</div>
-					<div class="clear"></div>
+		<div class="post-info">
+			<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
+				<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+			<?php } ?>
+			<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+			<?php if ($enable_comic_post_calendar == 'yes') { ?>
+				<div class="post-date">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
 				</div>
+			<?php } ?>
+			<div class="post-text">
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+			</div>
+			<div class="clear"></div>
+		</div>
 				<div class="post-extras">
 					<div class="tags">
-						<?php the_tags('&#9492; Tags: ',', ','<br />'); ?> Posted in: <?php the_category(','); ?>
+						<?php the_tags('&#9492; Tags: ',', ','<br />'); ?>
 					</div>
 					<div class="clear"></div>
 				</div>
@@ -69,18 +75,27 @@
           <div class="post-head"></div>
           <div class="post">
 			<div class="post-info">
-				<div class="post-date">
-					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+					<?php if ($enable_post_author_gravatar == 'yes') { ?>
+						<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+					<?php } ?>
+					<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+					<?php if ($enable_post_calendar == 'yes') { ?>
+						<div class="post-date">
+							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+						</div>
+					<?php } ?>
+					<div class="post-text">
+						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+						<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+						<?php if ($disable_categories_in_posts != 'yes') { ?>
+							<small> Posted In: <?php the_category(','); ?></small><br />
+						<?php } ?>
+					</div>
+					<div class="clear"></div>
 				</div>
-				<div class="post-text">
-					<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-					<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-				</div>
-				<div class="clear"></div>
-			</div>
 			<div class="post-extras">
 				<div class="tags">
-					<?php the_tags('&#9492; Tags: ',', ','<br />'); ?> Posted in: <?php the_category(','); ?>
+					<?php the_tags('&#9492; Tags: ',', ','<br />'); ?>
 				</div>
 				<div class="clear"></div>
 			</div>
diff --git a/search.php b/search.php
index c7e26dc..4f072a4 100644
--- a/search.php
+++ b/search.php
@@ -24,12 +24,12 @@
 
   <div class="post-page-head"></div>
   <div class="post-page">			
-    <?php
-//		$tmp_search = new WP_Query('s=' . wp_specialchars($_GET['s']) . '&show_posts=-1&posts_per_page=-1');
-//		$count = $tmp_search->post_count;
-//		if (!$count) $count = "no";
-    ?>
-	<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div>
+<?php
+$tmp_search = new WP_Query($query_string.'&order=desc&show_posts=-1&posts_per_page=-1');
+$count = $tmp_search->post_count;
+			?>
+		<?php if (!$count) $count = "no"; ?>
+		<div class="searchresults">Found <?php echo $count; ?> result<?php if ($count !== 1) { echo "s"; } ?>.</div>
     <h2 class="pagetitle">Search for &lsquo;<?php the_search_query() ?>&rsquo;</h2>
     
   <?php if (have_posts()) : ?>
@@ -39,55 +39,69 @@
       
         <?php global $archive_comic_width; if (in_comic_category()) { ?>
 
-			<div class="post-comic-head"></div>
-			<div class="post-comic">
-				<div class="post-info">
-					<div class="post-date">
-						<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				<div class="post-comic-head"></div>
+				<div class="post-comic">
+					<div class="post-info">
+						<?php if ($enable_comic_post_author_gravatar == 'yes') { ?>
+							<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<?php } ?>
+						<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+						<?php if ($enable_comic_post_calendar == 'yes') { ?>
+							<div class="post-date">
+								<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+							</div>
+						<?php } ?>
+						<div class="post-text">
+							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+							<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+						</div>
+						<div class="clear"></div>
 					</div>
-					<div class="post-text">
-						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-						<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
+					<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
+						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a><br />
 					</div>
-					<div class="clear"></div>
+					<br class="clear-margins" />
 				</div>
-				<div class="post-extras">
-					<div class="tags">
-						<?php the_tags('&#9492; Tags: ',', ','<br />'); ?> Posted in: <?php the_category(','); ?>
-					</div>
-					<div class="clear"></div>
-				</div>
-				<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
-					<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /></a><br />
-				</div>
-				<br class="clear-margins" />
-			</div>
-			<div class="post-comic-foot"></div>
+				<div class="post-comic-foot"></div>
 
         <?php } else { ?>
 
-          <div class="post-head"></div>
-          <div class="post">
-			<div class="post-info">
-				<div class="post-date">
-					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				<div class="post-head"></div>
+				<div class="post">
+					<div class="post-info">
+						<?php if ($enable_post_author_gravatar == 'yes') { ?>
+							<div class="post-author-gravatar"><?php echo str_replace("alt='", "alt='".get_the_author_meta('display_name')."' title='".get_the_author_meta('display_name'),get_avatar(get_the_author_meta('email'), 64)); ?></div>
+						<?php } ?>
+						<?php if (function_exists('comicpress_show_mood_in_post')) comicpress_show_mood_in_post(); ?>
+						<?php if ($enable_post_calendar == 'yes') { ?>
+							<div class="post-date">
+								<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+							</div>
+						<?php } ?>
+						<div class="post-text">
+							<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+							<small> By <?php the_author_posts_link(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?></small><br />
+							<?php if ($disable_categories_in_posts != 'yes') { ?>
+								<?php if (is_page()) { ?>
+									<small>This is a page.</small><break />
+								<?php } else { ?>
+									<small> Posted In: <?php the_category(','); ?></small><br />
+								<?php } ?>
+							<?php } ?>
+							<?php if(function_exists('the_ratings')) { the_ratings(); } ?>
+						</div>
+						<div class="clear"></div>
+					</div>
+					<?php the_excerpt() ?>
+					<br class="clear-margins" />
+					<div class="post-extras">
+						<div class="tags">
+							<?php the_tags('&#9492; Tags: ',',','<br />');?>
+						</div>
+						<div class="clear"></div>
+					</div>
 				</div>
-				<div class="post-text">
-					<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
-					<small> - By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?></small><br />
-				</div>
-				<div class="clear"></div>
-			</div>
-			<div class="post-extras">
-				<div class="tags">
-					<?php the_tags('&#9492; Tags: ',', ','<br />'); ?> Posted in: <?php the_category(','); ?>
-				</div>
-				<div class="clear"></div>
-			</div>
-			<?php the_excerpt() ?>
-			<br class="clear-margins" />
-			</div>
-          <div class="post-foot"></div>
+				<div class="post-foot"></div>
           
         <?php } ?>
 
diff --git a/sidebar-right.php b/sidebar-right.php
index 5bca1c7..734d5a7 100644
--- a/sidebar-right.php
+++ b/sidebar-right.php
@@ -25,9 +25,11 @@
 
 				<ul><?php wp_list_bookmarks() ?></ul>
 				<ul>
-				<li>
-					<?php include(get_template_directory() . '/searchform.php'); ?>
-				</li>
+					<li>
+						<ul>
+							<?php include(get_template_directory() . '/searchform.php'); ?>
+						</ul>
+					</li>
 				</ul>
 			<?php endif; ?>
 	</div>
diff --git a/style.css b/style.css
index 83f6c5a..e0f21ec 100644
--- a/style.css
+++ b/style.css
@@ -474,32 +474,23 @@ h3, h3 a {
 	margin-bottom: 20px;
 }
 
-.entry {
-	padding: 5px;
-}
-
 .post-info {
 	margin-bottom: 5px;
 }
 
 .post-text {
-	padding-left: 5px;
 	overflow: hidden;
 	display: block;
 }
 
 .post-author-gravatar {
 	float: right;
-	margin: 3px;
-	width: 63px;
-	height: 63px;
+	margin-left: 2px;
 }
 
 .post-mood {
 	float: left;
-	margin: 2px;
-	width: 63px;
-	height: 63px;
+	margin-right: 2px;
 }
 
 .post-date {
@@ -508,6 +499,7 @@ h3, h3 a {
 	font-size: 15px;
 	font-weight: bold;
 	float: left;
+	margin-right: 3px;
 }
 
 .post-date .date {
@@ -937,6 +929,11 @@ ul.children {
 	border: 0;
 }
 
+.searchresults {
+	float: right;
+	padding: 5px;
+}
+
 .archive-dropdown-wrap {
 	background: url('images/browse-search.png') no-repeat;
 }
@@ -1147,41 +1144,6 @@ a.transcript-title {
 }
 
 
-#s-transcript {
-	width: 140px;
-	margin: 0;
-	padding: 2px;
-	font-size: 12px;
-	font-family: 'Georgia' , serif;
-	font-style: italic;
-}
-
-
-#searchsubmit-transcript {
-	padding: 0 5px;
-	font-size: 12px;
-	font-family: 'Arial' , sans-serif;
-}
-
-#s-search {
-	width: 140px;
-	margin: 0;
-	padding: 2px;
-	font-size: 12px;
-	font-family: 'Georgia' , serif;
-	font-style: italic;
-}
-
-
-#searchsubmit-search {
-	padding: 0 5px;
-	font-size: 12px;
-	font-family: 'Arial' , sans-serif;
-}
-
-
-
-
 /* Pingbacks and Trackbacks */