diff --git a/NOTEDB/dumper.pm b/NOTEDB/dumper.pm
new file mode 100644
index 0000000..3ae1ffb
--- /dev/null
+++ b/NOTEDB/dumper.pm
@@ -0,0 +1,371 @@
+# Perl module for note
+# text database backend. see docu: perldoc NOTEDB::text
+# using Storable as backend.
+
+package NOTEDB::dumper;
+
+$NOTEDB::text::VERSION = "1.00";
+
+use strict;
+use Data::Dumper;
+use File::Spec;
+use MIME::Base64;
+
+use NOTEDB;
+
+use Fcntl qw(LOCK_EX LOCK_UN);
+
+use Exporter ();
+use vars qw(@ISA @EXPORT);
+@ISA = qw(NOTEDB Exporter);
+
+
+
+
+sub new {
+    my($this, %param) = @_;
+
+    my $class = ref($this) || $this;
+    my $self = {};
+    bless($self,$class);
+
+    $self->{NOTEDB}  = $param{dbname}   || File::Spec->catfile($ENV{HOME}, ".notedb");
+
+    if(! -e $param{dbname}) {
+	open(TT,">$param{dbname}") or die "Could not create $param{dbname}: $!\n";
+	close (TT);
+    }
+    elsif(! -w $param{dbname}) {
+	print "$param{dbname} is not writable!\n";
+	exit(1);
+    }
+
+    $self->{LOCKFILE} = $param{dbname} . "~LOCK";
+    $self->{mtime}    = $self->get_stat();
+    $self->{unread}   = 1;
+    $self->{data}     = {};
+
+    return $self;
+}
+
+
+sub DESTROY
+{
+    # clean the desk!
+}
+
+sub version {
+    my $this = shift;
+    return $NOTEDB::text::VERSION;
+}
+
+sub get_stat {
+  my ($this) = @_;
+  my $mtime = (stat($this->{dbname}))[9];
+  return $mtime;
+}
+
+
+sub set_del_all {
+    my $this = shift;
+    unlink $this->{NOTEDB};
+    open(TT,">$this->{NOTEDB}") or die "Could not create $this->{NOTEDB}: $!\n";
+    close (TT);
+}
+
+
+sub get_single {
+    my($this, $num) = @_;
+    my($address, $note, $date, $buffer, $n, $t, $buffer, );
+
+    my %data = $this->get_all();
+    return ($data{$num}->{note}, $data{$num}->{date});
+}
+
+
+sub get_all {
+    my $this = shift;
+    my($num, $note, $date, %res);
+
+    if ($this->unchanged) {
+	return %{$this->{cache}};
+    }
+
+    my %data = $this->_retrieve();
+    foreach my $num (keys %data) {
+	$res{$num}->{note} = $this->ude($data{$num}->{note});
+	$res{$num}->{date} = $this->ude($data{$num}->{date});
+    }
+
+    $this->cache(%res);
+    return %res;
+}
+
+sub import_data {
+  my ($this, $data) = @_;
+  my %res = $this->_retrieve();
+  my $pos = (scalar keys %res) + 1;
+  foreach my $num (keys %{$data}) {
+    $res{$pos}->{note} = $this->uen($data->{$num}->{note});
+    $res{$pos}->{date} = $this->uen($data->{$num}->{date});
+    $pos++;
+  }
+  $this->_store(\%res);
+}
+
+sub get_nextnum {
+    my $this = shift;
+    my($num, $te, $me, $buffer);
+
+    if ($this->unchanged) {
+	$num = 1;
+	foreach (keys %{$this->{cache}}) {
+	    $num++;
+	}
+	return $num;
+    }
+
+    my %data = $this->get_all();
+    my $size = scalar keys %data;
+    $num = $size + 1;
+    return $num;
+}
+
+sub get_search {
+    my($this, $searchstring) = @_;
+    my($buffer, $num, $note, $date, %res, $t, $n, $match);
+
+    my $regex = $this->generate_search($searchstring);
+    eval $regex;
+    if ($@) {
+	print "invalid expression: \"$searchstring\"!\n";
+	return;
+    }
+    $match = 0;
+
+    if ($this->unchanged) {
+	foreach my $num (keys %{$this->{cache}}) {
+	    $_ = $this->{cache}{$num}->{note};
+	    eval $regex;
+	    if ($match) {
+		$res{$num}->{note} = $this->{cache}{$num}->{note};
+		$res{$num}->{date} = $this->{cache}{$num}->{date}
+	    }
+	    $match = 0;
+	}
+	return %res;
+    }
+
+    my %data =  $this->get_all();
+
+    foreach my $num(sort keys %data) {
+	$_ = $data{$num}->{note};
+	eval $regex;
+	if($match)
+	  {
+	      $res{$num}->{note} = $data{$num}->{note};
+	      $res{$num}->{date} = $data{$num}->{data};
+	  }
+	$match = 0;
+    }
+
+    return %res;
+}
+
+
+
+
+sub set_edit {
+    my($this, $num, $note, $date) = @_;
+
+    my %data = $this->_retrieve();
+
+    $data{$num} = {
+		   note => $this->uen($note),
+		   date => $this->uen($date)
+		   };
+
+    $this->_store(\%data);
+
+    $this->changed;
+}
+
+
+sub set_new {
+    my($this, $num, $note, $date) = @_;
+    $this->set_edit($num, $note, $date);
+}
+
+
+sub set_del {
+    my($this, $num) = @_;
+    my(%data, $note, $date, $T, $setnum, $buffer, $n, $N, $t);
+
+    $setnum = 1;
+
+    %data = $this->_retrieve();
+    return "ERROR" if (! exists $data{$num});
+
+    delete $data{$num};
+
+    $this->_store(\%data);
+
+    $this->changed;
+
+    return;
+}
+
+sub set_recountnums {
+    my($this) = @_;
+    my(%orig, %data, $note, $date, $T, $setnum, $buffer, $n, $N, $t);
+
+    $setnum = 1;
+    %orig = $this->_retrieve();
+
+    foreach $N (sort {$a <=> $b} keys %orig) {
+      $data{$setnum} = {
+			note => $orig{$N}->{note},
+			date => $orig{$N}->{date}
+		       };
+	$setnum++;
+    }
+
+    $this->_store(\%data);
+
+    $this->changed;
+
+    return;
+}
+
+sub uen {
+    my ($this, $raw) = @_;
+    my($crypted);
+    if($NOTEDB::crypt_supported == 1) {
+	eval {
+	    $crypted = $this->{cipher}->encrypt($raw);
+	    return encode_base64($crypted);
+	};
+    }
+    else {
+	return $raw;
+    }
+}
+
+sub ude {
+    my ($this, $crypted) = @_;
+    my($raw);
+    if($NOTEDB::crypt_supported == 1) {
+      eval {
+	$raw = $this->{cipher}->decrypt(decode_base64($crypted));
+      };
+      return $raw;
+    }
+    else {
+      return $crypted;
+    }
+}
+
+
+sub _store {
+  my ($this, $data) = @_;
+  open N, ">$this->{NOTEDB}" or die "Could not open db: $!\n";
+  print N Data::Dumper->Dump([$data], [qw(*data)]);
+  close N;
+}
+
+sub _retrieve {
+  my $this = shift;
+  if (-s $this->{NOTEDB}) {
+    if ($this->changed() || $this->{unread}) {
+      open N, "<$this->{NOTEDB}" or die "Could not open db: $!\n";
+      my $content = join "", <N>;
+      close N;
+      my %data;
+      eval $content;  # creates %data
+      $this->{unread} = 0;
+      $this->{data}   = \%data;
+      return %data;
+    }
+  }
+  else {
+    return ();
+  }
+}
+
+
+1; # keep this!
+
+__END__
+
+=head1 NAME
+
+NOTEDB::text - module lib for accessing a notedb from perl
+
+=head1 SYNOPSIS
+
+	# include the module
+	use NOTEDB;
+
+	# create a new NOTEDB object
+	$db = new NOTEDB("text", "/home/tom/.notedb", 4096, 24);
+
+	# decide to use encryption
+	# $key is the cipher to use for encryption
+	# $method must be either Crypt::IDEA or Crypt::DES
+	# you need Crypt::CBC, Crypt::IDEA and Crypt::DES to have installed.
+	$db->use_crypt($key,$method);
+
+	# do not use encryption
+	# this is the default
+	$db->no_crypt;
+
+	# get a single note
+	($note, $date) = $db->get_single(1);
+
+	# search for a certain note 
+	%matching_notes = $db->get_search("somewhat");
+	# format of returned hash:
+	#$matching_notes{$numberofnote}->{'note' => 'something', 'date' => '23.12.2000 10:33:02'}
+
+	# get all existing notes
+	%all_notes = $db->get_all();
+	# format of returnes hash like the one from get_search above
+
+	# get the next noteid available
+	$next_num = $db->get_nextnum();
+
+	# modify a certain note
+	$db->set_edit(1, "any text", "23.12.2000 10:33:02");
+
+	# create a new note
+	$db->set_new(5, "any new text", "23.12.2000 10:33:02");
+
+	# delete a certain note
+	$db->set_del(5);
+
+        # turn on encryption. CryptMethod must be IDEA, DES or BLOWFISH
+        $db->use_crypt("passphrase", "CryptMethod");
+
+        # turn off encryption. This is the default.
+        $db->no_crypt();
+
+
+=head1 DESCRIPTION
+
+You can use this module for accessing a note database. This backend uses
+a text file for storage and Storable for accessing the file.
+
+Currently, NOTEDB module is only used by note itself. But feel free to use it
+within your own project! Perhaps someone want to implement a webinterface to
+note...
+
+=head1 USAGE
+
+please see the section SYNOPSIS, it says it all.
+
+=head1 AUTHOR
+
+Thomas Linden <tom@daemon.de>.
+
+
+=cut
diff --git a/NOTEDB/mysql.pm b/NOTEDB/mysql.pm
index 4417cdd..f17478c 100644
--- a/NOTEDB/mysql.pm
+++ b/NOTEDB/mysql.pm
@@ -6,7 +6,7 @@
 
 package NOTEDB::mysql;
 
