diff --git a/desmume/src/cheatSystem.cpp b/desmume/src/cheatSystem.cpp
index c5b0ead87..2c27ea43f 100644
--- a/desmume/src/cheatSystem.cpp
+++ b/desmume/src/cheatSystem.cpp
@@ -536,6 +536,22 @@ u32	CHEATS::getSize()
 	return list.size();
 }
 
+size_t CHEATS::getActiveCount()
+{
+	size_t activeCheatCount = 0;
+	const size_t cheatListCount = this->getSize();
+	
+	for (size_t i = 0; i < cheatListCount; i++)
+	{
+		if (list[i].enabled)
+		{
+			activeCheatCount++;
+		}
+	}
+	
+	return activeCheatCount;
+}
+
 void CHEATS::setDescription(const char *description, u32 pos)
 {
 	strncpy(list[pos].description, description, sizeof(list[pos].description));
diff --git a/desmume/src/cheatSystem.h b/desmume/src/cheatSystem.h
index a37a90bcc..671c4c9e3 100644
--- a/desmume/src/cheatSystem.h
+++ b/desmume/src/cheatSystem.h
@@ -82,6 +82,7 @@ public:
 	BOOL	get(CHEATS_LIST *cheat, u32 pos);
 	CHEATS_LIST*	getItemByIndex(const u32 pos);
 	u32		getSize();
+	size_t	getActiveCount();
 	void	setDescription(const char *description, u32 pos);
 	BOOL	save();
 	BOOL	load();
diff --git a/desmume/src/cocoa/cocoa_GPU.h b/desmume/src/cocoa/cocoa_GPU.h
index 531f53b20..b2e9dce83 100644
--- a/desmume/src/cocoa/cocoa_GPU.h
+++ b/desmume/src/cocoa/cocoa_GPU.h
@@ -60,6 +60,8 @@
 - (void) hideGPUType:(const NSInteger)theGpuType;
 - (void) showGPUType:(const NSInteger)theGpuType;
 
+- (NSString *) render3DRenderingEngineString;
+
 @end
 
 #ifdef __cplusplus
diff --git a/desmume/src/cocoa/cocoa_GPU.mm b/desmume/src/cocoa/cocoa_GPU.mm
index 3ba1885ed..beaecd991 100644
--- a/desmume/src/cocoa/cocoa_GPU.mm
+++ b/desmume/src/cocoa/cocoa_GPU.mm
@@ -652,6 +652,26 @@ GPU3DInterface *core3DList[] = {
 	[self setGpuStateFlags:flags];
 }
 
+- (NSString *) render3DRenderingEngineString
+{
+	NSString *theString = @"Uninitialized";
+	
+	pthread_mutex_lock(self.mutexProducer);
+	
+	if(gpu3D == NULL)
+	{
+		pthread_mutex_unlock(self.mutexProducer);
+		return theString;
+	}
+	
+	const char *theName = gpu3D->name;
+	theString = [NSString stringWithCString:theName encoding:NSUTF8StringEncoding];
+	
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return theString;
+}
+
 @end
 
 void SetGPULayerState(const int gpuType, const unsigned int i, const bool state)
diff --git a/desmume/src/cocoa/cocoa_cheat.h b/desmume/src/cocoa/cocoa_cheat.h
index 8ee228056..49064dfea 100644
--- a/desmume/src/cocoa/cocoa_cheat.h
+++ b/desmume/src/cocoa/cocoa_cheat.h
@@ -111,6 +111,7 @@
 - (void) remove:(CocoaDSCheatItem *)cheatItem;
 - (BOOL) update:(CocoaDSCheatItem *)cheatItem;
 - (BOOL) save;
+- (NSUInteger) activeCount;
 - (NSMutableArray *) cheatListFromDatabase:(NSURL *)fileURL errorCode:(NSInteger *)error;
 - (void) applyInternalCheat:(CocoaDSCheatItem *)cheatItem;
 
diff --git a/desmume/src/cocoa/cocoa_cheat.mm b/desmume/src/cocoa/cocoa_cheat.mm
index 650d9ccb7..3327f5f54 100644
--- a/desmume/src/cocoa/cocoa_cheat.mm
+++ b/desmume/src/cocoa/cocoa_cheat.mm
@@ -888,6 +888,15 @@ static NSImage *iconCodeBreaker = nil;
 	return result;
 }
 
