diff --git a/app/Editor.java b/app/Editor.java
index 17bfe62c1..a0923ab81 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -570,7 +570,6 @@ public class Editor extends JFrame
           handlePageSetup();
         }
       });
-    //item.setEnabled(false);
     menu.add(item);
 
     item = newJMenuItem("Print", 'P');
@@ -1849,6 +1848,9 @@ public class Editor extends JFrame
     } else {
       printerJob.setPrintable(textarea.getPainter());
     }
+    // set the name of the job to the code name
+    printerJob.setJobName(sketch.current.name);
+
     if (printerJob.printDialog()) {
       try {
         printerJob.print();
diff --git a/app/syntax/TextAreaPainter.java b/app/syntax/TextAreaPainter.java
index d24456fe8..299a97e13 100644
--- a/app/syntax/TextAreaPainter.java
+++ b/app/syntax/TextAreaPainter.java
@@ -412,11 +412,9 @@ implements TabExpander, Printable
 
 
   public int print(Graphics g, PageFormat pageFormat, int pageIndex) {
-    //System.out.println("painter page format is " + pageFormat);
     int lineHeight = fm.getHeight();
     int linesPerPage = (int) (pageFormat.getImageableHeight() / lineHeight);
     int lineCount = textArea.getLineCount();
-    //int pageCount = (lineCount + linesPerPage-1) / linesPerPage;
     int lastPage = lineCount / linesPerPage;
 
     if (pageIndex > lastPage) {
@@ -426,7 +424,7 @@ implements TabExpander, Printable
       Graphics2D g2d = (Graphics2D)g;
       TokenMarker tokenMarker = textArea.getDocument().getTokenMarker();
       int firstLine = pageIndex*linesPerPage;
-      g2d.translate(pageFormat.getImageableX(),
+      g2d.translate(Math.max(54, pageFormat.getImageableX()),
                     pageFormat.getImageableY() - firstLine*lineHeight);
       printing = true;
       for (int line = firstLine; line < firstLine + linesPerPage; line++) {