Index: branches/slice/i386/libsaio/ext2fs.c
===================================================================
--- branches/slice/i386/libsaio/ext2fs.c	(revision 710)
+++ branches/slice/i386/libsaio/ext2fs.c	(revision 711)
@@ -15,7 +15,7 @@
 
 bool EX2Probe (const void *buf)
 {
-	return (OSReadLittleInt16(buf+0x438,0)==0xEF53);
+	return (OSReadLittleInt16(buf+0x438,0)==0xEF53); //
 }
 
 void EX2GetDescription(CICell ih, char *str, long strMaxLen)
Index: branches/slice/i386/libsaio/Makefile
===================================================================
--- branches/slice/i386/libsaio/Makefile	(revision 710)
+++ branches/slice/i386/libsaio/Makefile	(revision 711)
@@ -39,7 +39,7 @@
 	ufs.o ufs_byteorder.o \
 	vbe.o nbp.o smbios_patcher.o hfs.o hfs_compare.o \
 	xml.o ntfs.o msdos.o md5c.o device_tree.o \
-	cpu.o platform.o \
+	cpu.o platform.o acpi_patcher.o aml_generator.o \
 	fake_efi.o ext2fs.o \
 	pci_setup.o \
 	device_inject.o pci_root.o \
Index: branches/slice/i386/libsaio/acpi.h
===================================================================
--- branches/slice/i386/libsaio/acpi.h	(revision 710)
+++ branches/slice/i386/libsaio/acpi.h	(revision 711)
@@ -17,6 +17,7 @@
 
 #define ACPI_SIGNATURE_UINT64_LE UINT64_LE_FROM_CHARS('R','S','D',' ','P','T','R',' ')
 
+
 /* Per ACPI 3.0a spec */
 
 // TODO Migrate
Index: branches/slice/i386/libsaio/platform.c
===================================================================
--- branches/slice/i386/libsaio/platform.c	(revision 710)
+++ branches/slice/i386/libsaio/platform.c	(revision 711)
@@ -9,7 +9,7 @@
 #include "bootstruct.h"
 #include "pci.h"
 #include "platform.h"
-#include "cpu.h"
+//#include "cpu.h"
 #include "modules.h"
 #include "efi.h"
 
Index: branches/slice/i386/libsaio/cpu.c
===================================================================
--- branches/slice/i386/libsaio/cpu.c	(revision 710)
+++ branches/slice/i386/libsaio/cpu.c	(revision 711)
@@ -97,7 +97,7 @@
 {
 	PlatformInfo_t *p = Platform;
 	int i = 0;
-	uint8_t turbo;
+	uint8_t turbo = 0;
 	uint64_t	tscFrequency, fsbFrequency, cpuFrequency;
 	uint64_t	msr; //, flex_ratio;
 	uint8_t		maxcoef, maxdiv, currcoef, currdiv, mindiv;
Index: branches/slice/i386/libsaio/platform.h
===================================================================
--- branches/slice/i386/libsaio/platform.h	(revision 710)
+++ branches/slice/i386/libsaio/platform.h	(revision 711)
@@ -12,6 +12,7 @@
 extern bool platformCPUFeature(uint32_t);
 extern void scan_platform(void);
 extern void dumpPhysAddr(const char * title, void * a, int len);
+extern void scan_cpu();
 
 #define bit(n)			(1UL << (n))
 #define bitmask(h,l)		((bit(h)|(bit(h)-1)) & ~(bit(l)-1))
Index: branches/slice/i386/libsaio/disk.c
===================================================================
--- branches/slice/i386/libsaio/disk.c	(revision 710)
+++ branches/slice/i386/libsaio/disk.c	(revision 711)
@@ -739,7 +739,7 @@
     int                       spc;
     struct driveInfo          di;
     boot_drive_info_t         *dp;
-	
+	verbose("diskScanFDiskBootVolumes %d\n", biosdev);
     /* Initialize disk info */
     if (getDriveInfo(biosdev, &di) != 0) {
 		return NULL;
@@ -1503,7 +1503,7 @@
 
 BVRef diskScanBootVolumes( int biosdev, int * countPtr )
 {
-    struct DiskBVMap *        map;
+    struct DiskBVMap *        map = NULL;
     BVRef bvr;
     int count = 0;
 	
@@ -1642,7 +1642,7 @@
     	msglog(" bvr: %x, dev: %x, part: %d, flags: %x, vis: %d\n", bvr, bvr->biosdev, bvr->part_no, bvr->flags, bvr->visible);
 	}
  	msglog("count: %d\n", bvCount);
- 	getc();
+// 	getc();
 #endif
 	
 	*count = bvCount;
Index: branches/slice/i386/libsaio/fake_efi.c
===================================================================
--- branches/slice/i386/libsaio/fake_efi.c	(revision 710)
+++ branches/slice/i386/libsaio/fake_efi.c	(revision 711)
@@ -11,7 +11,7 @@
 #include "fake_efi.h"
 #include "efi_tables.h"
 #include "platform.h"
-//#include "acpi_patcher.h"
+#include "acpi_patcher.h"
 #include "smbios_patcher.h"
 #include "device_inject.h"
 #include "convert.h"
@@ -776,9 +776,9 @@
 //	getSmbios(SMBIOS_ORIGINAL); //Slice - already done
 	getSmbiosProductName();
 
+	setupAcpi();
+	//execute_hook("setupEfiConfigurationTable", NULL, NULL, NULL, NULL);
 	
-	execute_hook("setupEfiConfigurationTable", NULL, NULL, NULL, NULL);
-	
 	// Add configuration table entries to both the services table and the device tree
 	setupEfiConfigurationTable();
 	addConfigurationTable(&gEfiSmbiosTableGuid, &smbios_p, NULL);
Index: branches/slice/i386/boot0/Makefile
===================================================================
--- branches/slice/i386/boot0/Makefile	(revision 710)
+++ branches/slice/i386/boot0/Makefile	(revision 711)
@@ -9,7 +9,7 @@
 
 all embedtheme optionrom: $(DIRS_NEEDED) boot0 boot0hfs chain0
 
-boot0: boot0.s Makefile $(NASM)
+boot0: boot0.s 
 	@echo "\t[NASM] $@"
 	@$(NASM) boot0.s -o $(SYMROOT)/$@
 
Index: branches/slice/i386/boot2/boot.c
===================================================================
--- branches/slice/i386/boot2/boot.c	(revision 710)
+++ branches/slice/i386/boot2/boot.c	(revision 711)
@@ -53,6 +53,7 @@
 #include "boot.h"
 #include "bootstruct.h"
 #include "fake_efi.h"
+#include "acpi_patcher.h"
 #include "sl.h"
 #include "libsa.h"
 #include "ramdisk.h"
@@ -62,7 +63,7 @@
 
 #include "modules.h"
 
-#define DEBUG 0
+#define DEBUG 1
 
 long gBootMode; /* defaults to 0 == kBootModeNormal */
 bool gOverrideKernel;
Index: branches/slice/i386/boot2/modules.c
===================================================================
--- branches/slice/i386/boot2/modules.c	(revision 710)
+++ branches/slice/i386/boot2/modules.c	(revision 711)
@@ -376,7 +376,7 @@
 	}
 	else
 	{
-		verbose("Invalid mach magic\n");
+		verbose("Invalid mach magic 0x%X\n", ((struct mach_header*)binary)->magic);
 		getc();
 		return NULL;
 	}
@@ -930,6 +930,15 @@
 				
 			case BIND_OPCODE_DO_BIND:
 				//DBG("BIND_OPCODE_DO_BIND\n");
+				if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER)
+				{
+					// HACK(ish)
+					// Internal symbol, don't bind
+				}
+				else
+				{
+					//printf("Binding symbol %s, libraryOrdinal = %d, symboFlags = %d, type = %d\n", symbolName, libraryOrdinal, symboFlags, type);
+					
 				if(symbolAddr != 0xFFFFFFFF)
 				{
 					address = segmentAddress + (UInt32)base;
@@ -941,6 +950,7 @@
 					verbose("Unable to bind symbol %s, libraryOrdinal = %d, symboFlags = %d, type = %d\n", symbolName, libraryOrdinal, symboFlags, type);
 					getc();
 				}
+				}
 				
 				segmentAddress += sizeof(void*);
 				break;
