diff --git a/www/rem-default.css b/www/rem-default.css
index 72ff443a..d661ca4b 100644
--- a/www/rem-default.css
+++ b/www/rem-default.css
@@ -21,7 +21,7 @@ th.rem-cal-hdr {
   border-width: 1px;
   vertical-align: top;
 }
-td.rem-empty {
+td.rem-empty, td.rem-cell, td.rem-small-calendar {
   width: 14%;
   height: 7em;
   border-style: solid;
@@ -36,20 +36,7 @@ td.rem-today {
   border-color: #EE3333;
   vertical-align: top;
 }
-td.rem-cell {
-  width: 14%;
-  height: 7em;
-  border-style: solid;
-  border-width: 1px;
-  vertical-align: top;
-}
-td.rem-small-calendar {
-  width: 14%;
-  height: 7em;
-  border-style: solid;
-  border-width: 1px;
-  vertical-align: top;
-}
+
 table.rem-cal {
   width: 100%;
   border-collapse: collapse;
@@ -72,12 +59,7 @@ th.rem-sc-hdr {
   text-align: right;
 }
 
-td.rem-sc-empty-cell {
-  text-align: right;
-  width: 14%;
-}
-
-td.rem-sc-cell {
+td.rem-sc-empty-cell, td.rem-sc-cell {
   text-align: right;
   width: 14%;
 }
diff --git a/www/rem2html b/www/rem2html
index f2dcf7f2..4abde883 100755
--- a/www/rem2html
+++ b/www/rem2html
@@ -73,8 +73,20 @@ sub parse_options
 	       "imgbase|ib:s",
 	       "tableonly|to");
     $Options{'title'} ||= 'HTML Calendar';
-    $Options{'imgbase'} ||= '%IMAGEBASE%';
-    $Options{'stylesheet'} ||= $Options{'imgbase'} . '/rem-default.css';
+
+    # Fix up imgbase
+    my $imgbase = '%IMAGEBASE%';
+    if ($imgbase ne '%' . 'IMAGEBASE' . '%') {
+	    $Options{'imgbase'} ||= $imgbase;
+    } else {
+	    $Options{'imgbase'} ||= '';
+    }
+
+    $Options{'imgbase'} =~ s|/+$||;
+    my $stylesheet = $Options{'imgbase'};
+    $stylesheet .= '/' if ($stylesheet ne '');
+    $stylesheet .= 'rem-default.css';
+    $Options{'stylesheet'} ||= $stylesheet;
 }
 
 =head2 start_output
@@ -316,7 +328,7 @@ sub output_calendar
     # Start the table
     my $class;
     if ($Options{'nostyle'}) {
-	print '<table width="100%" border="1"><caption>' .
+	print '<table width="100%" border="1" cellspacing=\"0\"><caption>' .
 	    $Month . ' ' . $Year . '</caption>' . "\n";
 	print '<tr>';
 	$class = ' width="14%"';