diff -ruN audio/audio.module audio_new/audio.module
--- audio/audio.module	2006-04-19 14:40:54.000000000 -0400
+++ audio_new/audio.module	2006-04-19 14:48:57.000000000 -0400
@@ -9,7 +9,7 @@
 function audio_help($section) {
   switch ($section) {
     case 'audio/by':
-      return t("You can browse for audio by the any following fields.");
+      return t("You can browse for audio by any of the following fields.");
     case 'admin/help#audio':
       $output  = '<p>'. t('The audio module allows users to upload and store audio files on a Drupal site. Audio is an important medium for community communication as the recent rise of the <a href="%elink-en-wikipedia-org">podcast phenomenon</a> demonstrates.', array('%elink-en-wikipedia-org' => 'http://en.wikipedia.org/wiki/Id3')) .'</p>';
       $output .= '<p>'. t('Users create audio nodes by uploading a file from their computer. They are then able to make changes to the metadata, perhaps adding an artist, or removing the track number. Visitors can download the audio file, view the file\'s metadata and encoding information, or browse for audio by metadata (artist, title, year, etc). Visitors can even play MP3s within their browser using the <a href="%elink-musicplayer-sourceforge-net">XSPF flash player</a> that is bundled with the module.', array('%elink-musicplayer-sourceforge-net' => 'http://musicplayer.sourceforge.net/')) .'</p>';
@@ -177,7 +177,7 @@
 
   if ($type == 'node' && $node->type == 'audio') {
     if ($node->url_download) {
-      $links[] = l(t('download audio file'), $node->url_download, NULL);
+      // $links[] = l(t('download audio file'), $node->url_download, NULL);
       $links[] = t('%download_count downloads', array('%download_count' => $node->audio_fileinfo['download_count']));
     }
     $links[] = t('%play_count plays', array('%play_count' => $node->audio_fileinfo['play_count']));
@@ -1399,7 +1399,7 @@
  * @param $pics array of pictures
  * @return false on error
  */
-function audio_write_id3tags($filepath, $tags, $pics = array()) {
+function audio_write_id3tags($filepath, $tags, $pics = array(), $tagformats = array('id3v1', 'id3v2.3')) {
   $getid3_path = variable_get('audio_getid3_path', drupal_get_path('module', 'audio') .'/getid3/getid3/');
   $getID3 = _audio_load_getid3($getid3_path);
 
@@ -1409,7 +1409,7 @@
   require_once($getid3_path .'write.php');
   $tagwriter = new getid3_writetags;
   $tagwriter->filename          = $filepath;
-  $tagwriter->tagformats        = array('id3v2.3', 'id3v1');
+  $tagwriter->tagformats        = $tagformats;
   $tagwriter->tag_encoding      = 'UTF-8';
   $tagwriter->overwrite_tags    = TRUE;
   $tagwriter->remove_other_tags = TRUE;
diff -ruN audio/audio.theme audio_new/audio.theme
--- audio/audio.theme	2006-04-06 05:02:47.000000000 -0400
+++ audio_new/audio.theme	2006-04-19 15:03:18.000000000 -0400
@@ -54,7 +54,10 @@
     }
   }
   $output .= '<li><b>'. t('Length') .':</b> '. theme('audio_format_filelength', $node->audio_fileinfo)  ."</li>\n";
-  $output .= '<li><b>'. t('Format') .':</b> '. theme('audio_format_fileformat', $node->audio_fileinfo) ."</li>\n";
+  if ($node->url_download) {
+    $attribs = array('title' => theme('audio_format_fileformat', $node->audio_fileinfo));
+    $output .= '<li><b>'. t('Download') .':</b> '. l(strtoupper($node->audio_fileinfo['fileformat']), $node->url_download, $attribs) ."</li>\n";
+  }
   $output .= '</ul>';
 
   return $output;