diff --git a/src/file.c b/src/file.c
index a3bb173e..dc81e938 100644
--- a/src/file.c
+++ b/src/file.c
@@ -746,7 +746,8 @@ file_get_first_support_dir(void)
     while (elem)
     {
 	if(g_str_has_suffix((gchar*)elem->data, HOMEDIRNAME) ||
-	   g_str_has_suffix((gchar*)elem->data, "support_files"))
+	   g_str_has_suffix((gchar*)elem->data, "support_files") ||
+	   g_str_has_suffix((gchar*)elem->data, "support_files" G_DIR_SEPARATOR_S))
 	    return (const gchar*)elem->data;
 
 	elem = elem->next;
@@ -1007,3 +1008,25 @@ file_load_text_from_saves(const gchar *filename)
 
     return g_strdup(buf);   
 }
+
+/** Return the path to a resource in the Mac OS X bundle. */
+gchar*
+file_get_mac_resource_path(const gchar *resource)
+{
+#ifndef MAC_BUILD
+    return NULL;
+#else
+    gchar buf[SMALL];
+    CFURLRef newurlref;
+    CFStringRef newstring = CFStringCreateWithCString(NULL, resource, kCFStringEncodingASCII);
+
+    newurlref = CFBundleCopyResourceURL(CFBundleGetMainBundle(), newstring, NULL, NULL);
+    CFRelease(newstring);
+    newstring = CFURLCopyPath(newurlref);
+    CFStringGetCString(newstring, buf, SMALL + 1, kCFStringEncodingASCII);
+    CFRelease(newurlref);
+    CFRelease(newstring);
+    
+    return g_strdup(buf);
+#endif
+}
diff --git a/src/file.h b/src/file.h
index 781d9185..ebb346cb 100644
--- a/src/file.h
+++ b/src/file.h
@@ -115,4 +115,7 @@ file_load_text_from_saves(const gchar *filename);
 void
 file_store_text_in_saves(const gchar *filename, const gchar *text);
 
+gchar*
+file_get_mac_resource_path(const gchar *resource);
+
 #endif
diff --git a/src/language.c b/src/language.c
index b0d5a0df..addf9c05 100644
--- a/src/language.c
+++ b/src/language.c
@@ -26,6 +26,7 @@
 #include <locale.h>
 
 #include "callbacks.h"
+#include "file.h"
 #include "free.h"
 #include "language.h"
 #include "lg_commentary.h"
@@ -48,7 +49,7 @@ language_set(gint index)
 #endif
 
     gchar buf[SMALL], buf2[SMALL];
-    gchar *pwd = g_get_current_dir();
+    gchar *dir;
     GPtrArray *codes =
 	misc_separate_strings(const_str("string_language_codes"));
 
@@ -60,7 +61,15 @@ language_set(gint index)
     if(strcmp(buf, opt_str("string_opt_language_code")) != 0 ||
        window.main == NULL)
     {
-	sprintf(buf2, "%s%slocale", pwd, G_DIR_SEPARATOR_S);
+#ifndef MAC_BUILD
+        dir = g_get_current_dir();
+	sprintf(buf2, "%s%slocale", dir, G_DIR_SEPARATOR_S);
+#else
+        dir = file_get_mac_resource_path("locale");
+        strcpy(buf2, dir);
+#endif
+        g_free(dir);
+
 #ifdef ENABLE_NLS
 	if(g_file_test(buf2, G_FILE_TEST_EXISTS))
 	{
@@ -88,7 +97,6 @@ language_set(gint index)
 
     lg_commentary_load_commentary_file_from_option();
     news_load_news_file_from_option();
-    g_free(pwd);
     free_gchar_array(&codes);
 }
 
diff --git a/src/main.c b/src/main.c
index e832b185..59851ba3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,6 +61,14 @@
 #include "window.h"
 #include "xml_strategy.h"
 
+#define DEBUG_LEVEL_DEFAULT 0
+
+#if defined(MAC_BUILD) || defined(G_OS_WIN32)
+#define DEBUG_OUTPUT_DEFAULT 2
+#else
+#define DEBUG_OUTPUT_DEFAULT 0
+#endif
+
 /** Whether the last save gets loaded at startup
     (cl switch -l). */
 gboolean load_last_save;
@@ -129,7 +137,11 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
     g_option_context_parse(context, argc, argv, &error);
     g_option_context_free(context);
 
-    misc_print_error(&error, TRUE);
+    if(error != NULL)
+    {
+        misc_print_error(&error, FALSE);
+        return;
+    }
 
     if(calodds)
     {
@@ -188,6 +200,9 @@ main_parse_debug_cl_arguments(gint *argc, gchar ***argv)
            "[developer] A debug command like 'deb100 to set the debug level'; see the debug window and debug.c", "STRING" },
 	 {NULL}};
 
