diff --git a/PerlLib/SingleLinkageClusterer.pm b/PerlLib/SingleLinkageClusterer.pm
index a3a1fa3..0a32a95 100755
--- a/PerlLib/SingleLinkageClusterer.pm
+++ b/PerlLib/SingleLinkageClusterer.pm
@@ -1,3 +1,5 @@
+#!/usr/bin/env perl
+
 package main;
 our $CLUSTERPATH;
 
@@ -12,39 +14,45 @@ package SingleLinkageClusterer;
 ##              return ([1,2,3] , [6,7,8], ...)
 
 use strict;
+use warnings;
+
+__run_test() unless caller;
 
 sub build_clusters {
     my @pairs = @_;
-    my $pairfile = "/tmp/$$.pairs";
+    
+    my $uniq_stamp = "$$." . time() . "." . rand();
+    
+    my $pairfile = "/tmp/$uniq_stamp.pairs";
     
     #must do mapping because cluster program doesn't like word chars, just ints.
     my %map_id_to_feat; 
     my %map_feat_to_id;
     my $id = 1;
-
+    
     open (PAIRLIST, ">$pairfile") or die "Can't write $pairfile to /tmp";
     foreach my $pair (@pairs) {
-	my ($a, $b) = @$pair;
-	unless ($map_feat_to_id{$a}) {
-	    $map_feat_to_id{$a} = $id;
-	    $map_id_to_feat{$id} = $a;
-	    $id++;
-	}
-	unless ($map_feat_to_id{$b}) {
-	    $map_feat_to_id{$b} = $id;
-	    $map_id_to_feat{$id} = $b;
-	    $id++;
-	}
-	
-	print PAIRLIST "$map_feat_to_id{$a} $map_feat_to_id{$b}\n";
+        my ($a, $b) = @$pair;
+        unless ($map_feat_to_id{$a}) {
+            $map_feat_to_id{$a} = $id;
+            $map_id_to_feat{$id} = $a;
+            $id++;
+        }
+        unless ($map_feat_to_id{$b}) {
+            $map_feat_to_id{$b} = $id;
+            $map_id_to_feat{$id} = $b;
+            $id++;
+        }
+        
+        print PAIRLIST "$map_feat_to_id{$a} $map_feat_to_id{$b}\n";
     }
     close PAIRLIST;
     
-    my $clusterfile = "/tmp/$$.clusters";
-
+    my $clusterfile = "/tmp/$uniq_stamp.clusters";
+    
     my $cluster_prog = "slclust"; 
     if ($CLUSTERPATH) {
-	$cluster_prog = $CLUSTERPATH;
+        $cluster_prog = $CLUSTERPATH;
     }
     
     system "touch $clusterfile";
@@ -52,20 +60,20 @@ sub build_clusters {
     my $cmd = "$cluster_prog < $pairfile > $clusterfile";
     my $ret = system ($cmd);
     if ($ret) {
-	die "ERROR: Couldn't run cluster properly via path: $cluster_prog.\ncmd: $cmd";
+        die "ERROR: Couldn't run cluster properly via path: $cluster_prog.\ncmd: $cmd";
     }
-
+    
     my @clusters;
     open (CLUSTERS, $clusterfile);
     
     while (my $line = <CLUSTERS>) {
-	my @elements;
-	while ($line =~ /(\d+)\s?/g) {
-	    push (@elements, $map_id_to_feat{$1});
-	}
-	if (@elements) {
-	    push (@clusters, [@elements]);
-	}
+        my @elements;
+        while ($line =~ /(\d+)\s?/g) {
+            push (@elements, $map_id_to_feat{$1});
+        }
+        if (@elements) {
+            push (@clusters, [@elements]);
+        }
     }
     
     close CLUSTERS;
@@ -77,4 +85,23 @@ sub build_clusters {
 }
 
 
+############
+## Testing
+###########
+
+sub __run_test {
+    
+    my @pairs = ( [1,2], [2,3], [4,5] );
+
+    my @clusters = &SingleLinkageClusterer::build_clusters(@pairs);
+
+    use Data::Dumper;
+    
+    print "Input: " . Dumper(\@pairs);
+    print "Output: " . Dumper(\@clusters);
+
+    exit(0);
+}
+
+
 1;
diff --git a/scripts/create_mysql_cdnaassembly_db.dbi b/scripts/create_mysql_cdnaassembly_db.dbi
index 2742ed3..e491e10 100755
--- a/scripts/create_mysql_cdnaassembly_db.dbi
+++ b/scripts/create_mysql_cdnaassembly_db.dbi
@@ -54,7 +54,10 @@ my $mysql_rw_password = &Pasa_conf::getParam("MYSQL_RW_PASSWORD");
 
 ## Create the database if needed
 my $dbproc = &Mysql_connect::connect_to_db($mysql_server,"",$mysql_rw_user,$mysql_rw_password);
-&Mysql_connect::RunMod($dbproc,"drop database $mysql_db") if $opt_r;
+eval {
+    &Mysql_connect::RunMod($dbproc,"drop database $mysql_db") if $opt_r;
+};
+
 my $query = "create database $mysql_db";
 &Mysql_connect::RunMod($dbproc, $query);
 $dbproc->disconnect;