Index: AE/Installer/trunk/source/main_window.cpp
===================================================================
--- AE/Installer/trunk/source/main_window.cpp	(revision 389)
+++ AE/Installer/trunk/source/main_window.cpp	(revision 390)
@@ -149,5 +149,4 @@
 		if (exists("packages/VanillaDats")) remove_all("packages/VanillaDats"); 
 		create_directory( "packages/VanillaDats" );
-
 		create_directory( "packages/VanillaDats/level0_Final/" );
 		//blah blah finish this.
@@ -262,4 +261,10 @@
 								else remove(dir_itr->path());
 						}
+						else if (dir_itr->path().filename().substr(0,4) == "ONWC") { //fix for buggy ONWC overriding
+								cout <<dir_itr->path().filename() << "\n";
+
+								if(!exists( "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final/" +  dir_itr->filename())) rename(dir_itr->path(), "packages/VanillaDats/level" + levels[i] + "_Final/level" + levels[i] + "_Final/" +  dir_itr->filename());
+								else remove(dir_itr->path());
+						}
 						if (exists(dir_itr->path())) {
 
@@ -331,7 +336,8 @@
 		
 		// CIP:last of all, set up the edition folder as a playable Oni installation by placing the latest application (+ Daodan DLL on Windows) in edition/
-		
-		// CIP:then copy persist.dat and keyconfig.txt into edition/ as well
-		
+		// or we could just include it in the zip in the proper place already.
+
+		copy("../../persist.dat","../persist.dat");
+		copy("../../keyconfig.txt","../keyconfig.txt");
 #ifndef WIN32
 		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
@@ -345,4 +351,5 @@
 		
 #endif
+		
 		
 		setStatusArea((string)"Done! Now select your mod packages and click install.");
@@ -975,6 +982,11 @@
     menuBar->Append(itemMenu42, _("Options"));
     wxMenu* itemMenu44 = new wxMenu;
-    itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
-    menuBar->Append(itemMenu44, _("Help"));
+#ifdef WIN32
+	itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
+	menuBar->Append(itemMenu44, _("Help"));
+#else
+	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
+#endif	
+
     itemFrame1->SetMenuBar(menuBar);
 
@@ -1117,5 +1129,5 @@
 		splitInstances = SPLIT;
 	}
-
+	
 	globalPackages = getPackages();
 	globalInstalledMods = getInstallString();
@@ -1129,9 +1141,12 @@
 	TheProgressBar = ProgressBar;
 	OptionsPanel->Hide();
+	
+//#ifndef WIN32
+//	itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
+	
+//#endif
+	
 	if(splitInstances == SPLIT) SeperatedRadio->SetValue(true);
 	else CompleteRadio->SetValue(true);
-
-
-
 	if(strImportOption == "-import:nosep") NoSepRadio->SetValue(true);
 	else SepRadio->SetValue(true);