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/playlists.sgml b/docs/reference/tmpl/playlists.sgml
index 1bfcdb8..edf6e2b 100644
--- a/docs/reference/tmpl/playlists.sgml
+++ b/docs/reference/tmpl/playlists.sgml
@@ -43,7 +43,7 @@ a playlist, etc.
 @reserved101: 
 @reserved_int1: 
 @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_itunesdb.c b/src/itdb_itunesdb.c
index ad4569b..07305e5 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -412,9 +412,14 @@ gchar * itdb_resolve_path (const gchar *root,
 {
   gchar *good_path = g_strdup(root);
   guint32 i;
+  gchar *rel_filename;
 
   if (!root) return NULL;
 
+
+  rel_filename = g_build_filenamev ((char **)components);
+  return g_build_filename (root, rel_filename, NULL);
+
   for(i = 0 ; components[i] ; i++) {
     GDir *cur_dir;
     gchar *component_as_filename;
@@ -6889,7 +6894,7 @@ gchar *itdb_get_control_dir (const gchar *mountpoint)
     gchar *p_iphone[] = {"iTunes_Control", NULL};
     /* Use an array with all possibilities, so further extension will
        be easy */
-    gchar **paths[] = {p_ipod, p_mobile, p_iphone, NULL};
+    gchar **paths[] = {p_iphone, p_mobile, p_ipod, NULL};
     gchar ***ptr;
     gchar *result = NULL;