diff --git a/jquery_media.jq.inc b/jquery_media.jq.inc
index d8497ce..59b8ac4 100644
--- a/jquery_media.jq.inc
+++ b/jquery_media.jq.inc
@@ -79,45 +79,46 @@ function _jquery_media_add($options = array(), $return_js = FALSE) {
     if ($swf = variable_get('jquery_media_swfobject_path', '')) {
       drupal_add_js($swf);
     }
+    $js = "";
     // change jQuery Media's defaults. these may be overrriden on an individual basis.
-    if (!($default_js_loaded || isset($defaults['flvplayer'])) || $options['flvplayer']) {
-      $defaults['flvplayer'] = $options['flvplayer'] ? url($options['flvplayer']) : url(variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT));
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['flvplayer'])) || $options['flvplayer']) {
+      $defaults['flvplayer'] = isset($options['flvplayer']) ? url($options['flvplayer']) : url(variable_get('jquery_media_flvplayer', JQUERY_MEDIA_FLVPLAYER_DEFAULT));
       $js .= "    $.fn.media.defaults.flvPlayer = '{$defaults['flvplayer']}';\n";
     }
-    if (!($default_js_loaded || isset($defaults['mp3player'])) || $options['mp3player']) {
-      $defaults['mp3player'] = $options['mp3player'] ? url($options['mp3player']) : url(variable_get('jquery_media_mp3player', JQUERY_MEDIA_MP3PLAYER_DEFAULT));
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['mp3player'])) || $options['mp3player']) {
+      $defaults['mp3player'] = isset($options['mp3player']) ? url($options['mp3player']) : url(variable_get('jquery_media_mp3player', JQUERY_MEDIA_MP3PLAYER_DEFAULT));
       $js .= "    $.fn.media.defaults.mp3Player = '{$defaults['mp3player']}';\n";
     }
-    if (!($default_js_loaded || isset($defaults['autoplay'])) || isset($options['autoplay'])) {
-      $defaults['autoplay'] = $options['autoplay'] ? $options['autoplay'] : variable_get('jquery_media_autoplay', JQUERY_MEDIA_AUTOPLAY_DEFAULT);
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['autoplay'])) || isset($options['autoplay'])) {
+      $defaults['autoplay'] = isset($options['autoplay']) ? $options['autoplay'] : variable_get('jquery_media_autoplay', JQUERY_MEDIA_AUTOPLAY_DEFAULT);
       if ($defaults['autoplay'] != JQUERY_MEDIA_AUTOPLAY_DEFAULT) {
         $js .= "    $.fn.media.defaults.autoplay = {$defaults['autoplay']};\n";
       }
     }
-    if (!($default_js_loaded || isset($defaults['bgcolor'])) || $options['bgcolor']) {
-      $defaults['bgcolor'] = $options['bgcolor'] ? $options['bgcolor'] : variable_get('jquery_media_bgcolor', JQUERY_MEDIA_BGCOLOR_DEFAULT);
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['bgcolor'])) || $options['bgcolor']) {
+      $defaults['bgcolor'] = isset($options['bgcolor']) ? $options['bgcolor'] : variable_get('jquery_media_bgcolor', JQUERY_MEDIA_BGCOLOR_DEFAULT);
       if ($defaults['bgcolor'] != JQUERY_MEDIA_BGCOLOR_DEFAULT) {
         $js .= "    $.fn.media.defaults.bgColor = '{$defaults['bgcolor']}';\n";
       }
     }
-    if (!($default_js_loaded || isset($defaults['flashvars'])) || $options['flashvars']) {
-      $defaults['flashvars'] = $options['flashvars'] ? $options['flashvars'] : variable_get('jquery_media_flashvars', '');
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['flashvars'])) || $options['flashvars']) {
+      $defaults['flashvars'] = isset($options['flashvars']) ? $options['flashvars'] : variable_get('jquery_media_flashvars', '');
       if ($defaults['flashvars']) {
         $js .= "    $.fn.media.defaults.flashvars = { {$defaults['flashvars']} };\n";
       }
     }
-    if (!($default_js_loaded || isset($defaults['params'])) || $options['params']) {
-      $defaults['params'] = $options['params'] ? $options['params'] : variable_get('jquery_media_params', '');
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['params'])) || $options['params']) {
+      $defaults['params'] = isset($options['params']) ? $options['params'] : variable_get('jquery_media_params', '');
       if ($defaults['params']) {
         $js .= "    $.fn.media.defaults.params = { {$defaults['params']} };\n";
       }
     }
-    if (!($default_js_loaded || isset($defaults['invoke media'])) || $options['invoke media'] || $options['media class'] || $options['media width'] || $options['media height']) {
-      $defaults['invoke media'] = $options['invoke media'] ? $options['invoke media'] : variable_get('jquery_media_class_media_autoinvoke', JQUERY_MEDIA_CLASS_MEDIA_AUTOINVOKE_DEFAULT);
+    if (!((isset($default_js_loaded) && $default_js_loaded) || isset($defaults['invoke media'])) || isset($options['invoke media']) || isset($options['media class']) || isset($options['media width']) || isset($options['media height'])) {
+      $defaults['invoke media'] = isset($options['invoke media']) ? $options['invoke media'] : variable_get('jquery_media_class_media_autoinvoke', JQUERY_MEDIA_CLASS_MEDIA_AUTOINVOKE_DEFAULT);
       if ($defaults['invoke media']) {
-        $defaults['media class'] = $options['media class'] ? $options['media class'] : variable_get('jquery_media_class_media', JQUERY_MEDIA_CLASS_MEDIA_DEFAULT);
-        $defaults['media width'] = $options['media width'] ? $options['media width'] : variable_get('jquery_media_media_width', JQUERY_MEDIA_MEDIA_WIDTH_DEFAULT);
-        $defaults['media height'] = $options['media height'] ? $options['media height'] : variable_get('jquery_media_media_height', JQUERY_MEDIA_MEDIA_HEIGHT_DEFAULT);
+        $defaults['media class'] = isset($options['media class']) ? $options['media class'] : variable_get('jquery_media_class_media', JQUERY_MEDIA_CLASS_MEDIA_DEFAULT);
+        $defaults['media width'] = isset($options['media width']) ? $options['media width'] : variable_get('jquery_media_media_width', JQUERY_MEDIA_MEDIA_WIDTH_DEFAULT);
+        $defaults['media height'] = isset($options['media height']) ? $options['media height'] : variable_get('jquery_media_media_height', JQUERY_MEDIA_MEDIA_HEIGHT_DEFAULT);
         $size = array();
         if (!($defaults['media width'] === '')) {
           $size[] = 'width: '. $defaults['media width'];