diff --git a/mediainfo/README b/mediainfo/README
index 651884efac..9741d3344d 100644
--- a/mediainfo/README
+++ b/mediainfo/README
@@ -74,6 +74,12 @@ Duration:
   - geo-tags: map-widget?, link to google-maps?
   - artist: links to {last.fm,wikipedia}
 
+== deep scan mode ==
+- update fields when playing
+  - listen for duration messages on the bus
+
 = TODO for discoverer =
 - get duration per stream
   - this would need individual queries on the demuxer src pads
+  - or duration as part of per stream tags
+
diff --git a/mediainfo/src/mi-info.vala b/mediainfo/src/mi-info.vala
index e17881a627..019a63723a 100644
--- a/mediainfo/src/mi-info.vala
+++ b/mediainfo/src/mi-info.vala
@@ -517,6 +517,9 @@ public class MediaInfo.Info : VBox
     }
   }
 
+  /* FIXME: discoverer not neccesarily return the stream in the same order as
+   * playbin2 sees them: https://bugzilla.gnome.org/show_bug.cgi?id=634407
+   */
   private void on_video_stream_switched (NotebookPage page, uint page_num)
   {
     if (pb.current_state > State.PAUSED) {