+- (NSUInteger) activeCount
+{
+	pthread_mutex_lock(self.cdsCore.mutexCoreExecute);
+	NSUInteger activeCheatsCount = self.listData->getActiveCount();
+	pthread_mutex_unlock(self.cdsCore.mutexCoreExecute);
+	
+	return activeCheatsCount;
+}
+
 - (NSMutableArray *) cheatListFromDatabase:(NSURL *)fileURL errorCode:(NSInteger *)error
 {
 	NSMutableArray *newDBList = nil;
diff --git a/desmume/src/cocoa/cocoa_core.h b/desmume/src/cocoa/cocoa_core.h
index 6f81c8d32..d5b5c7c48 100644
--- a/desmume/src/cocoa/cocoa_core.h
+++ b/desmume/src/cocoa/cocoa_core.h
@@ -138,6 +138,10 @@ typedef struct
 - (void) removeOutput:(CocoaDSOutput *)theOutput;
 - (void) removeAllOutputs;
 
+- (NSString *) cpuEmulationEngineString;
+- (NSString *) slot1DeviceTypeString;
+- (NSString *) slot2DeviceTypeString;
+
 @end
 
 static void* RunCoreThread(void *arg);
diff --git a/desmume/src/cocoa/cocoa_core.mm b/desmume/src/cocoa/cocoa_core.mm
index 3fda30c9a..c1b555ee6 100644
--- a/desmume/src/cocoa/cocoa_core.mm
+++ b/desmume/src/cocoa/cocoa_core.mm
@@ -759,6 +759,67 @@ static BOOL isCoreStarted = NO;
 	[CocoaDSCore shutdownCore];
 }
 
+- (NSString *) cpuEmulationEngineString
+{
+	NSString *theString = @"Uninitialized";
+	
+	switch ([self cpuEmulationEngine])
+	{
+		case CPU_EMULATION_ENGINE_INTERPRETER:
+			theString = @"Interpreter";
+			break;
+			
+		case CPU_EMULATION_ENGINE_DYNAMIC_RECOMPILER:
+			theString = @"Dynamic Recompiler";
+			break;
+			
+		default:
+			break;
+	}
+	
+	return theString;
+}
+
+- (NSString *) slot1DeviceTypeString
+{
+	NSString *theString = @"Uninitialized";
+	
+	pthread_mutex_lock(&threadParam.mutexThreadExecute);
+	
+	if(slot1_device == NULL)
+	{
+		pthread_mutex_unlock(&threadParam.mutexThreadExecute);
+		return theString;
+	}
+	
+	const Slot1Info *info = slot1_device->info();
+	theString = [NSString stringWithCString:info->name() encoding:NSUTF8StringEncoding];
+	
+	pthread_mutex_unlock(&threadParam.mutexThreadExecute);
+	
+	return theString;
+}
+
+- (NSString *) slot2DeviceTypeString
+{
+	NSString *theString = @"Uninitialized";
+	
+	pthread_mutex_lock(&threadParam.mutexThreadExecute);
+	
+	if(slot2_device == NULL)
+	{
+		pthread_mutex_unlock(&threadParam.mutexThreadExecute);
+		return theString;
+	}
+	
+	const Slot2Info *info = slot2_device->info();
+	theString = [NSString stringWithCString:info->name() encoding:NSUTF8StringEncoding];
+	
+	pthread_mutex_unlock(&threadParam.mutexThreadExecute);
+	
+	return theString;
+}
+
 @end
 
 static void* RunCoreThread(void *arg)
diff --git a/desmume/src/cocoa/cocoa_output.h b/desmume/src/cocoa/cocoa_output.h
index c53ecd933..1a09c199c 100644
--- a/desmume/src/cocoa/cocoa_output.h
+++ b/desmume/src/cocoa/cocoa_output.h
@@ -101,6 +101,9 @@ typedef struct
 - (void) setMute:(BOOL)mute;
 - (NSInteger) filter;
 - (void) setFilter:(NSInteger)filter;
+- (NSString *) audioOutputEngineString;
+- (NSString *) spuInterpolationModeString;
+- (NSString *) spuSyncMethodString;
 - (void) handleSetVolume:(NSData *)volumeData;
 - (void) handleSetAudioOutputEngine:(NSData *)methodIdData;
 - (void) handleSetSpuAdvancedLogic:(NSData *)stateData;
diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm
index c08df1cb6..141e55b5c 100644
--- a/desmume/src/cocoa/cocoa_output.mm
+++ b/desmume/src/cocoa/cocoa_output.mm
@@ -329,6 +329,87 @@
 	[property setValue:[NSNumber numberWithInteger:filter] forKey:@"filter"];
 }
 
