diff --git a/Makefile.wii b/Makefile.wii
index 8985ff1..6e11dd7 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -33,7 +33,7 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support
 	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
 	src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \
 	src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \
-	src/enforcer.c src/ar.c src/debug.c src/cpuemu_6.c \
+	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
 # Library object files.
@@ -115,14 +115,13 @@ $(BIN_DIR)/%.dol: %.elf
 	@echo ----
 
 # Compilation flags.
-COMMON_FLAGS	:= -g -O3 -G8 -mrvl -Wall -D__inline__=__inline__ $(MACHDEP)
+COMMON_FLAGS	:= -g -O2 -mrvl -Wall $(MACHDEP)
 INCLUDES	:=  -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
-DEFINES		:=  -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DFPUEMU -DAGA \
-				-DAUTOCONFIG
+DEFINES		:= -DFPUEMU -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 -DAGA \
+		   -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DSAVESTATE \
+		   -DOS_WITHOUT_MEMORY_MANAGEMENT
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
-#unused defines; -DFDI2RAW 
-
 # Test link flags.
 LDFLAGS			:= $(COMMON_FLAGS) -L$(LIB_DIR) -L$(DEVKITPRO)/libogc/lib/wii -lz -lSDL_ttf -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm -lwiikeyboard
 
diff --git a/uaerc.wii b/uaerc.wii
index 9172a67..24a6e20 100644
--- a/uaerc.wii
+++ b/uaerc.wii
@@ -1,44 +1,38 @@
 kickstart_rom_file=/uae/roms/kick.rom
-#kickstart_ext_rom_file=
-floppy0=/uae/floppies/
+floppy0=/uae/floppies/budbrain.adz
 
 # Alters CPU speed (values are; real, max. CPU to Chipset; 1 through 20)
-# Current setting of 3 = 17% CHIPSET and 83% CPU
-cpu_speed=3
-# CPU Type (values are; 68000, 68020, 68020/68881 and 68040)
-cpu_type=68000
-
+cpu_speed=5
+# CPU Type (values are; 68000, 68010, 68020 etc etc)
+cpu_type=68020
 #No need to explain
+cpu_compatible=false
 cpu_24bit_addressing=false
-#Immediate blits helps with speed
-immediate_blits=true
 collision_level=playfields
 
-# Chipset type (values are; ocs, ecs_agnus, ecs, aga)
-chipset=ecs_agnus
+# Chipset type (values are; OCS, ECS AGNUS, ECS DENISE, FULL ECS, AGA)
+chipset=aga
+#Immediate blits helps with speed
+immediate_blits=true
 
+# Mem values (0 = 0MB, 1 = 512KB, 2 = 1024MB etc etc)
+chipmem_size=4
+fastmem_size=4
 
-# Chip Memory (Values are; 0 = 0MB, 1 = 512KB, 2 = 1MB, 3 = 1.5MB and 4 = 2MB)
-chipmem_size=2
-# Fast Memory (Values are; 0 = 0MB, 4 = 2MB and 8 = 8MB)
-fastmem_size=0
-# Accellerator Memory (Values are; 1MB, 2MB, 4MB, 8MB, 16MB and 32MB)
-z3mem_size=0
-
-# Floppy speed, can cause incompatbility with certain floppy loaders
-# (Values are; 0 = Turbo, 100 = Standard and 800 = 800% faster)
+# Floppy speed, can cause incompatbility if set too high.
+# E.g., 800 is much faster though
 floppy_speed=100
 
+
+gfx_width=640
+gfx_height=480
 gfx_center_horizontal=true
 gfx_center_vertical=true
 gfx_vsync=false
-gfx_correct_aspect=false
+gfx_correct_aspect=true
 gfx_framerate=2
 show_leds=true
 
-sound_frequency=32000
-sound_latency=200
-
 
 sdl.map_raw_keys=true
 input.config=1