diff --git a/static/js/pandora/ui/backButton.js b/static/js/pandora/ui/backButton.js
index 77c541904..d327045d7 100644
--- a/static/js/pandora/ui/backButton.js
+++ b/static/js/pandora/ui/backButton.js
@@ -9,6 +9,14 @@ pandora.ui.backButton = function() {
     })
     .bindEvent({
         click: function() {
+            /*
+            FIXME: if, on page load, one clicks back quickly,
+            the item content may overwrite the list content.
+            but we cannot cancel all requests, since that
+            might keep the lists folders from loading.
+            so we'd have to cancel with a function -- and
+            it's unclear if the best place for that is here
+            */
             pandora.UI.set({item: ''});
         }
     });
diff --git a/static/js/pandora/ui/itemClips.js b/static/js/pandora/ui/itemClips.js
index b5f460184..d7e2dd349 100644
--- a/static/js/pandora/ui/itemClips.js
+++ b/static/js/pandora/ui/itemClips.js
@@ -46,6 +46,10 @@ pandora.ui.itemClips = function(options) {
 
     function doubleclick(data) {
         var $item, $target = $(data.target), item, points, set;
+        if ($target.parent().parent().is('.OxSpecialTarget')) {
+            // for videos, the click registers deeper inside
+            $target = $target.parent().parent();
+        }
         if ($target.is('.OxSpecialTarget')) {
             $item = $target.parent().parent();
             item = self.options.id;
@@ -56,17 +60,15 @@ pandora.ui.itemClips = function(options) {
                 out: points[1],
                 position: points[0]
             };
-            //Ox.print('SETTING VIDEO POINTS', set)
             pandora.UI.set(set);
         }
     }
 
     function singleclick(data) {
-        var $img, $item, $target = $(data.target), $video, points;
+        var $img, $item, $target = $(data.target), points;
         if ($target.is('.OxSpecialTarget')) {
             $item = $target.parent().parent();
             $img = $item.find('.OxIcon > img');
-            $video = $item.find('.OxIcon > .OxVideoPlayer');
             points = [$item.data('in'), $item.data('out')];
             if ($img.length) {
                 pandora.api.get({id: self.options.id, keys: ['durations']}, function(result) {
diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/ui/list.js
index 753906e30..cc92a2348 100644
--- a/static/js/pandora/ui/list.js
+++ b/static/js/pandora/ui/list.js
@@ -387,7 +387,6 @@ pandora.ui.list = function() {
                 if (data.isSpecialTarget) {
                     set.itemView = pandora.user.ui.videoView;
                 }
-                //Ox.print('SETTING ITEM', set)
                 pandora.UI.set(set);
             },
             openpreview: function(data) {