--- print.module.orig	2008-03-05 23:42:07.000000000 +0100
+++ print.module	2008-03-06 15:55:16.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 15:55:02.000000000 +0100
@@ -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>';
     }
   }
@@ -362,8 +362,9 @@
   $print_settings = variable_get('print_settings', print_settings_default());
 
   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\">.*?<\/div>/sim", "", $comments);
     if ($cid != NULL) {
       // Single comment requested, output only the comment
       unset($node->body);