+    debug_level = DEBUG_LEVEL_DEFAULT;
+    debug_output = DEBUG_OUTPUT_DEFAULT;
+
     if(argc == NULL || argv == NULL)
 	return;
 
@@ -200,19 +215,16 @@ main_parse_debug_cl_arguments(gint *argc, gchar ***argv)
 
     if(error != NULL)
     {
-        debug_print_message("error message: %s\n", error->message);  
-        g_error_free(error);
+        misc_print_error(&error, FALSE);
         return;
     }
 
-    debug_level = 0;
     if(deb_level != -1)
     {
         debug_level = deb_level;
         window_create(WINDOW_DEBUG);
     }
 
-    debug_output = DEBUG_OUT_STDOUT;
     if(deb_output != -1)
 	debug_output = deb_output;
 
@@ -326,6 +338,7 @@ main_init(gint *argc, gchar ***argv)
 #endif
 
     gchar buf[SMALL];
+    gchar *dir;
 
     support_directories = NULL;
     rand_generator = g_rand_new();
@@ -337,31 +350,23 @@ main_init(gint *argc, gchar ***argv)
     os_is_unix = TRUE;
 #endif
 
-#ifdef G_OS_UNIX
-#ifndef MAC_BUILD
+#if defined(G_OS_UNIX) && !defined(MAC_BUILD)
     file_add_support_directory_recursive(PACKAGE_DATA_DIR "/" PACKAGE "/support_files");
     sprintf(buf, "%s%s%s", g_get_home_dir(), G_DIR_SEPARATOR_S, HOMEDIRNAME);
     file_add_support_directory_recursive(buf);
 #endif
-#endif
 
 #ifndef MAC_BUILD
-    gchar *pwd = g_get_current_dir();
-    sprintf(buf, "%s%ssupport_files", pwd, G_DIR_SEPARATOR_S);
+    dir = g_get_current_dir();
+    sprintf(buf, "%s%ssupport_files", dir, G_DIR_SEPARATOR_S);
     file_add_support_directory_recursive(buf);
-    sprintf(buf, "%s%ssaves", pwd, G_DIR_SEPARATOR_S);
+
+    sprintf(buf, "%s%ssaves", dir, G_DIR_SEPARATOR_S);
     file_add_support_directory_recursive(buf);
-    g_free(pwd);
-#else
-    CFURLRef newurlref;
-    CFStringRef newstring = CFSTR("support_files");
-    
-    newurlref = CFBundleCopyResourceURL(CFBundleGetMainBundle(), newstring, NULL, NULL);
-    newstring = CFURLCopyPath(newurlref);
-    CFStringGetCString(newstring, buf, SMALL + 1, kCFStringEncodingASCII);
-    file_add_support_directory_recursive(buf);
-    CFRelease(newurlref);
-    CFRelease(newstring);
+    g_free(dir);
+#else    
+    dir = file_get_mac_resource_path("support_files");    
+    file_add_support_directory_recursive(dir);
 #endif
 
     main_init_variables();
@@ -383,13 +388,11 @@ main (gint argc, gchar *argv[])
     printf("main\n");
 #endif
 
-#ifdef ENABLE_NLS
-#ifndef MAC_BUILD
+#if defined(ENABLE_NLS) && !defined(MAC_BUILD)
     bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
     textdomain (GETTEXT_PACKAGE);
 #endif
-#endif
 #ifdef G_OS_WIN32
     int fd1 = open ("stdout.log", O_CREAT|O_WRONLY|O_TRUNC, 0666);
     dup2 (fd1, 1);
diff --git a/support_files/bygfoot_help b/support_files/bygfoot_help
index 3f669afa..71e959eb 100644
--- a/support_files/bygfoot_help
+++ b/support_files/bygfoot_help
@@ -9,7 +9,6 @@ string_contrib_title Definitions team
 string_contrib_entry Mihai Floran (mihai@bygfoot.com)
 string_contrib_entry Christopher Hunter (chris@bygfoot.com)
 string_contrib_entry Ivan Ramirez (ircarrascal@bygfoot.com)
-string_contrib_entry Tommasi (tommasi@bygfoot.com)
 
 string_contrib_title Artwork
 string_contrib_entry Mark D. Symonds, Marcelo Garrone