diff --git a/configure.ac b/configure.ac
index 6723fcc4..be1c9012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 dnl 02110-1301 USA.
 
-define(RELEASE_NUM, 82)
-define(CDIO_VERSION_STR, 0.$1)
+define(RELEASE_NUM, 83)
+define(CDIO_VERSION_STR, 0.$1git)
 
 AC_PREREQ(2.52)
 AC_REVISION([$Id: configure.ac,v 1.238 2008/11/27 21:09:51 rocky Exp $])dnl
diff --git a/doc/doxygen/.gitignore b/doc/doxygen/.gitignore
index eeb3b95d..c547d0a2 100644
--- a/doc/doxygen/.gitignore
+++ b/doc/doxygen/.gitignore
@@ -1 +1,4 @@
+/html
+/latex
 /Doxyfile
+/Doxyfile.bak
diff --git a/doc/how-to-make-a-release.txt b/doc/how-to-make-a-release.txt
index e71e2001..6952cf47 100644
--- a/doc/how-to-make-a-release.txt
+++ b/doc/how-to-make-a-release.txt
@@ -33,6 +33,7 @@
    gnu-ftp-upload libcdio 0.*80*
 
    Also gnupload from the automake distribution.
+   /src/build/automake-1.10/lib/gnupload --to ftp.gnu.org:libcdio libcdio-0.82.tar.gz  (Use "is" password)
 
 - Update/Announce on Freshmeat:
    http://freshmeat.net/add-release/36670/
@@ -45,7 +46,7 @@
   rm *.html
   cp ../../libcdio/doc/doxygen/html/*.html .
   cvs update . 
-    for each "U" html *except libcdio.hmtl* put back remove it 
+    for each "U" html *except libcdio.html* put back remove it 
       with "rm" and "cvs remove"
     for each new "?" html add it
   cvs commit .
@@ -56,9 +57,7 @@
      cp ../libcdio/doc/libcdio.html .
      cvs commit libcdio.html
 
-- Remove old cvs versions 
-
-- Bump version in configure.ac and add "cvs". See place above in 
+- Bump version in configure.ac and add "git". See place above in 
   removal. 
 
 
diff --git a/example/C++/OO/cdtext.cpp b/example/C++/OO/cdtext.cpp
index 0f9b4e1c..cef97568 100644
--- a/example/C++/OO/cdtext.cpp
+++ b/example/C++/OO/cdtext.cpp
@@ -92,6 +92,7 @@ main(int argc, const char *argv[])
 
   if (!device->open(psz_drive, DRIVER_DEVICE)) {
     printf("Couldn't find CD\n");
+    delete(device);
     return 1;
   } else {
     i_first_track = device->getFirstTrackNum();
diff --git a/lib/driver/FreeBSD/freebsd.c b/lib/driver/FreeBSD/freebsd.c
index 30392d46..e8ad5d85 100644
--- a/lib/driver/FreeBSD/freebsd.c
+++ b/lib/driver/FreeBSD/freebsd.c
@@ -737,6 +737,7 @@ close_tray_freebsd (const char *psz_device)
   
   if((i_rc = ioctl(fd, CDIOCCLOSE)) != 0) {
     cdio_warn ("ioctl CDIOCCLOSE failed: %s\n", strerror(errno));  
+    close(fd);
     return DRIVER_OP_ERROR;
   }
   close(fd);
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 14f40462..ab220053 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -439,6 +439,8 @@ cdio_close_tray (const char *psz_orig_drive, /*in/out*/ driver_id_t
     free(psz_drive);
     return drc;
   }
+  
+  free(psz_drive);
   return DRIVER_OP_UNSUPPORTED;
 }
 
diff --git a/lib/driver/netbsd.c b/lib/driver/netbsd.c
index 555038b6..35fb7f34 100644
--- a/lib/driver/netbsd.c
+++ b/lib/driver/netbsd.c
@@ -356,6 +356,7 @@ eject_media_netbsd(void *user_data) {
 		ret = 1;
 	}
 
+	close(fd);
 	return ret;
 }
 
diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index e2fb54b4..8017729d 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -194,8 +194,10 @@ iso9660_open_ext_private (const char *psz_path,
  error:
   if (p_iso && p_iso->stream) {
     cdio_stdio_destroy(p_iso->stream);
-    free(p_iso);
+
+    if (p_iso) free(p_iso);
   }
+  
   return NULL;
 }
 
diff --git a/src/cd-info.c b/src/cd-info.c
index 32ff77a5..f2a903e6 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -530,6 +530,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[],
 
   if (NULL == p_entlist) {
     report( stderr, "Error getting above directory information\n" );
+    free(translated_name);
     return;
   }
 
diff --git a/src/iso-info.c b/src/iso-info.c
index b185f52f..63e60ce5 100644
--- a/src/iso-info.c
+++ b/src/iso-info.c
@@ -210,6 +210,7 @@ print_iso9660_recurse (iso9660_t *p_iso, const char psz_path[])
 
   if (NULL == entlist) {
     report( stderr, "Error getting above directory information\n" );
+    free(translated_name);
     return;
   }
 
diff --git a/test/.gitignore b/test/.gitignore
index 2ebd0c6b..fb6296ca 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -22,6 +22,7 @@
 /testbincue.c
 /testdefault
 /testgetdevices
+/testgetdevices.c
 /testischar
 /testiso9660
 /testisocd