diff --git a/Gruntfile.js b/Gruntfile.js
index e14301c37..51999b82c 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -110,7 +110,7 @@ module.exports = function(grunt) {
 
     setWatchFiles = function(action, filePath) {
       var
-        buildPath = filePath.replace('src/', 'docs/build/').replace('less', 'css')
+        buildPath = filePath.replace('src/', 'docs/build/uncompressed/').replace('less', 'css')
       ;
       if(filePath.search('.less') !== -1) {
         grunt.config('less.buildDocsCSS.src', filePath);
diff --git a/src/modules/dimmer.js b/src/modules/dimmer.js
index ce95845f1..152394328 100755
--- a/src/modules/dimmer.js
+++ b/src/modules/dimmer.js
@@ -45,12 +45,12 @@ $.fn.dimmer = function(parameters) {
           ? 'touchstart'
           : 'click',
 
-        $module  = $(this),
+        $module = $(this),
         $dimmer,
         $dimmable,
 
-        element  = this,
-        instance = $module.data(moduleNamespace),
+        element   = this,
+        instance  = $module.data(moduleNamespace),
         module
       ;
 
@@ -118,7 +118,6 @@ $.fn.dimmer = function(parameters) {
             .off(eventNamespace)
           ;
           $dimmer
-            .remove()
             .off(eventNamespace)
           ;
         },
@@ -519,8 +518,8 @@ $.fn.dimmer.settings = {
   name        : 'Dimmer',
   namespace   : 'dimmer',
 
-  debug       : true,
   verbose     : true,
+  debug       : true,
   performance : true,
 
   transition  : 'fade',
diff --git a/src/modules/modal.js b/src/modules/modal.js
index fbf4362ed..52baa9a14 100755
--- a/src/modules/modal.js
+++ b/src/modules/modal.js
@@ -27,12 +27,13 @@ $.fn.modal = function(parameters) {
     invokedResponse
   ;
 
+
   $allModules
-    .each(function(index) {
+    .each(function() {
       var
         settings    = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.modal.settings, parameters)
-          : $.extend(true, {}, $.fn.modal.settings),
+          : $.extend({}, $.fn.modal.settings),
 
         selector        = settings.selector,
         className       = settings.className,
@@ -43,17 +44,17 @@ $.fn.modal = function(parameters) {
         moduleNamespace = 'module-' + namespace,
         moduleSelector  = $allModules.selector || '',
 
-        $module         = $(this),
-        $context        = $(settings.context),
-        $otherModals    = $allModules.not($module),
-        $close          = $module.find(selector.close),
+        $module      = $(this),
+        $context     = $(settings.context),
+        $otherModals = $allModules.not($module),
+        $close       = $module.find(selector.close),
 
         $focusedElement,
         $dimmable,
         $dimmer,
 
-        element         = this,
-        instance        = $module.data(moduleNamespace),
+        element      = this,
+        instance     = $module.data(moduleNamespace),
         module
       ;
 
@@ -63,7 +64,6 @@ $.fn.modal = function(parameters) {
           module.verbose('Initializing dimmer', $context);
 
           $dimmable = $context
-            .dimmer()
             .dimmer('add content', $module)
           ;
           $dimmer = $context
@@ -93,17 +93,15 @@ $.fn.modal = function(parameters) {
         destroy: function() {
           module.verbose('Destroying previous modal');
           $module
-            .off(eventNamespace)
             .removeData(moduleNamespace)
+            .off(eventNamespace)
           ;
           $close
             .off(eventNamespace)
           ;
-          if($dimmable) {
-            $dimmable
-              .dimmer('destroy')
-            ;
-          }
+          $context
+            .dimmer('destroy')
+          ;
         },
 
         refresh: function() {
@@ -315,6 +313,7 @@ $.fn.modal = function(parameters) {
 
         set: {
           active: function() {
+            module.add.keyboardShortcuts();
             module.save.focus();
             module.set.type();
             $module
@@ -329,15 +328,11 @@ $.fn.modal = function(parameters) {
           dimmerSettings: function() {
             module.debug('Setting dimmer settings', $dimmable);
             $dimmable
-              .dimmer('setting', 'closable', false)
-              .dimmer('setting', 'duration', {
-                show : settings.duration * 0.95,
-                hide : settings.duration * 1.05
+              .dimmer({
+                closable: false,
+                show: settings.duration * 0.95,
+                hide: settings.duration * 1.05
               })
-              .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
-              // destory after changing settings in order to reattach events
-              .dimmer('destroy')
-              .dimmer('initialize')
             ;
           },
           scrolling: function() {
diff --git a/test/modules/module.spec.js b/test/modules/module.spec.js
index 24deac53c..73bc0fca1 100755
--- a/test/modules/module.spec.js
+++ b/test/modules/module.spec.js
@@ -202,6 +202,9 @@ function moduleTests(ui) {
 
     it("removes all events from page", function() {
       $module[module]('destroy');
+      if($.events().length > 0) {
+        dump($.events());
+      }
       expect($.events().length).toBe(0);
     });