@@ -960,7 +970,12 @@
 				while(bind_stream[i] & 0x80);
 				
 				
-				
+				if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER)
+				{
+					// Internal symbol, don't bind
+				}
+				else
+				{
 				if(symbolAddr != 0xFFFFFFFF)
 				{
 					address = segmentAddress + (UInt32)base;
@@ -972,6 +987,7 @@
 					verbose("Unable to bind symbol %s\n", symbolName);
 					getc();
 				}
+				}
 				segmentAddress += tmp + sizeof(void*);
 
 				
@@ -979,7 +995,12 @@
 				
 			case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
 				//DBG("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED\n");
-				
+				if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER)
+				{
+					// Internal symbol, don't bind
+				}
+				else
+				{
 				if(symbolAddr != 0xFFFFFFFF)
 				{
 					address = segmentAddress + (UInt32)base;
@@ -991,6 +1012,7 @@
 					verbose("Unable to bind symbol %s\n", symbolName);
 					getc();
 				}
+				}
 				segmentAddress += (immediate * sizeof(void*)) + sizeof(void*);
 
 				
@@ -1027,17 +1049,30 @@
 					{
 						
 						address = segmentAddress + (UInt32)base;
+						if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER)
+						{
+							// Internal symbol, don't bind
+						}
+						else
+						{
 
 						bind_location((UInt32*)address, (char*)symbolAddr, addend, BIND_TYPE_POINTER);
-						
+						}						
 						segmentAddress += tmp2 + sizeof(void*);
 					}
 				}
 				else
 				{
+					if(libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP && type == BIND_TYPE_POINTER)
+					{
+						// Internal symbol, don't bind
+					}
+					else
+					{						
 					printf("Unable to bind symbol %s\n", symbolName);
 					getc();
 				}
+				}
 				
 				
 				break;
@@ -1175,17 +1210,6 @@
 unsigned int lookup_all_symbols(const char* name)
 {
 	unsigned int addr = 0xFFFFFFFF;
-	if(lookup_symbol && (UInt32)lookup_symbol != 0xFFFFFFFF)
-	{
-		addr = lookup_symbol(name);
-		if(addr != 0xFFFFFFFF)
-		{
-			//DBG("Internal symbol %s located at 0x%X\n", name, addr);
-			return addr;
-		}
-	}
-
-	
 	symbolList_t* entry = moduleSymbols;
 	while(entry)
 	{
@@ -1200,6 +1224,18 @@
 		}
 
 	}
+	
+	if(lookup_symbol && (UInt32)lookup_symbol != 0xFFFFFFFF)
+	{
+		addr = lookup_symbol(name);
+		if(addr != 0xFFFFFFFF)
+		{
+			//DBG("Internal symbol %s located at 0x%X\n", name, addr);
+			return addr;
+		}
+	}
+	
+
 #if DEBUG_MODULES
 		verbose("Unable to locate symbol %s\n", name);
 		getc();
Index: branches/slice/i386/boot2/modules.h
===================================================================
--- branches/slice/i386/boot2/modules.h	(revision 710)
+++ branches/slice/i386/boot2/modules.h	(revision 711)
@@ -18,7 +18,6 @@
 
 #define SYMBOLS_MODULE "Symbols.dylib"
 
-//#define SYMBOL_DYLD_STUB_BINDER	"dyld_stub_binder"
 #define SYMBOL_LOOKUP_SYMBOL	"_lookup_symbol"
 #define STUB_ENTRY_SIZE	6
 
Index: branches/slice/i386/boot2/Makefile
===================================================================
--- branches/slice/i386/boot2/Makefile	(revision 710)
+++ branches/slice/i386/boot2/Makefile	(revision 711)
@@ -40,9 +40,10 @@
 # The ordering is important;
 # boot2.o must be first.
 OBJS = boot2.o boot.o graphics.o drivers.o prompt.o options.o lzss.o mboot.o \
-	ramdisk.o resume.o bmdecompress.o modules.o
-# button.o browser.o scrollbar.o == NOTYET	
+		    ramdisk.o resume.o bmdecompress.o modules.o modules_support.o
 
+#OBJS = boot2.o boot.o modules.o modules_support.o	
+
 UTILDIR = ../util
 SFILES = boot2.s
 CFILES = boot.c graphics.c drivers.c prompt.c options.c mboot.c
@@ -60,9 +61,9 @@
 #
 SYMBOLS_MODULE = Symbols.dylib
 SYMBOL_START= _symbols_module_start
