diff --git a/docs/reference/tmpl/device.sgml b/docs/reference/tmpl/device.sgml
index 225b153..43f8380 100644
--- a/docs/reference/tmpl/device.sgml
+++ b/docs/reference/tmpl/device.sgml
@@ -160,6 +160,12 @@ These functions are for reading and setting information about the iPod.
 @ITDB_IPOD_GENERATION_TOUCH_1: 
 @ITDB_IPOD_GENERATION_IPHONE_1: 
 @ITDB_IPOD_GENERATION_SHUFFLE_4: 
+@ITDB_IPOD_GENERATION_TOUCH_2: 
+@ITDB_IPOD_GENERATION_IPHONE_2: 
+@ITDB_IPOD_GENERATION_IPHONE_3: 
+@ITDB_IPOD_GENERATION_CLASSIC_3: 
+@ITDB_IPOD_GENERATION_NANO_5: 
+@ITDB_IPOD_GENERATION_TOUCH_3: 
 
 <!-- ##### FUNCTION itdb_info_get_ipod_generation_string ##### -->
 <para>
@@ -211,8 +217,10 @@ These functions are for reading and setting information about the iPod.
 @ITDB_IPOD_MODEL_SHUFFLE_RED: 
 @ITDB_IPOD_MODEL_CLASSIC_SILVER: 
 @ITDB_IPOD_MODEL_CLASSIC_BLACK: 
-@ITDB_IPOD_MODEL_TOUCH_BLACK: 
+@ITDB_IPOD_MODEL_TOUCH_SILVER: 
 @ITDB_IPOD_MODEL_SHUFFLE_BLACK: 
+@ITDB_IPOD_MODEL_IPHONE_WHITE: 
+@ITDB_IPOD_MODEL_IPHONE_BLACK: 
 
 <!-- ##### FUNCTION itdb_info_get_ipod_model_name_string ##### -->
 <para>
diff --git a/docs/reference/tmpl/itunesdb-db.sgml b/docs/reference/tmpl/itunesdb-db.sgml
index 3074fed..980135f 100644
--- a/docs/reference/tmpl/itunesdb-db.sgml
+++ b/docs/reference/tmpl/itunesdb-db.sgml
@@ -100,9 +100,9 @@ library _duplicate()/_free() functions.
 @device: 
 @version: 
 @id: 
-@reserved_int1: 
+@tzoffset: 
 @reserved_int2: 
-@reserved1: 
+@priv: 
 @reserved2: 
 @usertype: 
 @userdata: 
diff --git a/docs/reference/tmpl/track.sgml b/docs/reference/tmpl/track.sgml
index ad15392..2a591e0 100644
--- a/docs/reference/tmpl/track.sgml
+++ b/docs/reference/tmpl/track.sgml
@@ -126,7 +126,7 @@ information about an iPod track.
 @unk252: 
 @gapless_track_flag: 
 @gapless_album_flag: 
-@album_id: 
+@obsolete: 
 @artwork: 
 @mhii_link: 
 @reserved_int1: 
@@ -135,7 +135,7 @@ information about an iPod track.
 @reserved_int4: 
 @reserved_int5: 
 @reserved_int6: 
-@reserved1: 
+@priv: 
 @reserved2: 
 @reserved3: 
 @reserved4: 
@@ -157,6 +157,8 @@ information about an iPod track.
 @ITDB_MEDIATYPE_AUDIOBOOK: 
 @ITDB_MEDIATYPE_MUSICVIDEO: 
 @ITDB_MEDIATYPE_TVSHOW: 
+@ITDB_MEDIATYPE_RINGTONE: 
+@ITDB_MEDIATYPE_RENTAL: 
 
 <!-- ##### MACRO ITDB_RATING_STEP ##### -->
 <para>
diff --git a/src/itdb_sqlite.c b/src/itdb_sqlite.c
index a4eac73..24240b1 100644
--- a/src/itdb_sqlite.c
+++ b/src/itdb_sqlite.c
@@ -1025,21 +1025,13 @@ static void mk_Locations(Itdb_iTunesDB *itdb, const char *outpath, const char *u
     sqlite3_stmt *stmt = NULL;
     const char *sqltail = NULL;
     char *errmsg = NULL;
-    struct stat fst;
     int idx = 0;
    
     dbf = g_build_filename(outpath, "Locations.itdb", NULL);
     printf("[%s] Processing '%s'\n", __func__, dbf);
-    if (stat(dbf, &fst) != 0) {
-	if (errno == ENOENT) {
-	    /* file is not present. so we will create it */
-	} else {
-	    fprintf(stderr, "[%s] Error: stat: %s\n", __func__, strerror(errno));
-	    goto leave;
-	}
-    } else {
-	/* file is present. delete it, we'll re-create it. */
-	if (unlink(dbf) != 0) {
+    /* file is present. delete it, we'll re-create it. */
+    if (g_unlink(dbf) != 0) {
+	if (errno != ENOENT) {
 	    fprintf(stderr, "[%s] could not delete '%s': %s\n", __func__, dbf, strerror(errno));
 	    goto leave;
 	}