Index: trunk/i386/libsaio/bootstruct.c
===================================================================
--- trunk/i386/libsaio/bootstruct.c	(revision 2825)
+++ trunk/i386/libsaio/bootstruct.c	(revision 2826)
@@ -155,8 +155,8 @@
 	/* Memory size to use for defaults calculations (cparm) */
 	uint64_t	sane_size = 0;
 
-	EfiMemoryRange *memoryMap	= NULL;
-	MemoryRange *range		= NULL;
+	EfiMemoryRange	*memoryMap	= NULL;
+	MemoryRange	*range		= NULL;
 	int memoryMapCount = bootInfo->memoryMapCount;
 
 	if (memoryMapCount == 0)
@@ -257,8 +257,12 @@
 		 * For user visible memory size, round up to 128 Mb - accounting for the various stolen memory
 		 * not reported by EFI. (cparm)
 		 */
-
+#if DEBUG_BOOTSTRUCT
 		sane_size = (sane_size + 128 * MEG - 1) & ~((uint64_t)(128 * MEG - 1));
+		DBG( "Total amount of physical RAM in the system : %d\n", ((sane_size + 128 * MEG - 1) & ~((uint64_t)(128 * MEG - 1))) );
+#else
+		DBG( "Total amount of RAM in the system : %d\n", sane_size );
+#endif
 		bootArgs->PhysicalMemorySize = sane_size;
 	}
 
Index: trunk/i386/libsaio/cpu.c
===================================================================
--- trunk/i386/libsaio/cpu.c	(revision 2825)
+++ trunk/i386/libsaio/cpu.c	(revision 2826)
@@ -613,6 +613,9 @@
 					p->CPU.NoThreads	= (uint32_t)bitfield((uint32_t)msr, 15,  0);
 					break;
 				case CPUID_MODEL_ATOM_3700:
+					p->CPU.NoCores		= 4;
+					p->CPU.NoThreads	= 4;
+					break;
 				case CPUID_MODEL_ATOM:
 					p->CPU.NoCores		= 2;
 					p->CPU.NoThreads	= 2;
Index: trunk/i386/boot2/drivers.c
===================================================================
--- trunk/i386/boot2/drivers.c	(revision 2825)
+++ trunk/i386/boot2/drivers.c	(revision 2826)
@@ -176,6 +176,8 @@
 		return 0;
 	}
 
+	// ========================================
+
 	// Load extra drivers if a hook has been installed.
 	if (LoadExtraDrivers_p != NULL)
 	{
@@ -254,7 +256,7 @@
 			{
 				verbose("Attempting to loading drivers from standard repositories:\n");
 
-				if ( (gMacOSVersion[3] == '9') || ((gMacOSVersion[3] == '1') && ((gMacOSVersion[4] == '0') || gMacOSVersion[4] == '1' ) )) // issue 352
+				if ( (gMacOSVersion[3] == '9') || ((gMacOSVersion[3] == '1') && ((gMacOSVersion[4] == '0') || (gMacOSVersion[4] == '1') || (gMacOSVersion[4] == '2') ) )) // issue 352
 				{
 					verbose("\t- Third party extensions search path: /Library/Extensions\n");
 					strlcpy(gExtensionsSpec, dirSpec, 4087); /* 4096 - sizeof("Library/") mean 4096 - 9 = 4087 */
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 2825)
+++ trunk/i386/boot2/boot.c	(revision 2826)
@@ -208,7 +208,7 @@
 		bootArgs->flags		|= kBootArgsFlagCSRActiveConfig;
 
 		// Set limit to 7bit
-		if ( getIntForKey(KCsrActiveConfig, &csrValue, &bootInfo->chameleonConfig) && (csrValue >= 0 && csrValue <= 127) )
+		if ( getIntForKey(kCsrActiveConfig, &csrValue, &bootInfo->chameleonConfig) && (csrValue >= 0 && csrValue <= 127) )
 		{
 			bootArgs->csrActiveConfig	= csrValue;
 		}
@@ -408,7 +408,7 @@
 			// Yosemite and El Capitan prelink kernel cache file
 			// for 10.10 10.11
 			snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%sprelinkedkernel", kDefaultCachePathYosemite);
-			verbose("Kernel Cache file path (Mac OS X 10.10 and newer): %s\n", kernelCacheFile);
+			verbose("Kernel Cache file path (OS X 10.10 and newer): %s\n", kernelCacheFile);
 		}
 	}
 
@@ -863,12 +863,13 @@
 			// bootFile must start with a / if it not start with a device name
 			if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/')
 			{
-				if ( MacOSVerCurrent < MacOSVer2Int("10.10") ) // Micky1979 - Is prior to Yosemite 10.10
+				if ( MacOSVerCurrent < MacOSVer2Int("10.10") ) // Mavericks and older
 				{
 					snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading /
 				}
 				else
 				{
+					// Yosemite and newer
 					snprintf(bootFile, sizeof(bootFile), kDefaultKernelPathForYos"%s", bootInfo->bootFile); // Yosemite or El Capitan
 				}
 			}
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 2825)
+++ trunk/i386/boot2/boot.h	(revision 2826)
@@ -188,7 +188,7 @@
 #define kHDAEnabler			"HDAEnabler"			/* pci_setup.c */
 #define kHDEFLayoutID			"HDEFLayoutID"			/* hda.c */
 #define kHDAULayoutID			"HDAULayoutID"			/* hda.c */
-#define KCsrActiveConfig		"CsrActiveConfig"		/* boot.c */
+#define kCsrActiveConfig		"CsrActiveConfig"		/* boot.c */
 
 /* Pike R. Alpha: added this key */
 #define kBlackMode			"BlackMode"