+- (NSString *) audioOutputEngineString
+{
+	NSString *theString = @"Uninitialized";
+	
+	pthread_mutex_lock(self.mutexProducer);
+	
+	SoundInterface_struct *soundCore = SPU_SoundCore();
+	if(soundCore == NULL)
+	{
+		pthread_mutex_unlock(self.mutexProducer);
+		return theString;
+	}
+	
+	const char *theName = soundCore->Name;
+	theString = [NSString stringWithCString:theName encoding:NSUTF8StringEncoding];
+	
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return theString;
+}
+
+- (NSString *) spuInterpolationModeString
+{
+	NSString *theString = @"Unknown";
+	NSInteger theMode = [self spuInterpolationMode];
+	
+	switch (theMode)
+	{
+		case SPUInterpolation_None:
+			theString = @"None";
+			break;
+			
+		case SPUInterpolation_Linear:
+			theString = @"Linear";
+			break;
+			
+		case SPUInterpolation_Cosine:
+			theString = @"Cosine";
+			break;
+			
+		default:
+			break;
+	}
+	
+	return theString;
+}
+
+- (NSString *) spuSyncMethodString
+{
+	NSString *theString = @"Unknown";
+	NSInteger theMode = [self spuSyncMode];
+	NSInteger theMethod = [self spuSyncMethod];
+	
+	if (theMode == ESynchMode_DualSynchAsynch)
+	{
+		theString = @"Dual SPU Sync/Async";
+	}
+	else
+	{
+		switch (theMethod)
+		{
+			case ESynchMethod_N:
+				theString = @"\"N\" Sync Method";
+				break;
+				
+			case ESynchMethod_Z:
+				theString = @"\"Z\" Sync Method";
+				break;
+				
+			case ESynchMethod_P:
+				theString = @"\"P\" Sync Method";
+				break;
+				
+			default:
+				break;
+		}
+	}
+	
+	return theString;
+}
+
 - (void)handlePortMessage:(NSPortMessage*)portMessage
 {
 	NSInteger message = (NSInteger)[portMessage msgid];
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
index 18ebc091a..9d4fe441d 100644
--- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">12F37</string>
+    <string key="IBDocument.SystemVersion">12F45</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
-    <string key="IBDocument.AppKitVersion">1187.39</string>
+    <string key="IBDocument.AppKitVersion">1187.40</string>
     <string key="IBDocument.HIToolboxVersion">626.00</string>
     <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12,7 +12,6 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="1298"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2679,11 +2678,9 @@
         <nil key="NSUserInterfaceItemIdentifier"/>
         <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
         <object class="NSView" key="NSWindowView" id="318805510">
-          <reference key="NSNextResponder"/>
+          <nil key="NSNextResponder"/>
           <int key="NSvFlags">256</int>
           <string key="NSFrameSize">{400, 100}</string>
-          <reference key="NSSuperview"/>
-          <reference key="NSWindow"/>
         </object>
         <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
         <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
@@ -2691,7 +2688,7 @@
         <bool key="NSWindowIsRestorable">YES</bool>
       </object>
       <object class="NSCustomView" id="773785227">
-        <reference key="NSNextResponder"/>
+        <nil key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3206,11 +3203,10 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
           </object>
         </object>
         <string key="NSFrameSize">{520, 422}</string>
-        <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomView" id="842545935">
-        <reference key="NSNextResponder"/>
+        <nil key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3219,7 +3215,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             <int key="NSvFlags">268</int>
             <string key="NSFrame">{{97, 463}, {96, 17}}</string>
             <reference key="NSSuperview" ref="842545935"/>
-            <reference key="NSWindow"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSTextFieldCell" key="NSCell" id="858895078">
               <int key="NSCellFlags">68157504</int>
@@ -3237,7 +3232,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             <int key="NSvFlags">268</int>
             <string key="NSFrame">{{195, 457}, {265, 26}}</string>
             <reference key="NSSuperview" ref="842545935"/>
-            <reference key="NSWindow"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSPopUpButtonCell" key="NSCell" id="813188155">
               <int key="NSCellFlags">-2076180416</int>
@@ -3298,7 +3292,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             <int key="NSvFlags">268</int>
             <string key="NSFrame">{{462, 457}, {116, 26}}</string>
             <reference key="NSSuperview" ref="842545935"/>
-            <reference key="NSWindow"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSPopUpButtonCell" key="NSCell" id="909784582">
               <int key="NSCellFlags">-2076180416</int>
@@ -3442,7 +3435,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                     <int key="NSvFlags">256</int>
                     <string key="NSFrameSize">{640, 394}</string>
                     <reference key="NSSuperview" ref="7331472"/>
-                    <reference key="NSWindow"/>
                     <bool key="NSEnabled">YES</bool>
                     <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                     <bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -3451,7 +3443,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                       <int key="NSvFlags">256</int>
                       <string key="NSFrameSize">{640, 17}</string>
                       <reference key="NSSuperview" ref="703692919"/>
-                      <reference key="NSWindow"/>
                       <reference key="NSTableView" ref="66039540"/>
                     </object>
                     <object class="_NSCornerView" key="NSCornerView" id="753260230">
@@ -3459,7 +3450,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                       <int key="NSvFlags">-2147483392</int>
                       <string key="NSFrame">{{584, 0}, {16, 17}}</string>
                       <reference key="NSSuperview" ref="908217942"/>
-                      <reference key="NSWindow"/>
                     </object>
                     <object class="NSMutableArray" key="NSTableColumns">
                       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3650,7 +3640,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                 </object>
                 <string key="NSFrame">{{1, 17}, {640, 394}}</string>
                 <reference key="NSSuperview" ref="908217942"/>
-                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="66039540"/>
                 <reference key="NSDocView" ref="66039540"/>
                 <reference key="NSBGColor" ref="856317944"/>
@@ -3661,7 +3650,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                 <int key="NSvFlags">-2147483392</int>
                 <string key="NSFrame">{{584, 17}, {15, 102}}</string>
                 <reference key="NSSuperview" ref="908217942"/>
-                <reference key="NSWindow"/>
                 <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                 <reference key="NSTarget" ref="908217942"/>
                 <string key="NSAction">_doScroller:</string>
@@ -3672,7 +3660,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                 <int key="NSvFlags">-2147483392</int>
                 <string key="NSFrame">{{1, 420}, {624, 15}}</string>
                 <reference key="NSSuperview" ref="908217942"/>
-                <reference key="NSWindow"/>
                 <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                 <int key="NSsFlags">1</int>
                 <reference key="NSTarget" ref="908217942"/>
@@ -3688,7 +3675,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                 </object>
                 <string key="NSFrame">{{1, 0}, {640, 17}}</string>
                 <reference key="NSSuperview" ref="908217942"/>
-                <reference key="NSWindow"/>
                 <reference key="NSNextKeyView" ref="23831683"/>
                 <reference key="NSDocView" ref="23831683"/>
                 <reference key="NSBGColor" ref="856317944"/>
@@ -3698,14 +3684,12 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             </object>
             <string key="NSFrame">{{-1, 37}, {642, 412}}</string>
             <reference key="NSSuperview" ref="842545935"/>
-            <reference key="NSWindow"/>
             <reference key="NSNextKeyView" ref="7331472"/>
             <int key="NSsFlags">133682</int>
             <reference key="NSVScroller" ref="1008919647"/>
             <reference key="NSHScroller" ref="656486530"/>
             <reference key="NSContentView" ref="7331472"/>
             <reference key="NSHeaderClipView" ref="703692919"/>
-            <reference key="NSCornerView" ref="753260230"/>
             <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
             <double key="NSMinMagnification">0.25</double>
             <double key="NSMaxMagnification">4</double>
@@ -3715,7 +3699,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             <reference key="NSNextResponder" ref="842545935"/>
             <string key="NSFrame">{{197, 12}, {247, 17}}</string>
             <reference key="NSSuperview" ref="842545935"/>
-            <reference key="NSWindow"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSTextFieldCell" key="NSCell" id="223685874">
               <int key="NSCellFlags">605028416</int>
@@ -3734,12 +3717,10 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
           </object>
         </object>
         <string key="NSFrameSize">{640, 495}</string>
-        <reference key="NSSuperview"/>
-        <reference key="NSWindow"/>
         <string key="NSClassName">InputPrefsView</string>
       </object>
       <object class="NSCustomView" id="373257179">
-        <reference key="NSNextResponder"/>
+        <nil key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3748,7 +3729,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
             <int key="NSvFlags">12</int>
             <string key="NSFrame">{{13, 10}, {463, 401}}</string>
             <reference key="NSSuperview" ref="373257179"/>
-            <reference key="NSWindow"/>
             <object class="NSMutableArray" key="NSTabViewItems">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <object class="NSTabViewItem" id="750316744">
@@ -3773,7 +3753,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{72, 44}, {84, 17}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="1051872315">
                                 <int key="NSCellFlags">68157504</int>
@@ -3791,7 +3770,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{44, 16}, {112, 17}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="279286359">
                                 <int key="NSCellFlags">68157504</int>
@@ -3809,7 +3787,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{158, 38}, {126, 26}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSPopUpButtonCell" key="NSCell" id="644484329">
                                 <int key="NSCellFlags">-2076180416</int>
@@ -3902,7 +3879,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               </object>
                               <string key="NSFrame">{{289, 14}, {72, 22}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="689714106">
                                 <int key="NSCellFlags">-1804599231</int>
@@ -3994,7 +3970,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{63, 72}, {93, 17}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="86457779">
                                 <int key="NSCellFlags">68157504</int>
@@ -4012,7 +3987,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{158, 66}, {126, 26}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSPopUpButtonCell" key="NSCell" id="977881385">
                                 <int key="NSCellFlags">-2076180416</int>
@@ -4081,7 +4055,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{158, 11}, {126, 26}}</string>
                               <reference key="NSSuperview" ref="610612997"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSPopUpButtonCell" key="NSCell" id="729105354">
                                 <int key="NSCellFlags">-2076180416</int>
@@ -4183,12 +4156,10 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                           </object>
                           <string key="NSFrame">{{1, 1}, {429, 100}}</string>
                           <reference key="NSSuperview" ref="654619277"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 206}, {431, 116}}</string>
                       <reference key="NSSuperview" ref="698863500"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -4232,7 +4203,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA</str
                                       <int key="NSvFlags">268</int>
                                       <string key="NSFrame">{{18, 14}, {100, 38}}</string>
                                       <reference key="NSSuperview" ref="713770080"/>
