diff --git a/ceo-config.php b/ceo-config.php
index adaeef9..7859316 100644
--- a/ceo-config.php
+++ b/ceo-config.php
@@ -173,7 +173,7 @@ if ( isset($_POST['_wpnonce']) && wp_verify_nonce($_POST['_wpnonce'], 'update-op
 			if (function_exists('comicpress_themeinfo')) $tab_info['landing'] = __('Landing Pages', 'comiceasel');
 			if (!defined('CEO_FEATURE_BUY_COMIC'))
 				$tab_info['buycomic'] = __('Buy Comic','comiceasel');
-		  	if (empty($tab)) { $tab = array_shift(array_keys($tab_info)); }
+		  	if (empty($tab)) { $tab = 'main'; }
 
 		  	foreach($tab_info as $tab_id => $label) { ?>
 		  		<div id="comiceasel-tab-<?php echo $tab_id ?>" class="comiceasel-tab <?php echo ($tab == $tab_id) ? 'on' : 'off'; ?>"><span><?php echo $label; ?></span></div>
diff --git a/ceo-import.php b/ceo-import.php
index d4dff11..a2873e2 100644
--- a/ceo-import.php
+++ b/ceo-import.php
@@ -178,7 +178,7 @@ if ( isset($_POST['_wpnonce']) && wp_verify_nonce($_POST['_wpnonce'], 'comicease
 		</td>
 		<td align="left" colspan="9">
 			<?php _e('Set Time of Comic Posts','comiceasel'); ?><br />
-			<?php _e('24 hour clock'); ?><br />
+			<?php _e('24 hour clock','comiceasel'); ?><br />
 			<input name="import-time" class="import-time" value="<?php echo $import_time; ?>" />
 		</td>
 	</tr>
@@ -251,7 +251,7 @@ wp_dropdown_categories( $args );
 </thead>
 </table>
 <p class="submit" style="margin-left: 10px;">
-	<input type="submit" class="button-primary" value="<?php _e('Import') ?>" />
+	<input type="submit" class="button-primary" value="<?php _e('Import','comiceasel') ?>" />
 	<input type="hidden" name="action" value="ceo-import" />
 </p>
 <p>
@@ -271,7 +271,7 @@ echo '</ol>'
 </p>
 <br />
 <?php
-echo __('Directory to scan: ','comiceasel').'<strong>'.ABSPATH.$import_directory.'</strong>'."<br />\r\n";
+echo __('Directory to scan:','comiceasel').'&nbsp;<strong>'.ABSPATH.$import_directory.'</strong>'."<br />\r\n";
 if (count($results = glob(ABSPATH.$import_directory.'/*.*')) > 0) {
 	echo count($results).' '.__('Files found.','comiceasel')."<br />\r\n";
 	echo "<hr />\r\n";
@@ -280,5 +280,5 @@ if (count($results = glob(ABSPATH.$import_directory.'/*.*')) > 0) {
 		echo '<span style="width:320px;display:inline-block;float:left;">'.basename($filename).'</span>';
 	}
 } else {
-	echo "No files found in ".ABSPATH.$import_directory;
+	echo __('No files found in','comiceasel').'&nbsp;'.ABSPATH.$import_directory;
 }
\ No newline at end of file
diff --git a/functions/admin-meta.php b/functions/admin-meta.php
index 8446911..1741a3b 100644
--- a/functions/admin-meta.php
+++ b/functions/admin-meta.php
@@ -115,7 +115,7 @@ function ceo_add_new_comic_columns($comic_columns) {
 		$new_columns['categories'] = __('Category', 'comiceasel');
 	$new_columns['locations'] = __('Location', 'comiceasel');
 	$new_columns['tags'] = __('Tags', 'comiceasel');
-	$new_columns['date'] = _x('Date', 'column name');
+	$new_columns['date'] = __('Date', 'comiceasel');
 	$new_columns['comicimages'] = __('Thumbnail', 'comiceasel');	
 
 	return $new_columns;
@@ -377,7 +377,7 @@ function ceo_edit_buycomic_in_post($post) {
 				<?php _e('Print Cost','comiceasel'); ?> <input name="buy_print_amount" id="buy_print_amount" type="text" size="5" value="<?php echo $currentbuyprintamount ?>" />  <br />
 				<input name="buyprint-status" id="buyprint-available" type="radio" value="<?php _e('Available','comiceasel'); ?>" <?php if (($currentbuyprintoption == __('Available','comiceasel')) || empty($currentbuyprintoption)) { echo " checked"; } ?> /> <label for="buyprint-available"><?php _e('Available','comiceasel'); ?></label><br />
 				<input name="buyprint-status" id="buyprint-sold" type="radio" value="<?php _e('Sold','comiceasel'); ?>" <?php if ($currentbuyprintoption == __('Sold','comiceasel')) { echo " checked"; } ?> /> <label for="buyprint-sold">Sold</label><br />
-				<input name="buyprint-status" id="buyprint-outofstock" type="radio" value="<?php _e('Out of Stock','comiceasel'); ?>" <?php if ($currentbuyprintoption == __('Out of Stock')) { echo " checked"; } ?> /> <label for="buyprint-outofstock"><?php _e('Out of Stock','comiceasel'); ?></label><br />
+				<input name="buyprint-status" id="buyprint-outofstock" type="radio" value="<?php _e('Out of Stock','comiceasel'); ?>" <?php if ($currentbuyprintoption == __('Out of Stock','comiceasel')) { echo " checked"; } ?> /> <label for="buyprint-outofstock"><?php _e('Out of Stock','comiceasel'); ?></label><br />
 				<input name="buyprint-status" id="buyprint-notavail" type="radio" value="<?php _e('Not Available','comiceasel'); ?>" <?php if ($currentbuyprintoption == __('Not Available','comiceasel')) { echo " checked"; } ?> /> <label for="buyprint-notavail"><?php _e('Not Available','comiceasel'); ?></label><br />
 			</td>
 		<?php }
@@ -473,7 +473,7 @@ function ceo_add_comic_in_post() {
 	$context_output .= __('Minimize these directions by clicking the title of the box.','comiceasel');
 	get_current_screen()->add_help_tab( array(
 				'id'      => 'my-help-id',
-				'title'   => __( 'Instructions' ),
+				'title'   => __( 'Instructions','comiceasel' ),
 				'content' => $context_output,
 			) );
 	add_action('admin_footer', 'ceo_change_chapter_to_radio');
@@ -485,7 +485,7 @@ function ceo_test_for_errors() {
 	global $post; 
 	if (is_numeric($post->post_name)) { ?>
 	<div class="error">
-		<h2><?php _e('Problem: ','comiceasel'); ?></h2>
+		<h2><?php _e('Problem.','comiceasel'); ?></h2>
 		<?php echo __('The slug for this comic post "','comiceasel').$post->post_name.__('" is numerical.  It needs to have a letter or character added to it to not be recognized as a date.  P.S. Cannot use these characters: !&#@','comiceasel'); ?><br />
 	</div>
 <?php }
diff --git a/functions/displaycomic.php b/functions/displaycomic.php
index cf2ce31..3de7b6b 100644
--- a/functions/displaycomic.php
+++ b/functions/displaycomic.php
@@ -159,7 +159,7 @@ function ceo_display_comic($size = 'full') {
 
 	if (!empty($refer_only) && !defined('CEO_DISABLE_REFER_ONLY')) {
 		$ref_only_msg = '';
-		$refer_only_msg = get_post_meta( $post->ID, 'refer-only-msg', 'true') ? get_post_meta( $post->ID, 'refer-only-msg', 'true') : __('Read post message below to find out how to view this.', 'comic-easel');
+		$refer_only_msg = get_post_meta( $post->ID, 'refer-only-msg', 'true') ? get_post_meta( $post->ID, 'refer-only-msg', 'true') : __('Read post message below to find out how to view this.', 'comiceasel');
 		if (ceo_get_referer() !== $refer_only) {
 				return apply_filters('ceo_refer_only_msg', $refer_only_msg);
 		}
diff --git a/functions/shortcodes.php b/functions/shortcodes.php
index 6644fa0..dc03608 100644
--- a/functions/shortcodes.php
+++ b/functions/shortcodes.php
@@ -124,7 +124,7 @@ function ceo_cast_page( $atts, $content = '' ) {
 			$cast_output .= ceo_cast_display($single_character, $stats, $image)."\r\n";
 			$cast_output .= '</table>'."\r\n";
 		} else 
-			$cast_output .= __('Unknown Character: ', 'comiceasel').$character."<br />\r\n";
+			$cast_output .= __('Unknown Character:', 'comiceasel').'&nbsp;'.$character."<br />\r\n";
 	}
 	return $cast_output;
 }
@@ -481,7 +481,7 @@ function ceo_display_buycomic( $atts, $content = '' ) {
 	extract(shortcode_atts( array(
 					'character' => '',
 					'thanks' => __('Thank you for the purchase!','comiceasel'),
-					'cancelled' => __('You have cancelled the transaction.')
+					'cancelled' => __('You have cancelled the transaction.','comiceasel')
 					), $atts ) );
 	$buy_output = '';
 	if (isset($_REQUEST['id'])) $comicnum = intval($_REQUEST['id']);
@@ -518,12 +518,12 @@ function ceo_display_buycomic( $atts, $content = '' ) {
 		$post = get_post($comicnum); // Get the post
 		if (!is_wp_error($post) && !empty($post)) { // error check make sure it got a post
 			$buy_output .= __('Comic ID','comiceasel').' #'.$comicnum."<br />\r\n";
-			$buy_output .= __('Title: ','comiceasel').get_the_title($post)."<br />\r\n";
+			$buy_output .= __('Title:','comiceasel').'&nbsp;'.get_the_title($post)."<br />\r\n";
 			if (ceo_pluginfo('buy_comic_sell_print')) {
-				$buy_output .= __('Print Status: ','comiceasel').$buyprint_status."<br />\r\n";
+				$buy_output .= __('Print Status:','comiceasel').'&nbsp;'.$buyprint_status."<br />\r\n";
 			}
 			if (ceo_pluginfo('buy_comic_sell_original')) {
-				$buy_output .= __('Original Status: ','comiceasel').$buyorig_status."<br />\r\n";
+				$buy_output .= __('Original Status:','comiceasel').'&nbsp;'.$buyorig_status."<br />\r\n";
 			}
 			$buy_output .= "<br />\r\n";
 			$buy_output .= '<table class="buytable" style="width:100%;">';
diff --git a/lang/comiceasel-en_US.mo b/lang/comiceasel-en_US.mo
index d0ccc03..9f2dd04 100644
Binary files a/lang/comiceasel-en_US.mo and b/lang/comiceasel-en_US.mo differ
diff --git a/lang/comiceasel-en_US.po b/lang/comiceasel-en_US.po
index b3b651a..02e6f12 100644
--- a/lang/comiceasel-en_US.po
+++ b/lang/comiceasel-en_US.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Comic Easel v1.9.11\n"
+"Project-Id-Version: Comic Easel v1.10\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-07-17 19:13:45+0000\n"
+"PO-Revision-Date: 2016-09-30 20:41:51+0000\n"
 "Last-Translator: frumph <philip@frumph.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,6 @@ msgstr ""
 #: ceo-admin.php:46
 #: ceo-import.php:254
 #@ comiceasel
-#@ default
 msgid "Import"
 msgstr ""
 
@@ -146,6 +145,7 @@ msgid "files have valid naming and can be imported."
 msgstr ""
 
 #: ceo-import.php:106
+#: ceo-import.php:283
 #@ comiceasel
 msgid "No files found in"
 msgstr ""
@@ -231,7 +231,7 @@ msgid "Set Time of Comic Posts"
 msgstr ""
 
 #: ceo-import.php:181
-#@ default
+#@ comiceasel
 msgid "24 hour clock"
 msgstr ""
 
@@ -295,11 +295,6 @@ msgstr ""
 msgid "ComicPress file convention requires that each comic is its own date., do not have comics uploaded on the same date.  While Comic Easel does not require each comic to have its own date, the Import does.  There will be other methods of importing made in the future that this will not be an issue."
 msgstr ""
 
-#: ceo-import.php:274
-#@ comiceasel
-msgid "Directory to scan: "
-msgstr ""
-
 #: comiceasel.php:37
 #: comiceasel.php:51
 #: functions/admin-meta.php:76
@@ -557,12 +552,6 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: functions/admin-meta.php:118
-#@ default
-msgctxt "column name"
-msgid "Date"
-msgstr ""
-
 #: functions/admin-meta.php:119
 #@ comiceasel
 msgid "Thumbnail"
@@ -723,7 +712,6 @@ msgstr ""
 
 #: functions/admin-meta.php:380
 #@ comiceasel
-#@ default
 msgid "Out of Stock"
 msgstr ""
 
@@ -819,13 +807,8 @@ msgid "Media Url as Comic"
 msgstr ""
 
 #: functions/admin-meta.php:476
-#@ default
-msgid "Instructions"
-msgstr ""
-
-#: functions/admin-meta.php:488
 #@ comiceasel
-msgid "Problem: "
+msgid "Instructions"
 msgstr ""
 
 #: functions/admin-meta.php:489
@@ -851,6 +834,7 @@ msgid "Comic Easel - Cast Hover"
 msgstr ""
 
 #: functions/casthover.php:118
+#: functions/shortcodes.php:521
 #: widgets/archive-dropdown.php:197
 #: widgets/casthover.php:128
 #: widgets/comiclist-dropdown.php:94
@@ -898,6 +882,7 @@ msgstr ""
 msgid "Buy!"
 msgstr ""
 
+#: widgets/comicblogpost.php:18
 #: widgets/navigation.php:291
 #: widgets/navigation.php:346
 #@ comiceasel
@@ -1051,11 +1036,6 @@ msgstr ""
 msgid "You do not have any characters yet."
 msgstr ""
 
-#: functions/shortcodes.php:127
-#@ comiceasel
-msgid "Unknown Character: "
-msgstr ""
-
 #: functions/shortcodes.php:194
 #: functions/shortcodes.php:242
 #: functions/shortcodes.php:293
@@ -1069,7 +1049,7 @@ msgid "Thank you for the purchase!"
 msgstr ""
 
 #: functions/shortcodes.php:484
-#@ default
+#@ comiceasel
 msgid "You have cancelled the transaction."
 msgstr ""
 
@@ -1078,21 +1058,6 @@ msgstr ""
 msgid "Comic ID"
 msgstr ""
 
-#: functions/shortcodes.php:521
-#@ comiceasel
-msgid "Title: "
-msgstr ""
-
-#: functions/shortcodes.php:523
-#@ comiceasel
-msgid "Print Status: "
-msgstr ""
-
-#: functions/shortcodes.php:526
-#@ comiceasel
-msgid "Original Status: "
-msgstr ""
-
 #: functions/shortcodes.php:542
 #@ comiceasel
 msgid "Print"
@@ -1356,11 +1321,6 @@ msgstr ""
 msgid "Thumbnail size for the direct comic & chapter RSS Feeds"
 msgstr ""
 
-#: options/general.php:178
-#@ comiceasel
-msgid "The thumbnail for the direct comic and chapter RSS /comic/feed/ and /chapter/chapter-slug/feed/ "
-msgstr ""
-
 #: options/general.php:183
 #@ comiceasel
 msgid "Thumbnail size for archive and search"
@@ -1547,23 +1507,15 @@ msgstr ""
 msgid "Exclude Chapters (comma seperated):"
 msgstr ""
 
-#. translators: Calendar caption: 1: month name, 2: 4-digit year
-#: widgets/comic-calendar.php:100
-#, php-format
-#@ default
-msgctxt "calendar caption"
-msgid "%1$s %2$s"
-msgstr ""
-
 #: widgets/comic-calendar.php:101
-#@ default
+#@ comiceasel
 msgid "Calendar"
 msgstr ""
 
 #: widgets/comic-calendar.php:126
 #: widgets/comic-calendar.php:134
 #, php-format
-#@ default
+#@ comiceasel
 msgid "View posts for %1$s %2$s"
 msgstr ""
 
@@ -1632,21 +1584,6 @@ msgstr ""
 msgid "Wallpaper URL (Large):"
 msgstr ""
 
-#: widgets/comicblogpost.php:18
-#@ comiceasel
-msgid "Comment&nbsp;"
-msgstr ""
-
-#: widgets/comicblogpost.php:18
-#@ comiceasel
-msgid "Comment "
-msgstr ""
-
-#: widgets/comicblogpost.php:18
-#@ comiceasel
-msgid "Comments "
-msgstr ""
-
 #: widgets/comicblogpost.php:33
 #@ comiceasel
 msgid "Displays the comic blog post for the day, best used when the comic blog post is disabled and you want to put this into a sidebar."
@@ -1692,11 +1629,6 @@ msgstr ""
 msgid "Comic Easel - Navigation"
 msgstr ""
 
-#: widgets/navigation.php:181
-#@ comiceasel
-msgid "Image URL (for hotlinking/embedding): "
-msgstr ""
-
 #: widgets/navigation.php:279
 #@ comiceasel
 msgid "<[ Prev Chapter"
@@ -2046,11 +1978,6 @@ msgstr ""
 msgid "Disable the the rewrite rules so numerical slugs do not get turned into dates?"
 msgstr ""
 
-#: options/archive.php:31
-#@ comiceasel
-msgid "This option disables the url line from interpreting numerical numbers as dates. ex. /comic/2014/ "
-msgstr ""
-
 #: options/archive.php:36
 #@ comiceasel
 msgid "Allow the URL to also denote the chapter?"
@@ -2156,21 +2083,11 @@ msgstr ""
 msgid "Technical Support"
 msgstr ""
 
-#: options/main.php:11
-#@ comiceasel
-msgid "The Comic Easel website: "
-msgstr ""
-
 #: options/main.php:11
 #@ comiceasel
 msgid "probably has the answer you're looking for in the form of a post or in the faqs section."
 msgstr ""
 
-#: options/main.php:13
-#@ comiceasel
-msgid "You can contact me for technical support at any of the following locations: "
-msgstr ""
-
 #: options/main.php:14
 #@ comiceasel
 msgid "(best chances to reach me at the top going down to the least chance)"
@@ -2355,7 +2272,7 @@ msgid "Only show this comic if it comes from referring URL?"
 msgstr ""
 
 #: functions/displaycomic.php:162
-#@ comic-easel
+#@ comiceasel
 msgid "Read post message below to find out how to view this."
 msgstr ""
 
@@ -2369,3 +2286,71 @@ msgstr ""
 msgid "Show as a list instead of a dropdown?"
 msgstr ""
 
+#: functions/admin-meta.php:118
+#@ comiceasel
+msgid "Date"
+msgstr ""
+
+#. translators: Calendar caption: 1: month name, 2: 4-digit year
+#: widgets/comic-calendar.php:100
+#, php-format
+#@ comiceasel
+msgctxt "calendar caption"
+msgid "%1$s %2$s"
+msgstr ""
+
+#: ceo-import.php:274
+#@ comiceasel
+msgid "Directory to scan:"
+msgstr ""
+
+#: functions/admin-meta.php:488
+#@ comiceasel
+msgid "Problem."
+msgstr ""
+
+#: functions/shortcodes.php:127
+#@ comiceasel
+msgid "Unknown Character:"
+msgstr ""
+
+#: functions/shortcodes.php:523
+#@ comiceasel
+msgid "Print Status:"
+msgstr ""
+
+#: functions/shortcodes.php:526
+#@ comiceasel
+msgid "Original Status:"
+msgstr ""
+
+#: options/archive.php:31
+#@ comiceasel
+msgid "This option disables the url line from interpreting numerical numbers as dates. ex. /comic/2014/"
+msgstr ""
+
+#: options/general.php:178
+#@ comiceasel
+msgid "The thumbnail for the direct comic and chapter RSS /comic/feed/ and /chapter/chapter-slug/feed/"
+msgstr ""
+
+#: options/main.php:11
+#@ comiceasel
+msgid "The Comic Easel website:"
+msgstr ""
+
+#: options/main.php:13
+#@ comiceasel
+msgid "You can contact me for technical support at any of the following locations:"
+msgstr ""
+
+#: widgets/comicblogpost.php:18
+#@ comiceasel
+msgid "Comment"
+msgstr ""
+
+#: widgets/navigation.php:181
+#@ comiceasel
+msgid "Image URL (for hotlinking/embedding):"
+msgstr ""
+
diff --git a/options/archive.php b/options/archive.php
index b4bd8c1..c9ba16d 100644
--- a/options/archive.php
+++ b/options/archive.php
@@ -28,7 +28,7 @@
 						<input id="disable_cal_rewrite_rules" name="disable_cal_rewrite_rules" type="checkbox" value="1" <?php checked(true, $ceo_options['disable_cal_rewrite_rules']); ?> />
 					</td>
 					<td>
-						<?php _e('This option disables the url line from interpreting numerical numbers as dates. ex. /comic/2014/ ','comiceasel'); ?>
+						<?php _e('This option disables the url line from interpreting numerical numbers as dates. ex. /comic/2014/','comiceasel'); ?>
 					</td>
 				</tr>
 				<tr class="alternate">
diff --git a/options/general.php b/options/general.php
index 83e1cb9..1303b07 100644
--- a/options/general.php
+++ b/options/general.php
@@ -175,7 +175,7 @@ foreach ($thumbnail_sizes as $size) { ?>
 						</select>
 					</th>
 					<td>
-						<?php _e('The thumbnail for the direct comic and chapter RSS /comic/feed/ and /chapter/chapter-slug/feed/ ','comiceasel'); ?>
+						<?php _e('The thumbnail for the direct comic and chapter RSS /comic/feed/ and /chapter/chapter-slug/feed/','comiceasel'); ?>
 					</td>
 				</tr>
 				<tr class="alternate">
diff --git a/options/main.php b/options/main.php
index 5b6565c..1ff8c18 100644
--- a/options/main.php
+++ b/options/main.php
@@ -8,9 +8,9 @@
 				</thead>
 				<tr>
 					<td>
-						<?php _e('The Comic Easel website: ','comiceasel'); ?> <a href="http://comiceasel.com">http://comiceasel.com</a> <?php _e('probably has the answer you\'re looking for in the form of a post or in the faqs section.','comiceasel'); ?><br />
+						<?php _e('The Comic Easel website:','comiceasel'); ?>&nbsp;<a href="http://comiceasel.com">http://comiceasel.com</a>&nbsp;<?php _e('probably has the answer you\'re looking for in the form of a post or in the faqs section.','comiceasel'); ?><br />
 						<br />
-						<?php _e('You can contact me for technical support at any of the following locations: ','comiceasel'); ?><br />
+						<?php _e('You can contact me for technical support at any of the following locations:','comiceasel'); ?><br />
 						<em><?php _e('(best chances to reach me at the top going down to the least chance)','comiceasel'); ?></em><br />
 						<br />
 						<?php _e('Form Email:','comiceasel'); ?> <a href="http://comiceasel.com/contact/">http://comiceasel.com/contact/</a><br />
diff --git a/widgets/comic-calendar.php b/widgets/comic-calendar.php
index 901f316..4aaab75 100644
--- a/widgets/comic-calendar.php
+++ b/widgets/comic-calendar.php
@@ -97,8 +97,8 @@ function ceo_get_calendar($initial = true, $echo = true, $taxonomy = 'post') {
 			LIMIT 1");
 
 	/* translators: Calendar caption: 1: month name, 2: 4-digit year */
-	$calendar_caption = _x('%1$s %2$s', 'calendar caption');
-	$calendar_output = '<table id="wp-calendar" summary="' . esc_attr__('Calendar') . '">
+	$calendar_caption = _x('%1$s %2$s', 'calendar caption', 'comiceasel');
+	$calendar_output = '<table id="wp-calendar" summary="' . esc_attr__('Calendar','comiceasel') . '">
 	<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
 	<thead>
 	<tr>';
@@ -123,7 +123,7 @@ function ceo_get_calendar($initial = true, $echo = true, $taxonomy = 'post') {
 	<tr>';
 
 	if ( $previous ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link($previous->year, $previous->month) . $the_post_type.'" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month), date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link($previous->year, $previous->month) . $the_post_type.'" title="' . sprintf(__('View posts for %1$s %2$s','comiceasel'), $wp_locale->get_month($previous->month), date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
 	}
@@ -131,7 +131,7 @@ function ceo_get_calendar($initial = true, $echo = true, $taxonomy = 'post') {
 	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
 
 	if ( $next ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link($next->year, $next->month) . $the_post_type.'" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month), date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) ) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link($next->year, $next->month) . $the_post_type.'" title="' . esc_attr( sprintf(__('View posts for %1$s %2$s','comiceasel'), $wp_locale->get_month($next->month), date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) ) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
 	}
diff --git a/widgets/comicblogpost.php b/widgets/comicblogpost.php
index fc15377..235060a 100644
--- a/widgets/comicblogpost.php
+++ b/widgets/comicblogpost.php
@@ -15,7 +15,7 @@ function ceo_display_comic_small_blog_post($instance) {
 	the_content();
 	if ($instance['showcommentlink'] && ($post->comment_status == 'open') && !is_singular()) { ?>
 		<div class="comment-link">
-		<?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span>'.__('Comment&nbsp;','comiceasel'), '<span class="comment-balloon">1</span> '.__('Comment ','comiceasel'), '<span class="comment-balloon">%</span> '.__('Comments ','comiceasel')); ?>
+		<?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span>'.__('Comment','comiceasel'), '<span class="comment-balloon">1</span> '.__('Comment','comiceasel'), '<span class="comment-balloon">%</span> '.__('Comments','comiceasel')); ?>
 		</div>
 		<?php
 	}
diff --git a/widgets/navigation.php b/widgets/navigation.php
index 7e9cb9b..d2f4293 100644
--- a/widgets/navigation.php
+++ b/widgets/navigation.php
@@ -178,7 +178,7 @@ class ceo_comic_navigation_widget extends WP_Widget {
 			$thumbnail = wp_get_attachment_image_src( $post_image_id, 'full', false);
 			if (is_array($thumbnail) && !empty($thumbnail)) { 
 				$thumbnail = reset($thumbnail);
-				echo '<span class="comic-navi-href-info">'.__('Image URL (for hotlinking/embedding): ','comiceasel').$thumbnail.'</span>';
+				echo '<span class="comic-navi-href-info">'.__('Image URL (for hotlinking/embedding):','comiceasel').'&nbsp;'.$thumbnail.'</span>';
 			}
 			?>
 			</td>