--- print.module.orig	2008-03-05 23:42:07.000000000 +0100
+++ print.module	2008-03-06 18:08:14.000000000 +0100
@@ -123,7 +123,7 @@
 
   $print_html_settings = variable_get('print_html_settings', print_html_settings_default());
   // No link is shown for several motives...
-  if ( !($teaser) && ($node->type != 'book') && (!$node->book) &&
+  if ( !($teaser) && (isset($node->type) && $node->type != 'book') && (!isset($node->book)) &&
       ($print_html_settings['show_link']) && user_access('access print') &&
       (($type == 'comment' && $print_display_comment) ||
       ($type == 'node' && $print_display))) {
@@ -160,9 +160,10 @@
 
       if ($print_html_settings['book_link']) {
         $format = theme('print_format_link');
-        $format['attributes']['title'] = $link['attributes']['title'];
 
-        $links[$module]['href'] = PRINT_PATH ."/". $link['href'];
+        $links[$module]['href'] = PRINT_PATH ."/". $node->nid;
+        $links[$module]['title'] = $format['text'];
+        $links[$module]['html'] = $format['html'];
         $links[$module]['attributes'] = $format['attributes'];
       }
     }
--- print.pages.inc.orig	2008-03-04 10:42:39.000000000 +0100
+++ print.pages.inc	2008-03-06 18:08:12.000000000 +0100
@@ -17,7 +17,7 @@
   // Remove the print/ prefix
   $args = substr($_GET['q'], strpos($_GET['q'], '/')+1);
 
-  $cid = $_GET['comment'];
+  if (isset($_GET['comment'])) $cid = $_GET['comment'];
 
   $nid = $args;
   if (!is_numeric($nid)) {
@@ -143,6 +143,7 @@
   $print["site_name"] = variable_get('site_name', 0) ? ($themed['published'] ." ". variable_get('site_name', 0) ." (". l($base_url, $base_url) .")") : "";
   $print["submitted"] = theme_get_setting("toggle_node_info_$node->type") ? $themed['by'] ." ". ($node->name ? $node->name : variable_get('anonymous', t('Anonymous'))) : "";
   $print["created"] = theme_get_setting("toggle_node_info_$node->type") ? $themed['created'] ." ". format_date($node->created, 'small') : "";
+  $print["footer_message"] = filter_xss_admin(variable_get('site_footer', FALSE)) ."\n". theme('blocks', 'footer') ;
 
   menu_set_active_item($path);
   $breadcrumb = drupal_get_breadcrumb();
@@ -158,8 +159,8 @@
   if (!empty($print_settings['urls'])) {
     $urls = _print_friendly_urls();
     $max = count($urls);
+    $print["pfp_links"] = '';
     if ($max) {
-      $print["pfp_links"] = '';
       for ($i = 0; $i < $max; $i++) {
         $print["pfp_links"] .= '['. ($i + 1) .'] '. $urls[$i] ."<br />\n";
       }
@@ -167,7 +168,6 @@
     }
   }
 
-  $print["footer_message"] = filter_xss_admin(variable_get('site_footer', FALSE)) ."\n". theme('blocks', 'footer') ;
 
   if (module_exists('taxonomy')) {
     $terms = taxonomy_link('taxonomy terms', $node);
@@ -261,7 +261,7 @@
   $ret = '<'. $matches[1] .'>';
   if (count($matches) == 4) {
     $ret .= $matches[2] . $matches[3];
-    if (($pfurls) && ($newurl)) {
+    if (($pfurls) && (isset($newurl))) {
       $ret .= ' <span class="print-footnote">['. _print_friendly_urls(trim(stripslashes($newurl))) .']</span>';
     }
   }
@@ -361,9 +361,10 @@
 
   $print_settings = variable_get('print_settings', print_settings_default());
 
-  if (function_exists(comment_render) && (($cid != NULL) || ($print_settings['comments']))) {
+  if (function_exists('comment_render') && (($cid != NULL) || ($print_settings['comments']))) {
+    $comments = "<br /><h2>Comments</h2>";
     //Print only the requested comment (or if $cid is NULL, all of them)
-    $comments = comment_render($node, $cid);
+    $comments .= comment_render($node, $cid);
     
     //Remove the comment forms
     $comments = preg_replace("/<form.*?id=\"comment-.*?\">.*?<\/form>/sim", "", $comments);
@@ -371,8 +372,10 @@
     $comments = preg_replace("/<h2.*?>Post new comment<\/h2>/", "", $comments);
     //Remove the comment title hyperlink
     $comments = preg_replace("/(<h3.*?>)(<a.*?>)(.*?)<\/a>(<\/h3>)/", "$1$3$4", $comments);
+    //Remove the comment author link
+    $comments = preg_replace("/(by.*?)<a.*?>(.*?)<\/a>/", "$1$2", $comments);
     //Remove the comment links
-    $comments = preg_replace("/\s*<div class=\"links\">.*?<\/div>/sim", "", $comments);
+    $comments = preg_replace("/\s*<ul class=\"links\">.*?<\/ul>/sim", "", $comments);
     if ($cid != NULL) {
       // Single comment requested, output only the comment
       unset($node->body);
--- print_pdf.module.orig	2008-03-05 23:42:07.000000000 +0100
+++ print_pdf.module	2008-03-06 18:08:08.000000000 +0100
@@ -64,8 +64,10 @@
   static $print_pdf_display_comment = FALSE;
 
   if ($print_pdf_display == FALSE) {
-    $print_pdf_display_comment = variable_get('print_pdf_display_comment_'. $node->type, '0');
-    $print_pdf_display = variable_get('print_pdf_display_'. $node->type, '1');
+    $nodetype = 'node';
+    if (isset($node->type)) $nodetype = $node->type;
+    $print_pdf_display_comment = variable_get('print_pdf_display_comment_'.$nodetype, '0');
+    $print_pdf_display = variable_get('print_pdf_display_'.$nodetype, '1');
   }
 
   $print_pdf_settings = variable_get('print_pdf_settings', print_pdf_settings_default());
--- print.css.orig	2008-02-12 02:10:23.000000000 +0100
+++ print.css	2008-03-06 18:08:05.000000000 +0100
@@ -10,6 +10,7 @@
 a:visited {color: #000;}
 a:hover {color: #00f}
 a:link img, a:visited img {border:0}
+div.indented {padding-left:5%}
 
 .print-footnote {font-size:xx-small;}
 .print-logo {border:0;}