-                                      <reference key="NSWindow"/>
                                       <bool key="NSEnabled">YES</bool>
                                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                       <int key="NSNumRows">2</int>
@@ -4426,12 +4396,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                   </object>
                                   <string key="NSFrame">{{1, 1}, {194, 62}}</string>
                                   <reference key="NSSuperview" ref="405894970"/>
-                                  <reference key="NSWindow"/>
                                 </object>
                               </object>
                               <string key="NSFrame">{{15, 53}, {196, 78}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <string key="NSOffsets">{0, 0}</string>
                               <object class="NSTextFieldCell" key="NSTitleCell">
                                 <int key="NSCellFlags">67108864</int>
@@ -4465,7 +4433,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                       <int key="NSvFlags">268</int>
                                       <string key="NSFrame">{{18, 14}, {150, 38}}</string>
                                       <reference key="NSSuperview" ref="533349872"/>
-                                      <reference key="NSWindow"/>
                                       <bool key="NSEnabled">YES</bool>
                                       <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                       <int key="NSNumRows">2</int>
@@ -4657,12 +4624,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                   </object>
                                   <string key="NSFrame">{{1, 1}, {194, 62}}</string>
                                   <reference key="NSSuperview" ref="1057767226"/>
-                                  <reference key="NSWindow"/>
                                 </object>
                               </object>
                               <string key="NSFrame">{{218, 53}, {196, 78}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <string key="NSOffsets">{0, 0}</string>
                               <object class="NSTextFieldCell" key="NSTitleCell">
                                 <int key="NSCellFlags">67108864</int>
@@ -4686,7 +4651,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{15, 18}, {126, 17}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="418483299">
                                 <int key="NSCellFlags">68157504</int>
@@ -4704,7 +4668,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{339, 16}, {72, 22}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="134325674">
                                 <int key="NSCellFlags">-1804599231</int>
@@ -4787,7 +4750,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{144, 12}, {189, 26}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSSliderCell" key="NSCell" id="414720816">
                                 <int key="NSCellFlags">-2080112384</int>
@@ -4810,7 +4772,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{305, 38}, {38, 11}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="494052588">
                                 <int key="NSCellFlags">68157504</int>
@@ -4832,7 +4793,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{263, 38}, {38, 11}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="273276002">
                                 <int key="NSCellFlags">68157504</int>
@@ -4850,7 +4810,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{220, 38}, {38, 11}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="647568442">
                                 <int key="NSCellFlags">68157504</int>
@@ -4868,7 +4827,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{178, 38}, {38, 11}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="386451738">
                                 <int key="NSCellFlags">68157504</int>
@@ -4886,7 +4844,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{137, 38}, {38, 11}}</string>
                               <reference key="NSSuperview" ref="320484480"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="1069527907">
                                 <int key="NSCellFlags">68157504</int>
@@ -4902,12 +4859,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                           </object>
                           <string key="NSFrame">{{1, 1}, {429, 141}}</string>
                           <reference key="NSSuperview" ref="367271593"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 45}, {431, 157}}</string>
                       <reference key="NSSuperview" ref="698863500"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -4929,7 +4884,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   </object>
                   <string key="NSFrame">{{10, 33}, {443, 355}}</string>
                   <reference key="NSSuperview" ref="286093627"/>