-SYMBOL_ADDR = $(shell printf "%d" 0x`nm -s __DATA __data $(SYMROOT)/boot_embeded.sys | grep " $(SYMBOL_START)$$" | cut -f 1 -d " "`)
-DATA_OFFSET = $(shell otool -l $(SYMROOT)/boot_embeded.sys | grep __data -A 4  | grep __DATA -A 3 | tail -n 1 | cut -f 6 -d " ")
-DATA_ADDR   = $(shell printf "%d" `otool -l $(SYMROOT)/boot_embeded.sys | grep __data -A 4  | grep __DATA -A 3 | head -n 2 | tail -n 1 | cut -f 8 -d " "`)
+SYMBOL_ADDR = $(shell printf "%d" 0x`nm -s __DATA __data $(SYMROOT)/boot.sys | grep " $(SYMBOL_START)$$" | cut -f 1 -d " "`)
+DATA_OFFSET = $(shell otool -l $(SYMROOT)/boot.sys | grep __data -A 4  | grep __DATA -A 3 | tail -n 1 | cut -f 6 -d " ")
+DATA_ADDR   = $(shell printf "%d" `otool -l $(SYMROOT)/boot.sys | grep __data -A 4  | grep __DATA -A 3 | head -n 2 | tail -n 1 | cut -f 8 -d " "`)
 PATCH_ADDR  = $(shell echo ${SYMBOL_ADDR}-${DATA_ADDR}+${DATA_OFFSET} | bc)
 
 
@@ -75,28 +76,35 @@
 	@$(LD)   -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
 		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) -lcc_kext
+
+	@cp  $(SYMROOT)/boot.sys  $(SYMROOT)/boot2.sys
+
 	@make Symbols.dylib
+	@${RM} $(SYMROOT)/boot.sys
 
-	@echo "\t[LD] boot_embeded.sys"
+	@echo "\t[LD] boot.sys"
 	@$(LD) -static -Wl,-preload -Wl,-segaddr,__INIT,$(BOOT2ADDR) \
 	        -nostdlib -arch i386 -Wl,-segalign,20 \
 		-Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \
-		-o $(SYMROOT)/boot_embeded.sys $(filter %.o,$^) $(LIBS) -lcc_kext
+		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS)  -lcc_kext
 
-#	@ld -arch i386 \
-#	-undefined dynamic_lookup \
-#	-dylib -read_only_relocs suppress \
-#	-S -x -Z -dead_strip_dylibs \
-#	-no_uuid \
-#	-final_output Symbols.dylib \
-#	$(filter %.o,$^) $(LIBS) \
-#	-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
 
 
+	@ld -arch i386 \
+	-undefined dynamic_lookup \
+	-dylib -read_only_relocs suppress \
+	-S -x -Z -dead_strip_dylibs \
+	-no_uuid \
+	-final_output Symbols \
+	$(filter %.o,$^) $(LIBS) \
+	-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
 
+
+
 	@make embed_symbols		# this is done in a sub process after boot.sys exists so the strings are populated correctly
+	@${RM} $(SYMROOT)/boot2.sys
 
-	@##${RM} $(SYMROOT)/${SYMBOLS_MODULE}
+	@${RM} $(SYMROOT)/${SYMBOLS_MODULE}
 
 	@##size $(SYMROOT)/boot.sys
 	@ls -l $(SYMROOT)/boot
@@ -111,12 +119,12 @@
 embed_symbols: machOconv
 	@echo ================= Embedding Symbols.dylib =================
 	@echo "\t[MACHOCONV] boot"
-	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot &> /dev/null
+	@$(SYMROOT)/machOconv $(SYMROOT)/boot2.sys $(SYMROOT)/boot &> /dev/null
 
 	@echo ******* Patching at $(PATCH_ADDR) ******
-	@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot_embeded.sys bs=1 count=4 seek=$(PATCH_ADDR)	 &> /dev/null
-	@echo "\t[MACHOCONV] boot_embeded"
-	@$(SYMROOT)/machOconv $(SYMROOT)/boot_embeded.sys $(SYMROOT)/boot_embeded
+	@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot.sys bs=1 count=4 seek=$(PATCH_ADDR)	 &> /dev/null
+	@echo "\t[MACHOCONV] boot"
+	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
 
 prompt.o: vers.h
@@ -124,7 +132,6 @@
 	@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/vers.h
 	@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $(SYMROOT)/vers.h
 	@echo "#define I386BOOT_CHAMELEONVERSION \"`cat ../../version`\"" >> $(SYMROOT)/vers.h
-#	@echo "#define I386BOOT_CHAMELEONREVISION \"`cat ../../revision`\"" >> $(SYMROOT)/vers.h
 	@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $(SYMROOT)/vers.h
 
 embedded.h:
Index: branches/slice/i386/modules/NVRAM/NVRAM.c
===================================================================
--- branches/slice/i386/modules/NVRAM/NVRAM.c	(revision 710)
+++ branches/slice/i386/modules/NVRAM/NVRAM.c	(revision 711)
@@ -84,7 +84,7 @@
 	uint16_t	bootOptionNumber = 0;
 	int i, j;
 	
-	BLESS_EFI_LOAD_OPTION* NextBoot =(BLESS_EFI_LOAD_OPTION*)gBootOrder;
+//	BLESS_EFI_LOAD_OPTION* NextBoot =(BLESS_EFI_LOAD_OPTION*)gBootOrder;
 	
 	DBG("NVRAM started with ModulesLoaded\n");
 	
@@ -93,7 +93,7 @@
 //	bool UseNVRAM = FALSE;
 	bool ClearNVRAM = FALSE;
 	const char* buff;
-	TagPtr	dictionary;
+//	TagPtr	dictionary;
 	int cnt;
 	var = malloc(sizeof(variables)+1);
 	ClearNVRAM = getValueForKey(kClearNVRAM, &buff, &cnt, &bootInfo->bootConfig);
@@ -115,7 +115,7 @@
 		}
 	}
 	
-	Node* optionsNode = DT__FindNode("/fakenvram", true);
+	Node* optionsNode = DT__FindNode("/options", true);  //"/fakenvram"
 	ffName = malloc(sizeof(PLATFORM_UUID)+1);
 	strcpy(ffName, PLATFORM_UUID);
 	ret = getSystemID();
