diff --git a/build/js/ox.ui.js b/build/js/ox.ui.js
index de1c1732..5cdb0977 100644
--- a/build/js/ox.ui.js
+++ b/build/js/ox.ui.js
@@ -11568,6 +11568,7 @@ requires
                     duration: 0,
                     find: '',
                     frameURL: function() {},
+                    fps: 25, // fixme: doesn't get handed through to player
 					height: 0,
                     largeTimeline: true,
                     layers: [],
@@ -12012,7 +12013,7 @@ requires
 
         function selectAnnotation(event, data) {
             self.options.position = data.in
-            self.options.points = [data.in, data.out - 0.001];
+            self.options.points = [data.in, data.out];
             setPosition();
             setPoints();
         }
@@ -12118,6 +12119,7 @@ requires
         var self = self || {},
             that = new Ox.Element('div', self)
                 .defaults({
+                    duration: 0,
                     find: '',
                     height: 0,
                     points: [0, 0],
@@ -12396,16 +12398,22 @@ requires
         }
 
         function setPosition() {
+            var position = Ox.limit(
+                    self.options.position - (self.options.type == 'out' ? 0.01 : 0),
+                    0, self.options.duration - 0.01
+                ),
+                url;
             if (self.options.type == 'play') {
                 self.$video.position(self.options.position);
             } else {
 				self.$loadingIcon && self.$loadingIcon.stop();
-				if (self.$video.attr('src') != self.options.url(self.options.position)) {
+                url = self.options.url(position);
+				if (self.$video.attr('src') != url) {
 					self.$loadingIcon = new Ox.LoadingIcon()
 	                    .appendTo(that)
 	                    .start();
 	                self.$video.attr({
-	                        src: self.options.url(self.options.position)
+	                        src: url
 	                    })
 	                    .load(self.$loadingIcon.stop);
 				}