Index: AE/Installer/trunk/source/aeinstallerapp.cpp
===================================================================
--- AE/Installer/trunk/source/aeinstallerapp.cpp	(revision 357)
+++ AE/Installer/trunk/source/aeinstallerapp.cpp	(revision 358)
@@ -9,4 +9,6 @@
 // Licence:     
 /////////////////////////////////////////////////////////////////////////////
+#include "boost/thread.hpp"
+#include <boost/thread/mutex.hpp>
 
 #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations
@@ -117,5 +119,22 @@
 		}
 		else {
-			//globalize...
+			TheWindow->InstallButton->Disable();
+		TheWindow->ReglobalizeButton->Disable();
+
+#ifdef WIN32
+
+		boost::thread thrd3(globalizeData);
+		//globalizeData();
+		//boost::thread::create_thread(&globalizeData);
+		//	 boost::thread_group Tg;
+		// Tg.create_thread( &globalizeData(), this );
+#else
+		globalizeData();
+		setProgressBar(1000);
+		setStatusArea("Done!");
+#endif
+		
+		TheWindow->InstallButton->Enable();
+		TheWindow->ReglobalizeButton->Enable();
 		}
 	}
Index: AE/Installer/trunk/source/installer.h
===================================================================
--- AE/Installer/trunk/source/installer.h	(revision 357)
+++ AE/Installer/trunk/source/installer.h	(revision 358)
@@ -49,12 +49,12 @@
 		cout << "\n";
 	}
-	
-	     bool operator < (const ModPackage &fs)
+
+	     bool operator < (const ModPackage &fs) const
      { return (name < fs.name);}
 
-     bool operator > (const ModPackage &fs)
+     bool operator > (const ModPackage &fs) const
      { return (name > fs.name);}
 
-     bool operator == (const ModPackage &fs)
+     bool operator == (const ModPackage &fs) const
      { return (name == fs.name);}
 };
Index: AE/Installer/trunk/source/main_window.cpp
===================================================================
--- AE/Installer/trunk/source/main_window.cpp	(revision 357)
+++ AE/Installer/trunk/source/main_window.cpp	(revision 358)
@@ -301,5 +301,5 @@
 		for(int j = 0; j < GDFPaths.size(); j++) {
 			logfile << "\tReimporting " << GDFPaths[j].filename() << ".oni\n";
-			setStatusArea("Step" + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
+			setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": reimporting " + GDFPaths[j].filename() );
 			system((strOniSplit + " " + strImportOption + " " + GDFPaths[j].string() + " " + VanillaPaths[j].string()).c_str());
 			parts_done++;
@@ -1280,12 +1280,13 @@
 	if (!event.GetInt() ) {
 		OptionsPanel->Hide(); 
-		MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
+		this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()-OptionsPanel->GetRect().GetHeight());}
 	else {
-		//Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
-		//wxMessageDialog* YesNoDialog = new wxMessageDialog(this, 			"WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION	, wxDefaultPosition);
-		//YesNoDialog->ShowModal();
+//		Uncomment this when we release, it gets annoying if you are testing globalization a lot ;)
+		wxMessageDialog* YesNoDialog = new wxMessageDialog(this, 			"WARNING: These options are for advanced users only, use with caution.", "AE Installer Alert",  wxOK | wxICON_EXCLAMATION	, wxDefaultPosition);
+		YesNoDialog->ShowModal();
 		OptionsPanel->Show();
-		MainWindow::SetSize(MainWindow::GetRect().GetWidth(), MainWindow::GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
-	}
+		this->SetSize(this->GetRect().GetWidth(), this->GetRect().GetHeight()+OptionsPanel->GetRect().GetHeight());
+	}
+	
 }