Index: branches/slice/i386/modules/GUI/gui.c
===================================================================
--- branches/slice/i386/modules/GUI/gui.c	(revision 710)
+++ branches/slice/i386/modules/GUI/gui.c	(revision 711)
@@ -1883,7 +1883,7 @@
 	if (usePngImage && bootImageData == NULL) {
 		loadBootGraphics();
 	}
-	
+//Slice - attention!	
 	// parse screen size parameters
 	if(is_module_loaded("Resolution.dylib"))
 	{
Index: branches/slice/i386/modules/MakeInc.dir
===================================================================
--- branches/slice/i386/modules/MakeInc.dir	(revision 710)
+++ branches/slice/i386/modules/MakeInc.dir	(revision 711)
@@ -27,7 +27,6 @@
 	@if [ -f "$(SYMROOT)/uClibc++.dylib" ]; then if [ x"$(shell nm $(OBJROOT)/*.o 2>/dev/null  | grep " __Z")" == x"" ]; then mv $(SYMROOT)/uClibc++.dylib $(SYMROOT)/../uClibc++.dylib; fi; fi;
 	
 	@ld -arch i386 \
-	-undefined dynamic_lookup \
 	-alias $(MODULE_START) start \
 	-dylib -read_only_relocs suppress \
 	-S -x -Z -dead_strip_dylibs \
@@ -36,13 +35,13 @@
 	-final_output $(MODULE_NAME) \
 	-L$(OBJROOT)/ \
 	-L$(OBJROOT)/../ \
-	-L$(OBJROOT)/../*/ \
 	-L$(SYMROOT)/ \
 	$(OBJROOT)/*.o \
+	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
 	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 	
-#	@cp -rf include/* ../module_includes/ &> /dev/null || true
+	@cp -rf include/* ../module_includes/ &> /dev/null || true
 	
 	@if [ -f "$(SYMROOT)/../uClibc++.dylib" ]; then if [ x"$(shell nm $(OBJROOT)/*.o 2>/dev/null | grep " __Z")" == x"" ]; then mv $(SYMROOT)/../uClibc++.dylib $(SYMROOT)/uClibc++.dylib; fi; fi;
 
@@ -53,7 +52,6 @@
 	@rm -rf $(SYMROOT)/$(MODULE_NAME).dylib	#ensure module doesn't link with old version of self
 	@echo "\t[LD] $(MODULE_NAME).dylib"
 	@ld -arch i386 \
-	-undefined dynamic_lookup \
 	-alias $(MODULE_START) start \
 	-dylib -read_only_relocs suppress \
 	-S -x -Z -dead_strip_dylibs \
@@ -62,19 +60,21 @@
 	-final_output $(MODULE_NAME) \
 	-L$(OBJROOT)/ \
 	-L$(OBJROOT)/../ \
-	-L$(OBJROOT)/../*/ \
 	-L$(SYMROOT)/ \
 	$(OBJROOT)/*.o \
+	-weak_library $(OBJROOT)/../../boot2/Symbols_LINKER_ONLY.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
+
+	@cp -rf include/* ../module_includes/ &> /dev/null || true
 endif
 
 %.o: %.c
 	@echo "\t[CC] $<"
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
 
 %.o: %.cpp
 	@echo "\t[CPP] $<"
-	@$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
+	@$(CPP) $(CPPFLAGS) $(CFLAGS) -I../include/ -Iinclude/ -I../module_includes/ -D__KLIBC__ $(DEFINES) -c "$<" $(INC) -o "$(OBJROOT)/$@"
 
 
 
Index: branches/slice/i386/modules/Resolution/Resolution.c
===================================================================
--- branches/slice/i386/modules/Resolution/Resolution.c	(revision 710)
+++ branches/slice/i386/modules/Resolution/Resolution.c	(revision 711)
@@ -9,7 +9,6 @@
 
 void Resolution_start()
 {
-	//verbose("Resolution_start\n");
-	patchVideoBios();
+	//patchVideoBios();
 }
 
Index: branches/slice/i386/modules/Memory/mem.c
===================================================================
--- branches/slice/i386/modules/Memory/mem.c	(revision 710)
+++ branches/slice/i386/modules/Memory/mem.c	(revision 711)
@@ -7,7 +7,7 @@
 #include "libsaio.h"
 #include "pci.h"
 #include "platform.h"
-#include "cpu.h"
+//#include "cpu.h"
 #include "mem.h"
 #include "smbios_patcher.h"
 
Index: branches/slice/i386/modules/Makefile
===================================================================
--- branches/slice/i386/modules/Makefile	(revision 710)
+++ branches/slice/i386/modules/Makefile	(revision 711)
@@ -26,8 +26,8 @@
 VPATH = $(OBJROOT):$(SYMROOT)
 
 # The order of building is important.
-SUBDIRS = klibc uClibc++ Resolution KernelPatcher GUI KextPatcher GraphicsEnabler HPET USBFix Memory Networking NetbookInstaller ACPIPatcher NVRAM ATI5000Enabler HelloWorld 
-#SUBDIRS = HelloWorld
+SUBDIRS = klibc uClibc++ Resolution KernelPatcher GUI KextPatcher GraphicsEnabler HPET USBFix Memory Networking NetbookInstaller NVRAM ATI5000Enabler HelloWorld 
+#SUBDIRS = HelloWorld ACPIPatcher
 
 all embedtheme optionrom tags debug install installhdrs: objroot_dirs lazydylib1.o
 	@for i in ${SUBDIRS}; \
Index: branches/slice/revision
===================================================================
--- branches/slice/revision	(revision 710)
+++ branches/slice/revision	(revision 711)
@@ -1 +1 @@
-676:696
\ No newline at end of file
+676:708
\ No newline at end of file
Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser
===================================================================
--- branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser	(revision 710)
+++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.pbxuser	(revision 711)
@@ -90,8 +90,8 @@
 					PBXSymbolsDataSource_ReferenceNameID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 317053851;
-			PBXWorkspaceStateSaveDate = 317053851;
+			PBXPerProjectTemplateStateSaveDate = 317571794;
+			PBXWorkspaceStateSaveDate = 317571794;
 		};
 		perUserProjectItems = {
 			120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */ = 120DFB1712BA3A4D00C7EAC8 /* PBXTextBookmark */;
@@ -100,21 +100,27 @@
 			12121ED112B261EA00207E55 /* PBXTextBookmark */ = 12121ED112B261EA00207E55 /* PBXTextBookmark */;
 			1216139E12B65BB50019961E /* PBXTextBookmark */ = 1216139E12B65BB50019961E /* PBXTextBookmark */;
 			121613FF12B65D970019961E /* PBXTextBookmark */ = 121613FF12B65D970019961E /* PBXTextBookmark */;
+			1217945312EDC35E00F271E6 /* PBXTextBookmark */ = 1217945312EDC35E00F271E6 /* PBXTextBookmark */;
+			1217945912EDC36400F271E6 /* PBXTextBookmark */ = 1217945912EDC36400F271E6 /* PBXTextBookmark */;
+			1217945A12EDC36400F271E6 /* PBXTextBookmark */ = 1217945A12EDC36400F271E6 /* PBXTextBookmark */;
+			1217945C12EDC36400F271E6 /* PBXTextBookmark */ = 1217945C12EDC36400F271E6 /* PBXTextBookmark */;
 			1223EF9012E5D63A0019EC66 /* PBXTextBookmark */ = 1223EF9012E5D63A0019EC66 /* PBXTextBookmark */;
-			12251A0412CE29EF00273689 /* PBXTextBookmark */ = 12251A0412CE29EF00273689 /* PBXTextBookmark */;
+			122A869712EC5429004312F4 /* PBXTextBookmark */ = 122A869712EC5429004312F4 /* PBXTextBookmark */;
+			122A869812EC5429004312F4 /* PBXTextBookmark */ = 122A869812EC5429004312F4 /* PBXTextBookmark */;
+			122A86C612ECA817004312F4 /* PBXTextBookmark */ = 122A86C612ECA817004312F4 /* PBXTextBookmark */;
 			124C493212B8D846005AA276 /* PBXTextBookmark */ = 124C493212B8D846005AA276 /* PBXTextBookmark */;
 			124C493712B8D846005AA276 /* PBXTextBookmark */ = 124C493712B8D846005AA276 /* PBXTextBookmark */;
 			124C494212B8E8C2005AA276 /* PBXTextBookmark */ = 124C494212B8E8C2005AA276 /* PBXTextBookmark */;
 			124C494312B8E8C2005AA276 /* PBXTextBookmark */ = 124C494312B8E8C2005AA276 /* PBXTextBookmark */;
 			124C494512B8E8C2005AA276 /* PBXTextBookmark */ = 124C494512B8E8C2005AA276 /* PBXTextBookmark */;
 			124C494B12B8EA5D005AA276 /* PBXTextBookmark */ = 124C494B12B8EA5D005AA276 /* PBXTextBookmark */;
-			1265C97612C7554E0050D02E /* PBXTextBookmark */ = 1265C97612C7554E0050D02E /* PBXTextBookmark */;
 			1265C97712C7554E0050D02E /* PBXTextBookmark */ = 1265C97712C7554E0050D02E /* PBXTextBookmark */;
 			1267813012B7B13E00A25CED /* PBXTextBookmark */ = 1267813012B7B13E00A25CED /* PBXTextBookmark */;
 			12679BA312BE822E00E3637F /* PBXTextBookmark */ = 12679BA312BE822E00E3637F /* PBXTextBookmark */;
-			12783A9B12E5D46B0095C1BA /* PBXTextBookmark */ = 12783A9B12E5D46B0095C1BA /* PBXTextBookmark */;
+			1271587812EA1C6400E3013B /* PBXTextBookmark */ = 1271587812EA1C6400E3013B /* PBXTextBookmark */;
+			12715CDF12EA253100E3013B /* PBXTextBookmark */ = 12715CDF12EA253100E3013B /* PBXTextBookmark */;
+			12715CE012EA253100E3013B /* PBXTextBookmark */ = 12715CE012EA253100E3013B /* PBXTextBookmark */;
 			1288318212C3608100EA4CB2 /* PBXTextBookmark */ = 1288318212C3608100EA4CB2 /* PBXTextBookmark */;
-			128A97B712C2336000600556 /* PBXTextBookmark */ = 128A97B712C2336000600556 /* PBXTextBookmark */;
 			128A97B812C2336000600556 /* PBXTextBookmark */ = 128A97B812C2336000600556 /* PBXTextBookmark */;
 			128A9AF412C233CE00600556 /* PBXTextBookmark */ = 128A9AF412C233CE00600556 /* PBXTextBookmark */;
 			1299A51F12B3C328007ED516 /* PBXTextBookmark */ = 1299A51F12B3C328007ED516 /* PBXTextBookmark */;
@@ -135,7 +141,6 @@
 			12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */ = 12BF14DA12B3CF8E00D798FE /* PBXTextBookmark */;
 			12C246F412C87C7C007E8339 /* PBXTextBookmark */ = 12C246F412C87C7C007E8339 /* PBXTextBookmark */;
 			12C2907612C8962900984F8F /* PBXTextBookmark */ = 12C2907612C8962900984F8F /* PBXTextBookmark */;
-			12C2B36812E5D8B600894A4E /* PBXTextBookmark */ = 12C2B36812E5D8B600894A4E /* PBXTextBookmark */;
 			12C5020712D8B82400EDCC4E /* PBXTextBookmark */ = 12C5020712D8B82400EDCC4E /* PBXTextBookmark */;
 			12C672F312C7C6BE0058B09B /* PBXTextBookmark */ = 12C672F312C7C6BE0058B09B /* PBXTextBookmark */;
 			12C672F512C7C6BE0058B09B /* PBXTextBookmark */ = 12C672F512C7C6BE0058B09B /* PBXTextBookmark */;
@@ -156,8 +161,10 @@
 			12D6232612BA5F380032F367 /* PBXTextBookmark */ = 12D6232612BA5F380032F367 /* PBXTextBookmark */;
 			12D64B9F12D8EA0A00A1FE07 /* PBXTextBookmark */ = 12D64B9F12D8EA0A00A1FE07 /* PBXTextBookmark */;
 			12D7EC0512C8C5EA0021414C /* PBXTextBookmark */ = 12D7EC0512C8C5EA0021414C /* PBXTextBookmark */;
+			12D7F69F12ECAF1C00AFD4DA /* PBXTextBookmark */ = 12D7F69F12ECAF1C00AFD4DA /* PBXTextBookmark */;
 			12DA422F12C52DAC009281B3 /* PBXTextBookmark */ = 12DA422F12C52DAC009281B3 /* PBXTextBookmark */;
 			12DCD38E12BBA5D600A20635 /* PBXTextBookmark */ = 12DCD38E12BBA5D600A20635 /* PBXTextBookmark */;
+			12E0FC2912ECDBD600F07BFF /* PBXTextBookmark */ = 12E0FC2912ECDBD600F07BFF /* PBXTextBookmark */;
 			12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = 12E17AE612B2BA9B00607D8E /* PBXTextBookmark */;
 			12E6FB5712BB458400C2A021 /* PBXTextBookmark */ = 12E6FB5712BB458400C2A021 /* PBXTextBookmark */;
 			12E8842612D8F833004C76C8 /* PBXTextBookmark */ = 12E8842612D8F833004C76C8 /* PBXTextBookmark */;
@@ -166,7 +173,6 @@
 			12EFE65A12B547A7002A1712 /* PBXTextBookmark */ = 12EFE65A12B547A7002A1712 /* PBXTextBookmark */;
 			12EFE95E12B549B6002A1712 /* PBXTextBookmark */ = 12EFE95E12B549B6002A1712 /* PBXTextBookmark */;
 			12F1147112C7A41D0064D7EE /* PBXTextBookmark */ = 12F1147112C7A41D0064D7EE /* PBXTextBookmark */;
-			12F4456612E5DC0800121851 /* PBXTextBookmark */ = 12F4456612E5DC0800121851 /* PBXTextBookmark */;
 			12F7FF0012BB9F3200949DEC /* PBXTextBookmark */ = 12F7FF0012BB9F3200949DEC /* PBXTextBookmark */;
 			12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */ = 12FC0E7512BB4B5200E9CFA8 /* PBXTextBookmark */;
 			12FC0E9412BB65A800E9CFA8 /* PBXTextBookmark */ = 12FC0E9412BB65A800E9CFA8 /* PBXTextBookmark */;
@@ -200,6 +206,18 @@
 		path = /Users/slice/Projects/fakesmc/Chameleon/RC5m/i386/libsaio/fake_efi.c;
 		sourceTree = "<absolute>";
 	};