-$NOTEDB::mysql::VERSION = "1.50";
+$NOTEDB::mysql::VERSION = "1.51";
 
 use DBI;
 use strict;
@@ -35,24 +35,25 @@ sub new {
     my $fnum     = "number";
     my $fnote    = "note";
     my $fdate    = "date";
+    my $ftopic   = "topic";
 
     my $database;
     if ($dbport) {
-	$database = "DBI:$dbdriver:$dbname;host=$dbhost:$dbport";
+	$database = "DBI:mysql:$dbname;host=$dbhost:$dbport";
     }
     else {
-	$database = "DBI:$dbdriver:$dbname;host=$dbhost";
+	$database = "DBI:mysql:$dbname;host=$dbhost";
     }
 
-    $self->{table}         = "table";
+    $self->{table}         = "note";
 
-    $self->{sql_getsingle} = "SELECT $fnote,$fdate FROM $self->{table} WHERE $fnum = ?";
-    $self->{sql_all}       = "SELECT $fnum,$fnote,$fdate FROM $self->{table}";
+    $self->{sql_getsingle} = "SELECT $fnote,$fdate,$ftopic FROM $self->{table} WHERE $fnum = ?";
+    $self->{sql_all}       = "SELECT $fnum,$fnote,$fdate,$ftopic FROM $self->{table}";
     $self->{sql_nextnum}   = "SELECT max($fnum) FROM $self->{table}";
     $self->{sql_incrnum}   = "SELECT $fnum FROM $self->{table} ORDER BY $fnum";
     $self->{sql_setnum}    = "UPDATE $self->{table} SET $fnum = ? WHERE $fnum = ?";
-    $self->{sql_edit}      = "UPDATE $self->{table} SET $fnote = ?,$fdate = ? WHERE $fnum = ?";
-    $self->{sql_insertnew} = "INSERT INTO $self->{table} VALUES (?, ?, ?)";
+    $self->{sql_edit}      = "UPDATE $self->{table} SET $fnote = ?, $fdate = ?, $ftopic = ? WHERE $fnum = ?";
+    $self->{sql_insertnew} = "INSERT INTO $self->{table} VALUES (?, ?, ?, ?)";
     $self->{sql_del}       = "DELETE FROM $self->{table} WHERE $fnum = ?";
     $self->{sql_del_all}   = "DELETE FROM $self->{table}";
 
@@ -95,14 +96,18 @@ sub version {
 sub get_single {
     my($this, $num) = @_;
 
-    my($note, $date);
+    my($note, $date, $topic);
     my $statement = $this->{DB}->prepare($this->{sql_getsingle}) || die $this->{DB}->errstr();
 
     $statement->execute($num) || die $this->{DB}->errstr();
-    $statement->bind_columns(undef, \($note, $date)) || die $this->{DB}->errstr();
+    $statement->bind_columns(undef, \($note, $date, $topic)) || die $this->{DB}->errstr();
 
     while($statement->fetch) {
-	return $this->ude($note), $this->ude($date);
+      $note = $this->ude($note);
+      if ($topic) {
+	$note = "$topic\n" . $note;
+      }
+      return $note, $this->ude($date);
     }
 }
 
@@ -110,7 +115,7 @@ sub get_single {
 sub get_all
 {
     my $this = shift;
-    my($num, $note, $date, %res);
+    my($num, $note, $date, %res, $topic);
 
     if ($this->unchanged) {
 	return %{$this->{cache}};
@@ -119,11 +124,14 @@ sub get_all
     my $statement = $this->{DB}->prepare($this->{sql_all}) or die $this->{DB}->errstr();
 
     $statement->execute or die $this->{DB}->errstr();
-    $statement->bind_columns(undef, \($num, $note, $date)) or die $this->{DB}->errstr();
+    $statement->bind_columns(undef, \($num, $note, $date, $topic)) or die $this->{DB}->errstr();
 
     while($statement->fetch) {
 	$res{$num}->{'note'} = $this->ude($note);
 	$res{$num}->{'date'} = $this->ude($date);
+	if ($topic) {
+	  $res{$num}->{'note'} = "$topic\n" . $res{$num}->{'note'};
+	}
     }
 
     $this->cache(%res);
@@ -156,7 +164,7 @@ sub get_nextnum
 sub get_search
 {
     my($this, $searchstring) = @_;
-    my($num, $note, $date, %res, $match, $use_cache);
+    my($num, $note, $date, %res, $match, $use_cache, $topic);
 
     my $regex = $this->generate_search($searchstring);
     eval $regex;
@@ -182,11 +190,14 @@ sub get_search
     my $statement = $this->{DB}->prepare($this->{sql_all}) or die $this->{DB}->errstr();
 
     $statement->execute or die $this->{DB}->errstr();
-    $statement->bind_columns(undef, \($num, $note, $date)) or die $this->{DB}->errstr();
+    $statement->bind_columns(undef, \($num, $note, $date, $topic)) or die $this->{DB}->errstr();
 
     while($statement->fetch) {
 	$note = $this->ude($note);
 	$date = $this->ude($date);
+	if ($topic) {
+	  $note = "$topic\n" . $note;
+	}
 	$_ = $note;
 	eval $regex;
 	if($match) {
@@ -222,9 +233,12 @@ sub set_new
     $this->lock;
     my $statement = $this->{DB}->prepare($this->{sql_insertnew}) || die $this->{DB}->errstr();
 
+    my ($topic, $note) = $this->get_topic($note);
+
     $note =~ s/'/\'/g;
     $note =~ s/\\/\\\\/g;
-    $statement->execute($num, $this->uen($note), $this->uen($date)) || die $this->{DB}->errstr();
+    $topic =~ s/\\/\\\\/g;
+    $statement->execute($num, $this->uen($note), $this->uen($date), $topic) || die $this->{DB}->errstr();
     $this->unlock;
     $this->changed;
 }
@@ -291,7 +305,7 @@ sub import_data {
   my ($this, $data) = @_;
   foreach my $num (keys %{$data}) {
     my $pos = $this->get_nextnum();
-    $this->set_edit($pos, $data->{$num}->{note}, $data->{$num}->{date});
+    $this->set_new($pos, $data->{$num}->{note}, $data->{$num}->{date});
   }
 }
 
@@ -326,6 +340,17 @@ sub ude
     }
 }
 
+sub get_topic {
+  my ($this, $data) = @_;
+  if ($data =~ /^\//) {
+    my($topic, $note) = split /\n/, $data, 2;
+    return ($topic, $note);
+  }
+  else {
+    return ("", $data);
+  }
+}
+
 1; # keep this!
 
 __END__
diff --git a/NOTEDB/text.pm b/NOTEDB/text.pm
index 783529c..b06edee 100644
--- a/NOTEDB/text.pm
+++ b/NOTEDB/text.pm
@@ -4,7 +4,7 @@
 
 package NOTEDB::text;
 
-$NOTEDB::text::VERSION = "1.01";
+$NOTEDB::text::VERSION = "1.03";
 
 use strict;
 #use Data::Dumper;
@@ -121,16 +121,22 @@ sub get_nextnum {
     my($num, $te, $me, $buffer);
 
     if ($this->unchanged) {
-	$num = 1;
-	foreach (keys %{$this->{cache}}) {
-	    $num++;
-	}
-	return $num;
+      my @numbers = sort { $a <=> $b } keys %{$this->{cache}};
+      $num = pop @numbers;
+      $num++;
+      #$num = 1;
+      #foreach (keys %{$this->{cache}}) {
+      #    $num++;
+      #}
+      return $num;
     }
 
     my %data = $this->get_all();
-    my $size = scalar keys %data;
-    $num = $size + 1;
+    my @numbers = sort { $a <=> $b } keys %data;
+    $num = pop @numbers;
+    $num++;
+    #my $size = scalar keys %data;
+    #$num = $size + 1;
     return $num;
 }
 
@@ -219,24 +225,7 @@ sub set_del {
 }
 
 sub set_recountnums {
-    my($this) = @_;
-    my(%orig, %data, $note, $date, $T, $setnum, $buffer, $n, $N, $t);
-
-    $setnum = 1;
-    %orig = $this->_retrieve();
-
-    foreach $N (sort {$a <=> $b} keys %orig) {
-      $data{$setnum} = {
-			note => $orig{$N}->{note},
-			date => $orig{$N}->{date}
-		       };
-	$setnum++;
-    }
-
-    $this->_store(\%data);
-
-    $this->changed;
-
+    # not required here
     return;
 }