diff --git a/src/definitions/modules/accordion.js b/src/definitions/modules/accordion.js
index f5532090d..778c5e220 100644
--- a/src/definitions/modules/accordion.js
+++ b/src/definitions/modules/accordion.js
@@ -422,7 +422,7 @@ $.fn.accordion = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/checkbox.js b/src/definitions/modules/checkbox.js
index b5f2b11d3..e7ca0021b 100644
--- a/src/definitions/modules/checkbox.js
+++ b/src/definitions/modules/checkbox.js
@@ -361,7 +361,7 @@ $.fn.checkbox = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 779a97220..50d81b6a6 100644
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -484,7 +484,7 @@ $.fn.dimmer = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index 14031b7ba..e314c92db 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -31,7 +31,7 @@ $.fn.dropdown = function(parameters) {
   ;
 
   $allModules
-    .each(function(index) {
+    .each(function() {
       var
         settings          = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.dropdown.settings, parameters)
@@ -210,16 +210,17 @@ $.fn.dropdown = function(parameters) {
                 .prependTo($module)
               ;
             }
-            module.setup.reference();
+            module.refresh();
           },
           reference: function() {
             var
+              index = $allModules.index($module),
               $firstModules,
               $lastModules
             ;
             module.debug('Dropdown behavior was called on select, replacing with closest dropdown');
             // replace module reference
-            $module = $module.closest(selector.dropdown);
+            $module = $module.parent(selector.dropdown);
             module.refresh();
             // adjust all modules
             $firstModules = $allModules.slice(0, index);
@@ -1563,7 +1564,7 @@ $.fn.dropdown = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
index 47e08ea00..887fcd96c 100644
--- a/src/definitions/modules/modal.js
+++ b/src/definitions/modules/modal.js
@@ -693,7 +693,7 @@ $.fn.modal = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/nag.js b/src/definitions/modules/nag.js
index 30119d296..3d588acd7 100644
--- a/src/definitions/modules/nag.js
+++ b/src/definitions/modules/nag.js
@@ -310,7 +310,7 @@ $.fn.nag = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
index 903dc49f1..4cd7ff6eb 100644
--- a/src/definitions/modules/popup.js
+++ b/src/definitions/modules/popup.js
@@ -977,7 +977,7 @@ $.fn.popup = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
@@ -1088,55 +1088,86 @@ $.fn.popup.settings = {
 
   name         : 'Popup',
 
+  // module settings
   debug        : false,
   verbose      : true,
   performance  : true,
   namespace    : 'popup',
 
+  // callback only when element added to dom
   onCreate     : function(){},
+  // callback before element removed from dom
   onRemove     : function(){},
-
+  // callback before show animation
   onShow       : function(){},
+  // callback after show animation
   onVisible    : function(){},
+  // callback before hide animation
   onHide       : function(){},
+  // callback after hide animation
   onHidden     : function(){},
 
+  // when to show popup
+  on           : 'hover',
+
+  // default position relative to element
+  position     : 'top left',
+  // name of variation to use
   variation    : '',
+  // whether popup should be moved to context
+  movePopup      : true,
+  // element which popup should be relative to
+  target         : false,
+  // jq selector or element that should be used as popup
+  popup          : false,
+  // popup should remain inline next to activator
+  inline         : false,
+  // popup should be removed from page on hide
+  preserve       : false,
+  // popup should not close when being hovered on
+  hoverable      : false,
+
+  // explicitly set content
   content      : false,
+  // explicitly set html
   html         : false,
+  // explicitly set title
   title        : false,
 
-  on           : 'hover',
+  // whether automatically close on clickaway when on click
   closable     : true,
+  // automatically hide on scroll
   hideOnScroll : 'auto',
+  // hide other popups on show
   exclusive    : true,
-
+  // context to attach popups
   context      : 'body',
-
-  position     : 'top left',
+  // position to prefer when calculating new position
   prefer       : 'opposite',
+
+  // specify position to appear even if it doesn't fit
   lastResort   : false,
 
+  // delay used to prevent accidental refiring of animations due to user error
   delay        : {
     show : 30,
     hide : 0
   },
 
+  // whether fluid variation should assign width explicitly
   setFluidWidth  : true,
-  movePopup      : true,
-
-  target         : false,
-  popup          : false,
-  inline         : false,
-  preserve       : false,
-  hoverable      : false,
 
   duration       : 200,
   easing         : 'easeOutQuint',
   transition     : 'scale',
 
+  // distance away from activating element in px
   distanceAway   : 0,
+
+  // offset on aligning axis from calculated position
   offset         : 0,
+
+  // maximum times to look for a position before failing
   maxSearchDepth : 20,
 
   error: {
diff --git a/src/definitions/modules/popup.less b/src/definitions/modules/popup.less
index f9f20f82d..a65cd0190 100755
--- a/src/definitions/modules/popup.less
+++ b/src/definitions/modules/popup.less
@@ -31,7 +31,7 @@
   right: 0px;
 
   /* Fixes content being squished when inline (moz only) */
-  min-width: -moz-max-content;
+  min-width: -moz-min-content;
 
   z-index: @zIndex;
 
diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js
index 6b99733dc..ac8b06a26 100644
--- a/src/definitions/modules/progress.js
+++ b/src/definitions/modules/progress.js
@@ -598,7 +598,7 @@ $.fn.progress = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/rating.js b/src/definitions/modules/rating.js
index 339b49752..15ced619b 100644
--- a/src/definitions/modules/rating.js
+++ b/src/definitions/modules/rating.js
@@ -285,7 +285,7 @@ $.fn.rating = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/search.js b/src/definitions/modules/search.js
index adfef2652..795413212 100644
--- a/src/definitions/modules/search.js
+++ b/src/definitions/modules/search.js
@@ -751,7 +751,7 @@ $.fn.search = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/shape.js b/src/definitions/modules/shape.js
index ee878a9a6..c16758478 100644
--- a/src/definitions/modules/shape.js
+++ b/src/definitions/modules/shape.js
@@ -667,7 +667,7 @@ $.fn.shape = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index f4ebc97d9..b469f8299 100644
--- a/src/definitions/modules/sidebar.js
+++ b/src/definitions/modules/sidebar.js
@@ -887,7 +887,7 @@ $.fn.sidebar = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/tab.js b/src/definitions/modules/tab.js
index 69bd68aef..ddc2f17d2 100644
--- a/src/definitions/modules/tab.js
+++ b/src/definitions/modules/tab.js
@@ -626,7 +626,7 @@ $.fn.tab = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/transition.js b/src/definitions/modules/transition.js
index 8f413b08b..b689b2d26 100644
--- a/src/definitions/modules/transition.js
+++ b/src/definitions/modules/transition.js
@@ -855,7 +855,7 @@ $.fn.transition = function() {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var
diff --git a/src/definitions/modules/video.js b/src/definitions/modules/video.js
index e768ce0f6..a848b7a78 100644
--- a/src/definitions/modules/video.js
+++ b/src/definitions/modules/video.js
@@ -350,7 +350,7 @@ $.fn.video = function(parameters) {
               });
             }
             clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 100);
+            module.performance.timer = setTimeout(module.performance.display, 500);
           },
           display: function() {
             var