+	120C1F1512ED82A000DC399E /* boot.c */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
+		name = boot.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/boot.c;
+		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {683, 9815}}";
+			sepNavSelRange = "{6259, 14}";
+			sepNavVisRange = "{6225, 365}";
+		};
+	};
 	120DB90712B9F3F1001FDAE1 /* boot.c */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
@@ -288,6 +306,62 @@
 		vrLen = 895;
 		vrLoc = 563;
 	};
+	1217945312EDC35E00F271E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1217945412EDC35E00F271E6 /* fake_efi.c */;
+		rLen = 26;
+		rLoc = 30011;
+		rType = 0;
+	};
+	1217945412EDC35E00F271E6 /* fake_efi.c */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
+		name = fake_efi.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/fake_efi.c;
+		sourceTree = "<absolute>";
+	};
+	1217945912EDC36400F271E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 120C1F1512ED82A000DC399E /* boot.c */;
+		name = "boot.c: 219";
+		rLen = 14;
+		rLoc = 6259;
+		rType = 0;
+		vrLen = 365;
+		vrLoc = 6225;
+	};
+	1217945A12EDC36400F271E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1217945B12EDC36400F271E6 /* ACPIPatcher.c */;
+		name = "ACPIPatcher.c: 7";
+		rLen = 1;
+		rLoc = 110;
+		rType = 0;
+		vrLen = 518;
+		vrLoc = 0;
+	};
+	1217945B12EDC36400F271E6 /* ACPIPatcher.c */ = {
+		isa = PBXFileReference;
+		name = ACPIPatcher.c;
+		path = /Users/slice/Desktop/ACPIPatcher/ACPIPatcher.c;
+		sourceTree = "<absolute>";
+	};
+	1217945C12EDC36400F271E6 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 1217945D12EDC36400F271E6 /* fake_efi.c */;
+		name = "fake_efi.c: 780";
+		rLen = 26;
+		rLoc = 30011;
+		rType = 0;
+		vrLen = 560;
+		vrLoc = 29817;
+	};
+	1217945D12EDC36400F271E6 /* fake_efi.c */ = {
+		isa = PBXFileReference;
+		name = fake_efi.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/fake_efi.c;
+		sourceTree = "<absolute>";
+	};
 	121E9E4112C6A6F9000B6ED3 /* gma.c */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