-                  <reference key="NSWindow"/>
                 </object>
                 <string key="NSLabel">Display Views</string>
                 <reference key="NSColor" ref="266180242"/>
@@ -5931,8 +5885,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{489, 425}</string>
-        <reference key="NSSuperview"/>
-        <reference key="NSWindow"/>
         <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomView" id="704316683">
@@ -6788,7 +6740,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
         <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomView" id="748902585">
-        <reference key="NSNextResponder"/>
+        <nil key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -6797,7 +6749,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <int key="NSvFlags">12</int>
             <string key="NSFrame">{{13, 10}, {528, 349}}</string>
             <reference key="NSSuperview" ref="748902585"/>
-            <reference key="NSWindow"/>
             <object class="NSMutableArray" key="NSTabViewItems">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <object class="NSTabViewItem" id="1008833987">
@@ -6822,7 +6773,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{16, 32}, {197, 18}}</string>
                               <reference key="NSSuperview" ref="330186328"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSButtonCell" key="NSCell" id="152711854">
                                 <int key="NSCellFlags">-2080374784</int>
@@ -6846,7 +6796,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{16, 12}, {217, 18}}</string>
                               <reference key="NSSuperview" ref="330186328"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSButtonCell" key="NSCell" id="683227590">
                                 <int key="NSCellFlags">67108864</int>
