diff --git fb.js fb.js
index ae784de..70dbe83 100644
--- fb.js
+++ fb.js
@@ -256,7 +256,9 @@ FB_JS.sessionSanityCheck = function() {
         // Render any XFBML markup that may have been added by AJAX.
         $(context).each(function() {
           var elem = $(this).get(0);
-          FB.XFBML.parse(elem);
+//          somehow this is breaking the FB SDK functions
+//          so I'll just remove it
+//          FB.XFBML.parse(elem);
         });
       }
 
diff --git fb.module fb.module
index b35563e..739711a 100644
--- fb.module
+++ fb.module
@@ -176,6 +176,7 @@ function fb_init() {
     // An App is configured.
 
     // Javascript settings needed by fb.js.
+    fb_js_settings('appId', $_fb_app->id); //we need to pass appId to FB.init for fb:comments
     fb_js_settings('apikey', $_fb_app->apikey);
     fb_js_settings('label', $_fb_app->label);
     fb_js_settings('page_type', fb_settings(FB_SETTINGS_TYPE)); // canvas or connect.
diff --git fb_app.module fb_app.module
index 31403f9..e3011ce 100644
--- fb_app.module
+++ fb_app.module
@@ -74,13 +74,17 @@ function fb_app_fb($op, $data, &$return) {
   }
   elseif ($op == FB_OP_CURRENT_APP) {
     // Try to determine the current application from fb_settings.
-    // If we fail, fb_canvas or fb_connect module will hopefully succeed.
+    // If we fail, take the first FB app in the table as the default app.
 
     if (!$return && ($id = fb_settings(FB_SETTINGS_ID))) {
       $return = fb_get_app(array('id' => $id));
     }
     elseif (!$return && ($apikey = fb_settings(FB_SETTINGS_APIKEY))) {
       $return = fb_get_app(array('apikey' => $apikey));
+    } else
+    {
+      //let's asume that the first App in the table is the default one.
+      fb_app_fb(FB_OP_GET_APP, array('fba_id' => '1'), &$return);
     }
   }
 }