@@ -319,30 +393,71 @@
 		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/stringTable.c;
 		sourceTree = "<absolute>";
 	};
-	12251A0412CE29EF00273689 /* PBXTextBookmark */ = {
+	122A869012EC534F004312F4 /* ext2fs.c */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
+		name = ext2fs.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/ext2fs.c;
+		sourceTree = "<absolute>";
+	};
+	122A869712EC5429004312F4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 12436D8F12C9E14000F47D26 /* gui.c */;
-		name = "gui.c: 405";
+		fRef = 122A869012EC534F004312F4 /* ext2fs.c */;
+		name = "ext2fs.c: 12";
+		rLen = 4;
+		rLoc = 195;
+		rType = 0;
+		vrLen = 432;
+		vrLoc = 0;
+	};
+	122A869812EC5429004312F4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 122A869912EC5429004312F4 /* disk.h */;
+		name = "disk.h: 1";
 		rLen = 0;
-		rLoc = 11927;
+		rLoc = 0;
 		rType = 0;
-		vrLen = 505;
-		vrLoc = 11479;
+		vrLen = 294;
+		vrLoc = 0;
 	};
-	123C5F9112C8AB2C00DFC2D4 /* edid.h */ = {
+	122A869912EC5429004312F4 /* disk.h */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.h;
-		name = edid.h;
-		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/Resolution/edid.h;
+		name = disk.h;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/disk.h;
 		sourceTree = "<absolute>";
 	};
-	12436D8F12C9E14000F47D26 /* gui.c */ = {
+	122A869C12EC5429004312F4 /* disk.c */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
+		name = disk.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/disk.c;
+		sourceTree = "<absolute>";
+	};
+	122A86C612ECA817004312F4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 122A869C12EC5429004312F4 /* disk.c */;
+		name = "disk.c: 874";
+		rLen = 10;
+		rLoc = 25878;
+		rType = 0;
+		vrLen = 528;
+		vrLoc = 4718;
+	};
+	122A86CA12ECA817004312F4 /* gui.c */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
 		name = gui.c;
 		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/GUI/gui.c;
 		sourceTree = "<absolute>";
 	};
