diff --git a/TODO b/TODO
index 34cffce..8e32acc 100644
--- a/TODO
+++ b/TODO
@@ -4,4 +4,4 @@ TODOs:
   - Better API Documentation.
   - Robust error handling.
   - Any special handling for linearized PDFs?
-  - Handle security handler. (I need more samples!)
+  - Handle crypt filter. (I need more samples!)
diff --git a/pdfminer/layout.py b/pdfminer/layout.py
index 77ac3a2..218856c 100644
--- a/pdfminer/layout.py
+++ b/pdfminer/layout.py
@@ -77,6 +77,9 @@ class ClusterSet(object):
         self.i = 0
         return
 
+    def __repr__(self):
+        return '<cset: %d>' % self.i
+
     # add(objs): groups text objects if necessary.
     def add(self, objs):
         group = self.klass(self.i, objs)
@@ -350,7 +353,7 @@ class LTTextLine(LayoutContainer):
         return
 
     def __repr__(self):
-        return ('<line %s(%s)>' % (self.get_bbox(), self.direction))
+        return ('<textline %s(%s)>' % (self.get_bbox(), self.direction))
 
     def get_margin(self):
         return min(self.width, self.height)
diff --git a/tools/dumppdf.py b/tools/dumppdf.py
index 60c62d7..8b704a9 100755
--- a/tools/dumppdf.py
+++ b/tools/dumppdf.py
@@ -7,8 +7,9 @@
 #    -i objid : object id
 #
 import sys, re
+from pdfminer.psparser import PSKeyword, PSLiteral
 from pdfminer.pdfparser import PDFDocument, PDFParser
-from pdfminer.pdftypes import PDFStream, PDFObjRef, PSKeyword, PSLiteral, resolve1
+from pdfminer.pdftypes import PDFStream, PDFObjRef, resolve1
 
 
 ESC_PAT = re.compile(r'[\000-\037&<>()\042\047\134\177-\377]')