@@ -6868,12 +6817,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                           </object>
                           <string key="NSFrame">{{1, 1}, {494, 58}}</string>
                           <reference key="NSSuperview" ref="699930286"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 229}, {496, 74}}</string>
                       <reference key="NSSuperview" ref="461624007"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -6907,7 +6854,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{18, 14}, {165, 38}}</string>
                               <reference key="NSSuperview" ref="16233"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                               <int key="NSNumRows">2</int>
@@ -7101,7 +7047,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{243, 15}, {72, 17}}</string>
                               <reference key="NSSuperview" ref="16233"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="206408938">
                                 <int key="NSCellFlags">68157504</int>
@@ -7119,7 +7064,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{320, 13}, {50, 22}}</string>
                               <reference key="NSSuperview" ref="16233"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSTextFieldCell" key="NSCell" id="1033938841">
                                 <int key="NSCellFlags">-1804599231</int>
@@ -7196,7 +7140,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{371, 10}, {19, 27}}</string>
                               <reference key="NSSuperview" ref="16233"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSStepperCell" key="NSCell" id="401365162">
                                 <int key="NSCellFlags">67895328</int>
@@ -7214,12 +7157,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                           </object>
                           <string key="NSFrame">{{1, 1}, {494, 62}}</string>
                           <reference key="NSSuperview" ref="1034534989"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 147}, {496, 78}}</string>
                       <reference key="NSSuperview" ref="461624007"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -7253,7 +7194,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{16, 32}, {145, 18}}</string>
                               <reference key="NSSuperview" ref="808083999"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSButtonCell" key="NSCell" id="340220192">
                                 <int key="NSCellFlags">67108864</int>
@@ -7277,7 +7217,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{16, 12}, {118, 18}}</string>
                               <reference key="NSSuperview" ref="808083999"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSButtonCell" key="NSCell" id="16571944">
                                 <int key="NSCellFlags">67108864</int>
@@ -7299,12 +7238,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                           </object>
                           <string key="NSFrame">{{1, 1}, {494, 58}}</string>
                           <reference key="NSSuperview" ref="337932383"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 69}, {496, 74}}</string>
                       <reference key="NSSuperview" ref="461624007"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -7338,7 +7275,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                               <int key="NSvFlags">268</int>
                               <string key="NSFrame">{{16, 12}, {462, 18}}</string>
                               <reference key="NSSuperview" ref="675831467"/>
-                              <reference key="NSWindow"/>
                               <bool key="NSEnabled">YES</bool>
                               <object class="NSButtonCell" key="NSCell" id="830122320">
                                 <int key="NSCellFlags">-2080374784</int>
@@ -7360,12 +7296,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                           </object>
                           <string key="NSFrame">{{1, 1}, {494, 38}}</string>
                           <reference key="NSSuperview" ref="808054783"/>
-                          <reference key="NSWindow"/>
                         </object>
                       </object>
                       <string key="NSFrame">{{6, 11}, {496, 54}}</string>
                       <reference key="NSSuperview" ref="461624007"/>
-                      <reference key="NSWindow"/>
                       <string key="NSOffsets">{0, 0}</string>
                       <object class="NSTextFieldCell" key="NSTitleCell">
                         <int key="NSCellFlags">67108864</int>
@@ -7387,7 +7321,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                   </object>
                   <string key="NSFrame">{{10, 33}, {508, 303}}</string>
                   <reference key="NSSuperview" ref="626099"/>
-                  <reference key="NSWindow"/>
                 </object>
                 <string key="NSLabel">General Settings</string>
                 <reference key="NSColor" ref="266180242"/>
@@ -7797,8 +7730,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
         </object>
         <string key="NSFrameSize">{554, 373}</string>
-        <reference key="NSSuperview"/>
-        <reference key="NSWindow"/>
         <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomObject" id="660705428">
@@ -23199,13 +23130,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
         <bool key="NSFilterRestrictsInsertion">YES</bool>
       </object>
       <object class="NSUserDefaultsController" id="178548672">
-        <object class="NSMutableArray" key="NSDeclaredKeys">
-          <bool key="EncodedWithXMLCoder">YES</bool>
-          <string>General_LoadROMCompletelyInRAM</string>
-          <string>General_LoadROMCompletelyIntoRAM</string>
-          <string>General_StreamLoadRomFile</string>
-          <string>General_StreamLoadRomData</string>
-        </object>
         <bool key="NSSharedInstance">YES</bool>
       </object>
     </object>
@@ -32938,6 +32862,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">8328</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">cdsCoreController</string>
+            <reference key="source" ref="1057202244"/>
+            <reference key="destination" ref="582168938"/>
+          </object>
+          <int key="connectionID">8329</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">emuControlController</string>
+            <reference key="source" ref="1057202244"/>
+            <reference key="destination" ref="258098641"/>
+          </object>
+          <int key="connectionID">8330</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -49594,7 +49534,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">8328</int>
+      <int key="maxID">8330</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -51482,6 +51422,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>cdsCoreController</string>
+              <string>emuControlController</string>
               <string>romInfoController</string>
               <string>troubleshootingWindowController</string>
               <string>viewBugReport</string>