+	123C5F9112C8AB2C00DFC2D4 /* edid.h */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.h;
+		name = edid.h;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/Resolution/edid.h;
+		sourceTree = "<absolute>";
+	};
 	124C492812B8C915005AA276 /* Memory.c */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
@@ -445,16 +560,6 @@
 		vrLen = 554;
 		vrLoc = 5486;
 	};
-	1265C97612C7554E0050D02E /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 121E9E4112C6A6F9000B6ED3 /* gma.c */;
-		name = "gma.c: 21";
-		rLen = 0;
-		rLoc = 423;
-		rType = 0;
-		vrLen = 1355;
-		vrLoc = 348;
-	};
 	1265C97712C7554E0050D02E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 1265C97812C7554E0050D02E /* basic_definitions */;
@@ -499,29 +604,42 @@
 		vrLen = 894;
 		vrLoc = 14871;
 	};
-	12783A8D12E5D3620095C1BA /* boot.c */ = {
+	1271587812EA1C6400E3013B /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 12F4456712E5DC0800121851 /* NVRAM.c */;
+		name = "NVRAM.c: 111";
+		rLen = 0;
+		rLoc = 2986;
+		rType = 0;
+		vrLen = 745;
+		vrLoc = 2442;
+	};
+	1271587B12EA1C6400E3013B /* ntfs.c */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.c.c;
-		name = boot.c;
-		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/boot.c;
+		name = ntfs.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/libsaio/ntfs.c;
 		sourceTree = "<absolute>";
 	};
-	12783A9B12E5D46B0095C1BA /* PBXTextBookmark */ = {
+	12715CDF12EA253100E3013B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 12783A8D12E5D3620095C1BA /* boot.c */;
-		name = "boot.c: 373";
-		rLen = 14;
-		rLoc = 10989;
+		fRef = 1271587B12EA1C6400E3013B /* ntfs.c */;
+		name = "ntfs.c: 70";
+		rLen = 10;
+		rLoc = 2053;
 		rType = 0;
-		vrLen = 879;
-		vrLoc = 10251;
+		vrLen = 835;
+		vrLoc = 1675;
 	};
-	1279BD7512BF4D8700612F62 /* ACPIPatcher.c */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = ACPIPatcher.c;
-		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/ACPIPatcher/ACPIPatcher.c;
-		sourceTree = "<absolute>";
+	12715CE012EA253100E3013B /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 121E9E4112C6A6F9000B6ED3 /* gma.c */;
+		name = "gma.c: 130";
+		rLen = 9;
+		rLoc = 4027;
+		rType = 0;
+		vrLen = 1331;
+		vrLoc = 3531;
 	};
 	1288318212C3608100EA4CB2 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
@@ -533,16 +651,6 @@
 		vrLen = 858;
 		vrLoc = 0;
 	};
-	128A97B712C2336000600556 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 1279BD7512BF4D8700612F62 /* ACPIPatcher.c */;
-		name = "ACPIPatcher.c: 61";
-		rLen = 8;
-		rLoc = 1715;
-		rType = 0;
-		vrLen = 561;
-		vrLoc = 1350;
-	};
 	128A97B812C2336000600556 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 08FB7796FE84155DC02AAC07 /* main.c */;
@@ -952,23 +1060,6 @@
 		vrLen = 784;
 		vrLoc = 20063;
 	};
-	12C2B36812E5D8B600894A4E /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 12C2B36912E5D8B600894A4E /* NVRAM.c */;
-		name = "NVRAM.c: 284";
-		rLen = 0;
-		rLoc = 7929;
-		rType = 0;
-		vrLen = 466;
-		vrLoc = 7692;
-	};
-	12C2B36912E5D8B600894A4E /* NVRAM.c */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.c;
-		name = NVRAM.c;
-		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/NVRAM/NVRAM.c;
-		sourceTree = "<absolute>";
-	};
 	12C5020712D8B82400EDCC4E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 12D52EA712D7377E00A23AEF /* resume.c */;
@@ -1283,6 +1374,23 @@
 		vrLen = 691;
 		vrLoc = 4662;
 	};
+	12D7F69412ECAF1900AFD4DA /* options.c */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
+		name = options.c;
+		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/boot2/options.c;
+		sourceTree = "<absolute>";
+	};
+	12D7F69F12ECAF1C00AFD4DA /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 122A86CA12ECA817004312F4 /* gui.c */;
+		name = "gui.c: 1955";
+		rLen = 12;
+		rLoc = 53018;
+		rType = 0;
+		vrLen = 625;
+		vrLoc = 52735;
+	};
 	12D928BE12C7C8EB00269820 /* Makefile */ = {
 		isa = PBXFileReference;
 		lastKnownFileType = sourcecode.make;
@@ -1324,6 +1432,16 @@
 		vrLen = 1189;
 		vrLoc = 0;
 	};
+	12E0FC2912ECDBD600F07BFF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 12D7F69412ECAF1900AFD4DA /* options.c */;
+		name = "options.c: 1001";
+		rLen = 8;
+		rLoc = 24766;
+		rType = 0;
+		vrLen = 797;
+		vrLoc = 24411;
+	};
 	12E17AE612B2BA9B00607D8E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 12B90A5712B2AE1300FE287A /* 915resolution.h */;
@@ -1460,18 +1578,9 @@
 		vrLen = 991;
 		vrLoc = 0;
 	};
