diff --git a/TODO b/TODO
index a021d37d..662d7280 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,7 @@
 Many, many things. Most notably:
 
 * bit-lp increases module count stupidly
+* Segfault if too high /dev/i2c-* file accessed
 * Library: reload does not work (Bison/Flex problem?)
 * Create wait-queues for bus locking instead of pure semaphores, to make
   it more interactive
@@ -33,10 +34,7 @@ Many, many things. Most notably:
 * How to make drivers detect thing *not*; for example, if a Winbond is 
   present, the LM75 driver should not try to access its simulated
   LM75 chips.
-* Write a userland detection program for busses (clients are less important;
-  but perhaps needed too).
 * Some library routines are pretty inefficient right now
 * Test SIS5595(/91/98) sensor support. Write generic i2c support. 
   Thomas Dickel <Thomas.Dickel@mni.fh-giessen.de> owns one SIS5595.
   The sensor data must be added to lib/chips
-* Extend detect script to detect chips too.
diff --git a/prog/detect/detect.pl b/prog/detect/detect.pl
index bb70736a..6a688e0b 100755
--- a/prog/detect/detect.pl
+++ b/prog/detect/detect.pl
@@ -1460,9 +1460,10 @@ sub main
         print "    " if  $is_i2c and $is_isa;
         if ($is_isa) {
           if ($data->{isa_addr}) {
-            printf "ISA bus address 0x%04x", $data->{isa_addr};
+            printf "ISA bus address 0x%04x (Busdriver `i2c-isa')", 
+                   $data->{isa_addr};
           } else {
-            printf "ISA bus, undetermined address"
+            printf "ISA bus, undetermined address (Busdriver `i2c-isa')"
           }
         }
         printf "\n    Chip `%s' (confidence: %d)\n",
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index bb70736a..6a688e0b 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -1460,9 +1460,10 @@ sub main
         print "    " if  $is_i2c and $is_isa;
         if ($is_isa) {
           if ($data->{isa_addr}) {
-            printf "ISA bus address 0x%04x", $data->{isa_addr};
+            printf "ISA bus address 0x%04x (Busdriver `i2c-isa')", 
+                   $data->{isa_addr};
           } else {
-            printf "ISA bus, undetermined address"
+            printf "ISA bus, undetermined address (Busdriver `i2c-isa')"
           }
         }
         printf "\n    Chip `%s' (confidence: %d)\n",