diff --git a/burnmusic b/burnmusic
index 008b4a9..19d4535 100755
--- a/burnmusic
+++ b/burnmusic
@@ -48,8 +48,7 @@ system('cdrecord', '-v -pad -audio', "speed=$cdspeed", "dev=$device", "$temp_dir
 system("rm -rf $temp_dir");
 
 
-# Copyright (c) 2005 John Wiggins
-#
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/cdripper b/cdripper
index de7ab39..edb5e8c 100755
--- a/cdripper
+++ b/cdripper
@@ -304,8 +304,7 @@ sub get_number_of_tracks()
     return pop @tracks;
 }
 
-# Copyright (c) 2004 - 2007 John Wiggins
-#
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/conv2ogg b/conv2ogg
index 2970bc8..396d190 100755
--- a/conv2ogg
+++ b/conv2ogg
@@ -112,8 +112,6 @@ remove_tree $tempdir;
 
 
 
-# Copyright (c) 2005 - 2010 John Wiggins
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/cp2dap b/cp2dap
index d2e331a..353c7bf 100755
--- a/cp2dap
+++ b/cp2dap
@@ -14,8 +14,8 @@ $HELP_MSG = "# Copy files to DAP, converting flac to ogg v$VERSION\n\tusage: cop
 use File::Path qw(make_path remove_tree);
 use Cwd;
 
-my $dest='/mnt/dap/MUSIC';
-my $tmpdir='/tmp/copy_to_dap';
+my $dest='/mnt/phone/music/';
+my $tmpdir='/tmp/cp2dap/';
 
 
 
diff --git a/fixname b/fixname
index 0f516be..2207686 100755
--- a/fixname
+++ b/fixname
@@ -3,9 +3,9 @@
 # File Name Fixer
 #   usage: fixname <files>
 #
-# Renames files to comply with pwiggi's arbitrary standard
+# Renames files to comply with Anna's arbitrary standard
 #
-# This is pwiggi's standard:
+# This is Anna's standard:
 #   1) all letters are lowercase
 #   2) Whitespace becomes underscore
 #   3) Never more than one consecutive underscore
@@ -14,6 +14,7 @@
 #
 # ChangeLog:
 #   0.2.4: More robust stripping of special characters
+#          Added ability to read from stdin
 #   0.2:   Made everything more robust - better at multiple spaces and special
 #          characters now.  Also now renumbering along with ds-audiotools
 #   0.1.4: Added -o option, which prints to stdout instead of renaming the file
@@ -37,9 +38,17 @@ foreach (@ARGV)
     {
 	$toStdOut = true;
     }
+    if (/^-i$/)
+    {
+	$fromStdIn = true;
+    }
 }
 
 @ARGV = grep(!/^-o$/, @ARGV) if ($toStdOut);
+@ARGV = grep(!/^-i$/, @ARGV) if ($fromStdIn);
+
+if ($fromStdIn) { @names = <STDIN>; }
+else { @names = @ARGV; }
 
 foreach (@ARGV)
 {
@@ -62,8 +71,6 @@ foreach (@ARGV)
 }
 
 
-# Copyright (c) 2004 - 2010 John Wiggins
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/tagfromfilename b/tagfromfilename
index 6d0197e..6587f59 100755
--- a/tagfromfilename
+++ b/tagfromfilename
@@ -8,7 +8,7 @@
 #     -T:  Tag names (not tag content) written to the metadata in all caps
 #
 # Adds Vorbiscomment data to ogg vorbis and flac files based on the filename.
-# Files should be in Patrick's arbitrary file name standard, which is:
+# Files should be in Anna's arbitrary file name standard, which is:
 # artist/album/artist-tracknum-title.(ogg|flac|mp3)
 #
 # The top-level directory (artist) is optional.  Filenames should contain no
@@ -205,8 +205,6 @@ sub formatName
 }
 
 
-# Copyright (c) 2005 - 2010 John Wiggins
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or