-	12F4456612E5DC0800121851 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 12F4456712E5DC0800121851 /* NVRAM.c */;
-		name = "NVRAM.c: 111";
-		rLen = 0;
-		rLoc = 2986;
-		rType = 0;
-		vrLen = 799;
-		vrLoc = 2442;
-	};
 	12F4456712E5DC0800121851 /* NVRAM.c */ = {
 		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.c;
 		name = NVRAM.c;
 		path = /Users/slice/Projects/Chameleons/chameleon/branches/slice/i386/modules/NVRAM/NVRAM.c;
 		sourceTree = "<absolute>";
Index: branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3
===================================================================
--- branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3	(revision 710)
+++ branches/slice/ChamMek/ChamMek.xcodeproj/slice.mode1v3	(revision 711)
@@ -274,6 +274,9 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+									<integer>17</integer>
+									<integer>2</integer>
+									<integer>1</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -299,7 +302,7 @@
 							<real>164</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>370 183 952 695 0 0 1440 878 </string>
+						<string>272 183 952 695 0 0 1440 878 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -317,7 +320,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>NVRAM.c</string>
+								<string>fake_efi.c</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -325,11 +328,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>NVRAM.c</string>
+										<string>fake_efi.c</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>12F4456612E5DC0800121851</string>
+										<string>1217945C12EDC36400F271E6</string>
 										<key>history</key>
 										<array>
 											<string>12121ED112B261EA00207E55</string>
@@ -381,7 +384,6 @@
 											<string>12F7FF0012BB9F3200949DEC</string>
 											<string>12DCD38E12BBA5D600A20635</string>
 											<string>12679BA312BE822E00E3637F</string>
-											<string>128A97B712C2336000600556</string>
 											<string>128A97B812C2336000600556</string>
 											<string>128A9AF412C233CE00600556</string>
 											<string>1288318212C3608100EA4CB2</string>
@@ -392,7 +394,6 @@
 											<string>12D3329E12C669090093EEDB</string>
 											<string>12D332A512C669090093EEDB</string>
 											<string>12D332AA12C669090093EEDB</string>
-											<string>1265C97612C7554E0050D02E</string>
 											<string>1265C97712C7554E0050D02E</string>
 											<string>12F1147112C7A41D0064D7EE</string>
 											<string>12C672F312C7C6BE0058B09B</string>
@@ -404,13 +405,21 @@
 											<string>12C246F412C87C7C007E8339</string>
 											<string>12C2907612C8962900984F8F</string>
 											<string>12D7EC0512C8C5EA0021414C</string>
-											<string>12251A0412CE29EF00273689</string>
 											<string>12C5020712D8B82400EDCC4E</string>
 											<string>12D64B9F12D8EA0A00A1FE07</string>
 											<string>12E8842612D8F833004C76C8</string>
-											<string>12783A9B12E5D46B0095C1BA</string>
 											<string>1223EF9012E5D63A0019EC66</string>
-											<string>12C2B36812E5D8B600894A4E</string>
+											<string>1271587812EA1C6400E3013B</string>
+											<string>12715CDF12EA253100E3013B</string>
+											<string>12715CE012EA253100E3013B</string>
+											<string>122A869712EC5429004312F4</string>
+											<string>122A869812EC5429004312F4</string>
+											<string>122A86C612ECA817004312F4</string>
+											<string>12D7F69F12ECAF1C00AFD4DA</string>
+											<string>12E0FC2912ECDBD600F07BFF</string>
+											<string>1217945912EDC36400F271E6</string>
+											<string>1217945A12EDC36400F271E6</string>
+											<string>1217945312EDC35E00F271E6</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -422,14 +431,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {744, 372}}</string>
+								<string>{{0, 0}, {744, 267}}</string>
 								<key>RubberWindowFrame</key>
-								<string>370 183 952 695 0 0 1440 878 </string>
+								<string>272 183 952 695 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>372pt</string>
+							<string>267pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -442,14 +451,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 377}, {744, 277}}</string>
+								<string>{{0, 272}, {744, 382}}</string>
 								<key>RubberWindowFrame</key>
-								<string>370 183 952 695 0 0 1440 878 </string>
+								<string>272 183 952 695 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>277pt</string>
+							<string>382pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -468,9 +477,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>12F4456812E5DC0800121851</string>
+				<string>1217944E12EDC2DF00F271E6</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>12F4456912E5DC0800121851</string>
+				<string>1217944F12EDC2DF00F271E6</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -608,11 +617,12 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>1C530D57069F1CE1000CFCEE</string>
 		<string>12C26D3512B0DDFC00AF7F4B</string>
 		<string>/Users/slice/Projects/Chameleons/chameleon/branches/slice/ChamMek/ChamMek.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>370 183 952 695 0 0 1440 878 </string>
+	<string>272 183 952 695 0 0 1440 878 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -689,7 +699,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>12C26D3512B0DDFC00AF7F4B</string>
-				<string>12F4456A12E5DC0800121851</string>
+				<string>1217945012EDC2DF00F271E6</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -811,13 +821,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>1278362312E5D3540095C1BA</string>
+				<string>120C1F1612ED82A000DC399E</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>1278362412E5D3540095C1BA</string>
-				<string>1278362512E5D3540095C1BA</string>
-				<string>1278362612E5D3540095C1BA</string>
-				<string>1278362712E5D3540095C1BA</string>
-				<string>1278362812E5D3540095C1BA</string>
+				<string>120C1F1712ED82A000DC399E</string>
+				<string>120C1F1812ED82A000DC399E</string>
+				<string>120C1F1912ED82A000DC399E</string>
+				<string>120C1F1A12ED82A000DC399E</string>
+				<string>120C1F1B12ED82A000DC399E</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -844,12 +854,14 @@
 							<key>Dock</key>
 							<array>
 								<dict>
+									<key>BecomeActive</key>
+									<true/>
 									<key>ContentConfiguration</key>
 									<dict>
 										<key>PBXProjectModuleGUID</key>
 										<string>1CDD528C0622207200134675</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>stringTable.c</string>
+										<string>fake_efi.c</string>
 										<key>StatusBarVisibility</key>
 										<true/>
 									</dict>
@@ -858,7 +870,7 @@
 										<key>Frame</key>
 										<string>{{0, 0}, {1109, 510}}</string>
 										<key>RubberWindowFrame</key>
-										<string>117 62 1109 816 0 0 1440 878 </string>
+										<string>203 62 1109 816 0 0 1440 878 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXNavigatorGroup</string>
@@ -870,8 +882,6 @@
 							<string>510pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -884,7 +894,7 @@
 								<key>Frame</key>
 								<string>{{0, 515}, {1109, 260}}</string>
 								<key>RubberWindowFrame</key>
-								<string>117 62 1109 816 0 0 1440 878 </string>
+								<string>203 62 1109 816 0 0 1440 878 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXProjectFindModule</string>
@@ -907,13 +917,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>1223EF8E12E5D6370019EC66</string>
-				<string>1223EF8F12E5D6370019EC66</string>
+				<string>1217945712EDC35E00F271E6</string>
+				<string>1217945812EDC35E00F271E6</string>
 				<string>1CDD528C0622207200134675</string>
 				<string>1CD0528E0623707200166675</string>
 			</array>
 			<key>WindowString</key>
-			<string>117 62 1109 816 0 0 1440 878 </string>
+			<string>203 62 1109 816 0 0 1440 878 </string>
 			<key>WindowToolGUID</key>
 			<string>1C530D57069F1CE1000CFCEE</string>
 			<key>WindowToolIsVisible</key>