@@ -51493,6 +51435,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <bool key="EncodedWithXMLCoder">YES</bool>
               <string>NSObjectController</string>
               <string>NSObjectController</string>
+              <string>NSObjectController</string>
+              <string>NSObjectController</string>
               <string>NSView</string>
               <string>NSView</string>
               <string>NSView</string>
@@ -51503,6 +51447,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
+              <string>cdsCoreController</string>
+              <string>emuControlController</string>
               <string>romInfoController</string>
               <string>troubleshootingWindowController</string>
               <string>viewBugReport</string>
@@ -51512,6 +51458,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             </object>
             <object class="NSMutableArray" key="dict.values">
               <bool key="EncodedWithXMLCoder">YES</bool>
+              <object class="IBToOneOutletInfo">
+                <string key="name">cdsCoreController</string>
+                <string key="candidateClassName">NSObjectController</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">emuControlController</string>
+                <string key="candidateClassName">NSObjectController</string>
+              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">romInfoController</string>
                 <string key="candidateClassName">NSObjectController</string>
diff --git a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.h b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.h
index 9774fb096..1730c9076 100644
--- a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.h
+++ b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.h
@@ -34,6 +34,8 @@ enum TroubleshootingViewID
 	NSWindow *window;
 	NSObjectController *troubleshootingWindowController;
 	NSObjectController *romInfoController;
+	NSObjectController *emuControlController;
+	NSObjectController *cdsCoreController;
 	
 	NSView *viewSupportRequest;
 	NSView *viewBugReport;
@@ -48,6 +50,8 @@ enum TroubleshootingViewID
 @property (readonly) IBOutlet NSWindow *window;
 @property (readonly) IBOutlet NSObjectController *troubleshootingWindowController;
 @property (readonly) IBOutlet NSObjectController *romInfoController;
+@property (readonly) IBOutlet NSObjectController *emuControlController;
+@property (readonly) IBOutlet NSObjectController *cdsCoreController;
 @property (readonly) IBOutlet NSView *viewSupportRequest;
 @property (readonly) IBOutlet NSView *viewBugReport;
 @property (readonly) IBOutlet NSView *viewFinishedForm;
diff --git a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm
index f20b0bf21..b8f34fd0b 100644
--- a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm
+++ b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm
@@ -16,9 +16,14 @@
  */
 
 #import "troubleshootingWindowDelegate.h"
+#import "EmuControllerDelegate.h"
 
 #import "cocoa_util.h"
 #import "cocoa_globals.h"
+#import "cocoa_cheat.h"
+#import "cocoa_core.h"
+#import "cocoa_GPU.h"
+#import "cocoa_output.h"
 
 @implementation TroubleshootingWindowDelegate
 
@@ -26,6 +31,8 @@
 @synthesize window;
 @synthesize troubleshootingWindowController;
 @synthesize romInfoController;
+@synthesize emuControlController;
+@synthesize cdsCoreController;
 @synthesize viewSupportRequest;
 @synthesize viewBugReport;
 @synthesize viewFinishedForm;
@@ -68,6 +75,8 @@
 - (IBAction) continueToFinalForm:(id)sender
 {
 	static NSString *unspecifiedStr = @"Unspecified"; // Do not expose localized version for this NSString -- we want this to be in English
+	EmuControllerDelegate *emuControl = (EmuControllerDelegate *)[emuControlController content];
+	CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content];
 	
 	// Force end of editing of any text fields.
 	[window makeFirstResponder:nil];
@@ -97,6 +106,53 @@
 	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]];
 	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nROM Name: "] stringByAppendingString:romNameStr];
 	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nROM Serial: "] stringByAppendingString:romSerialStr];
