diff --git a/archive-comic-calendar.php b/archive-comic-calendar.php
index a248950..7d7f38e 100644
--- a/archive-comic-calendar.php
+++ b/archive-comic-calendar.php
@@ -112,10 +112,10 @@ foreach ( $years as $year ) {
 		
 			
 		?>
-			<?php if ($calendar_directory != 'none') { ?>
+			<?php if (!empty($calendar_directory) && $calendar_directory != 'none') { ?>
 					<div class="cpcal-month" style="height: 257px;" id="<?php echo $month[$i]['month'] ?>">
 				<?php if (file_exists(get_template_directory().'/images/cal/'.$calendar_directory.'/'.$archive_year)) { ?>
-			<?php if (count($monthfile = glob(get_template_directory().'/images/cal/'.$calendar_directory.'/'.$archive_year.'/'.strtolower($month[$i]['month']).'.*')) > 0) { 
+					<?php if (count($monthfile = glob(get_template_directory().'/images/cal/'.$calendar_directory.'/'.$archive_year.'/'.strtolower($month[$i]['month']).'.*')) > 0) { 
 						if (is_array($monthfile)) $monthfile = reset($monthfile); ?>
 						<img class="cpcal-image" src="<?php bloginfo('stylesheet_directory'); ?>/images/cal/<?php echo $calendar_directory; ?>/<?php echo $archive_year; ?>/<?php echo basename($monthfile); ?>" alt="<?php echo $month[$i]['month'] ?>" title="<?php echo $month[$i]['month'] ?>" />
 					<?php } else { ?>
diff --git a/comicpress-options-config.php b/comicpress-options-config.php
index bd3f6c9..3bd3060 100644
--- a/comicpress-options-config.php
+++ b/comicpress-options-config.php
@@ -196,7 +196,7 @@ $options = array (
 			
 		array(
 			"id" => "comicpress-calendar_directory",
-			"default" => "none",
+			"default" => "default",
 			"type" => "comicpress-calendar_directory"),
 			
 
diff --git a/functions.php b/functions.php
index fd56998..e73584e 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,11 @@
 <?php
 
-$comicpress_version = '2.8.0.R2';
+// remove intense debates control over the comment numbers
+if (function_exists('id_get_comment_number')) {
+	remove_filter('comments_number','id_get_comment_number');
+}
+
+$comicpress_version = '2.8.0.R5';
 
 // Remove the wptexturizer from changing the quotes and squotes.
 // remove_filter('the_title', 'wptexturize');
@@ -86,7 +91,7 @@ if (get_option('upload_path') !== false) {
 
 if (empty($graphicnav_directory)) $graphicnav_directory = 'default';
 if (empty($moods_directory)) $moods_directory = 'default';
-if (empty($calendar_directory)) $calendar_directory = 'none';
+if (empty($calendar_directory)) $calendar_directory = 'default';
 
 function is_cp_theme_style($choices) {
 global $cp_theme_style;
diff --git a/functions/displaycomic.php b/functions/displaycomic.php
index 773382c..e9a917a 100644
--- a/functions/displaycomic.php
+++ b/functions/displaycomic.php
@@ -12,19 +12,22 @@ function display_comic() {
 	
 	$comic = explode(".", the_comic_filename()); 
 	if ($comic[1] == 'swf') { ?>
-		<object id="myId" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="<?php echo get_post_meta( get_the_ID(), "fwidth", true ); ?>" height="<?php echo get_post_meta( get_the_ID(), "fheight", true ); ?>">
-		<param name="movie" value="/<?php echo the_comic_filename(); ?>" />
+		<?php 
+			$height = get_post_meta( get_the_ID(), "fheight", true );
+			$width = get_post_meta( get_the_ID(), "fwidth", true );
+			if (empty($height)) $height = '300';
+			if (empty($width)) $width = '100%';
+		?>
+		<object id="myId" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="<?php echo $width; ?>" height="<?php echo $height; ?>">
+		<param name="movie" value="<?php echo get_comic_url(); ?>" />
 		<!--[if !IE]>-->
-			<object type="application/x-shockwave-flash" data="/<?php echo the_comic_filename(); ?>" width="<?php echo get_post_meta( get_the_ID(), "fwidth", true ); ?>" height="<?php echo get_post_meta( get_the_ID(), "fheight", true ); ?>">
+			<object type="application/x-shockwave-flash" data="<?php echo get_comic_url(); ?>" width="<?php echo $width; ?>" height="<?php echo $height; ?>">
 			<!--<![endif]-->
 			<div>
 				<h1>Get Flash!</h1>
 				<p><a href="http://www.adobe.com/go/getflashplayer"><img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" /></a></p>
 			</div>
-			<!--[if !IE]>-->
-			</object>
-		<!--<![endif]-->
-		</object>
+			<!--[if !IE]>--></object><!--<![endif]--></object>
 		<?php } else {
 			if ($comic_clicks_next == 'yes') { 
 				$hovertext = get_post_meta( get_the_ID(), "hovertext", true );