diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
diff --git a/docs/reference/libgpod-docs.xml b/docs/reference/libgpod-docs.xml
diff --git a/docs/reference/libgpod-overrides.txt b/docs/reference/libgpod-overrides.txt
diff --git a/docs/reference/libgpod-sections.txt b/docs/reference/libgpod-sections.txt
diff --git a/docs/reference/tmpl/Internal.sgml b/docs/reference/tmpl/Internal.sgml
diff --git a/docs/reference/tmpl/artwork.sgml b/docs/reference/tmpl/artwork.sgml
diff --git a/docs/reference/tmpl/device.sgml b/docs/reference/tmpl/device.sgml
diff --git a/docs/reference/tmpl/itunesdb-copying.sgml b/docs/reference/tmpl/itunesdb-copying.sgml
diff --git a/docs/reference/tmpl/itunesdb-db.sgml b/docs/reference/tmpl/itunesdb-db.sgml
diff --git a/docs/reference/tmpl/itunesdb-lowlevel.sgml b/docs/reference/tmpl/itunesdb-lowlevel.sgml
diff --git a/docs/reference/tmpl/itunesdb-time.sgml b/docs/reference/tmpl/itunesdb-time.sgml
diff --git a/docs/reference/tmpl/libgpod-unused.sgml b/docs/reference/tmpl/libgpod-unused.sgml
diff --git a/docs/reference/tmpl/photodb.sgml b/docs/reference/tmpl/photodb.sgml
diff --git a/docs/reference/tmpl/playlists.sgml b/docs/reference/tmpl/playlists.sgml
diff --git a/docs/reference/tmpl/smart-playlists.sgml b/docs/reference/tmpl/smart-playlists.sgml
diff --git a/docs/reference/tmpl/track.sgml b/docs/reference/tmpl/track.sgml
diff --git a/docs/reference/version.xml.in b/docs/reference/version.xml.in
diff --git a/src/db-artwork-debug.c b/src/db-artwork-debug.c
index 664b605..9bc346c 100644
--- a/src/db-artwork-debug.c
+++ b/src/db-artwork-debug.c
@@ -26,6 +26,23 @@
 
 /* FIXME: endianness (whole file) */
 
+G_GNUC_INTERNAL void
+dump_mhii (MhiiHeader *mhii)
+{
+	g_print ("MHII (%d):\n", sizeof (MhiiHeader));
+	g_print ("\tHeader length: %d\n", GINT_FROM_LE (mhii->header_len));
+	g_print ("\tTotal length: %d\n", GINT_FROM_LE (mhii->total_len));
+	g_print ("\tNumber of children: %d\n", GINT_FROM_LE (mhii->num_children));
+	g_print ("\tImage ID: %08x\n", GINT_FROM_LE (mhii->image_id));
+	g_print ("\tSong ID: %016llx\n", GINT64_FROM_LE (mhii->song_id));
+	g_print ("\tUnknown4: %08x\n", GINT_FROM_LE (mhii->unknown4));
+	g_print ("\tRating: %08x\n", GINT_FROM_LE (mhii->rating));
+	g_print ("\tUnknown6: %08x\n", GINT_FROM_LE (mhii->unknown6));
+	g_print ("\tOrig Date: %08x\n", GINT_FROM_LE (mhii->orig_date));
+	g_print ("\tDigitised Date: %08x\n", GINT_FROM_LE (mhii->digitized_date));
+	g_print ("\tImage size: %d bytes\n", GINT_FROM_LE (mhii->orig_img_size));
+}
+
 #ifdef DEBUG_ARTWORKDB
 G_GNUC_INTERNAL void
 dump_mhif (MhifHeader *mhif)
diff --git a/src/db-artwork-debug.h b/src/db-artwork-debug.h
index 604ea84..4ce5518 100644
--- a/src/db-artwork-debug.h
+++ b/src/db-artwork-debug.h
@@ -48,7 +48,7 @@ extern G_GNUC_INTERNAL void dump_mhba (MhbaHeader *mhba);
 #define dump_mhod_type_3(x)
 #define dump_mhni(x)
 #define dump_mhod(x)
-#define dump_mhii(x)
+extern G_GNUC_INTERNAL void dump_mhii (MhiiHeader *mhii);
 #define dump_mhl(x,y)
 #define dump_mhsd(x)
 #define dump_mhfd(x)
diff --git a/tests/test-ls.c b/tests/test-ls.c
index 1488da6..bbb1346 100644
--- a/tests/test-ls.c
+++ b/tests/test-ls.c
@@ -37,41 +37,13 @@
 #define LOCALDB "/.gtkpod/local_0.itdb"
 
 static void
-display_recently_played (Itdb_iTunesDB *db)
-{
-    Itdb_Playlist *mpl = itdb_playlist_mpl (db);
-    GList *it;
-
-    g_print ("Recently played:\n");
-    for (it = mpl->members; it != NULL; it = it->next) {
-        Itdb_Track *track = (Itdb_Track*)it->data;
-
-        if (track->recent_playcount != 0) {
-            char date[30];
-            time_t track_time = itdb_time_mac_to_host (track->time_played);
-
-            g_print ("%s - %s - %s:\n",
-                     track->artist, track->album, track->title);
-            strftime (date, sizeof (date), "%F %H:%M:%S",
-                      gmtime (&track_time));
-            g_print ("\tUTC: %s\n", date);
-            strftime (date, sizeof (date), "%F %H:%M:%S",
-                      localtime (&track_time));
-            g_print ("\tlocal: %s\n", date);
-            g_print ("track: %ld ", track_time);
-            time (&track_time);
-            g_print ("current: %ld\n", track_time);
-            g_print ("\n");
-        }
-    }
-}
-
-static void
 display_track (Itdb_Track *track, const char *prefix) 
 {
-    g_print ("%s%s - %s - %s\n", prefix,  
-	     track->artist, track->album, track->title);
-    g_print ("%s\t%s\n", prefix, track->ipod_path);
+    g_print ("%sArtist: %s\n", prefix, track->artist);
+    g_print ("%sAlbum:  %s\n", prefix, track->album);
+    g_print ("%sTitle:  %s\n", prefix, track->title);
+    g_print ("%sdbid:   0x%016"G_GINT64_MODIFIER"x\n", prefix, track->dbid);
+    g_print ("%sid:     0x%08x\n\n", prefix, track->id);
 }
 
 static void
@@ -141,28 +113,7 @@ main (int argc, char *argv[])
 
   if (itdb)
   {
-      GList *it;
-
-      printf ("playlists: %d\n", g_list_length (itdb->playlists));
-      for (it = itdb->playlists; it != NULL; it = it->next) {
-	  Itdb_Playlist *playlist;
-
-	  playlist = (Itdb_Playlist *)it->data;
-	  
-	  if (playlistname == NULL || strcmp(playlist->name, playlistname) == 0) 
-	    display_playlist (playlist, "");
-      }
-
-      if (error)
-      {
-	  if (error->message) {
-	      g_print ("%s\n", error->message);
-	  }
-	  g_error_free (error);
-	  error = NULL;
-      }
-
-      display_recently_played (itdb);
+      display_playlist (itdb_playlist_mpl (itdb), "");
   }
 
   itdb_free (itdb);