+	finalFormTextStr = [finalFormTextStr stringByAppendingString:@"\n-----------------------------------"];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nEmulation Speed: "] stringByAppendingString:([cdsCore isSpeedLimitEnabled] ? [NSString stringWithFormat:@"%1.2fx", [emuControl lastSetSpeedScalar]] : @"Unlimited")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAuto Frame Skip: "] stringByAppendingString:([cdsCore isFrameSkipEnabled] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nSLOT-1 Device Type: "] stringByAppendingString:[cdsCore slot1DeviceTypeString]];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nSLOT-2 Device Type: "] stringByAppendingString:[cdsCore slot2DeviceTypeString]];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAdvanced Bus-Level Timing: "] stringByAppendingString:([cdsCore emuFlagAdvancedBusLevelTiming] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nRigorous 3D Rendering Timing: "] stringByAppendingString:([cdsCore emuFlagRigorousTiming] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nCPU Emulation Engine: "] stringByAppendingString:([cdsCore cpuEmulationEngine] == CPU_EMULATION_ENGINE_DYNAMIC_RECOMPILER ? [NSString stringWithFormat:@"%@ (BlockSize=%li)", [cdsCore cpuEmulationEngineString], [cdsCore maxJITBlockSize]] : [cdsCore cpuEmulationEngineString])];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nExternal BIOS: "] stringByAppendingString:([cdsCore emuFlagUseExternalBios] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nExternal Firmware: "] stringByAppendingString:([cdsCore emuFlagUseExternalFirmware] ? @"YES" : @"NO")];
+	
+	NSString *render3DEngineDetails = [[cdsCore cdsGPU] render3DRenderingEngineString];
+	switch ([[cdsCore cdsGPU] render3DRenderingEngine])
+	{
+		case CORE3DLIST_NULL:
+			break;
+			
+		case CORE3DLIST_SWRASTERIZE:
+			render3DEngineDetails = [NSString stringWithFormat:@"%@ (HighResColor=%@, EdgeMark=%@, Fog=%@, DepthCompare=%ld)",
+									 [[cdsCore cdsGPU] render3DRenderingEngineString],
+									 ([[cdsCore cdsGPU] render3DHighPrecisionColorInterpolation] ? @"YES" : @"NO"),
+									 ([[cdsCore cdsGPU] render3DEdgeMarking] ? @"YES" : @"NO"),
+									 ([[cdsCore cdsGPU] render3DFog] ? @"YES" : @"NO"),
+									 [[cdsCore cdsGPU] render3DDepthComparisonThreshold]];
+			break;
+			
+		case CORE3DLIST_OPENGL:
+			render3DEngineDetails = [NSString stringWithFormat:@"%@ (MSAA=%@)",
+									 [[cdsCore cdsGPU] render3DRenderingEngineString],
+									 ([[cdsCore cdsGPU] render3DMultisample] ? @"YES" : @"NO")];
+			break;
+			
+		default:
+			break;
+	}
+	
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Engine: "] stringByAppendingString:render3DEngineDetails];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Line Hack: "] stringByAppendingString:([[cdsCore cdsGPU] render3DLineHack] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Textures: "] stringByAppendingString:([[cdsCore cdsGPU] render3DTextures] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n3D Renderer - Thread Count: "] stringByAppendingString:([[cdsCore cdsGPU] render3DThreads] == 0 ? @"Automatic" : [NSString stringWithFormat:@"%ld", [[cdsCore cdsGPU] render3DThreads]])];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Output Engine: "] stringByAppendingString:[[emuControl cdsSpeaker] audioOutputEngineString]];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Advanced SPU Logic: "] stringByAppendingString:([[emuControl cdsSpeaker] spuAdvancedLogic] ? @"YES" : @"NO")];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Sound Interpolation Method: "] stringByAppendingString:[[emuControl cdsSpeaker] spuInterpolationModeString]];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nAudio - Sound Synchronization Method: "] stringByAppendingString:[[emuControl cdsSpeaker] spuSyncMethodString]];
+	finalFormTextStr = [finalFormTextStr stringByAppendingString:@"\n-----------------------------------"];
+	finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nCheats: "] stringByAppendingString:([cdsCore isCheatingEnabled] ? [NSString stringWithFormat:@"YES (ActiveCheatCount=%ld)", [[emuControl cdsCheats] activeCount]] : @"NO")];
+	finalFormTextStr = [finalFormTextStr stringByAppendingString:@"\n-----------------------------------"];
 	
 	if ([window contentView] == viewSupportRequest)
 	{
@@ -106,7 +162,7 @@
 			supportRequestTextStr = unspecifiedStr;
 		}
 		
-		finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n\nSupport Request: "] stringByAppendingString:supportRequestTextStr];
+		finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nSupport Request: "] stringByAppendingString:supportRequestTextStr];
 		[bindings setValue:NSSTRING_HELP_COPY_PASTE_TECH_SUPPORT forKey:@"copyPasteHelpText"];
 		[bindings setValue:NSSTRING_TITLE_GO_TECH_SUPPORT_WEBPAGE_TITLE forKey:@"goWebpageButtonTitle"];
 	}
@@ -124,7 +180,7 @@
 			bugReportExpectedTextStr = unspecifiedStr;
 		}
 		
-		finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n\nObserved Behavior: "] stringByAppendingString:bugReportObservedTextStr];
+		finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\nObserved Behavior: "] stringByAppendingString:bugReportObservedTextStr];
 		finalFormTextStr = [[finalFormTextStr stringByAppendingString:@"\n\nExpected Behavior: "] stringByAppendingString:bugReportExpectedTextStr];
 		[bindings setValue:NSSTRING_HELP_COPY_PASTE_BUG_REPORT forKey:@"copyPasteHelpText"];
 		[bindings setValue:NSSTRING_TITLE_GO_BUG_REPORT_WEBPAGE_TITLE forKey:@"goWebpageButtonTitle"];