diff --git a/Makefile b/Makefile
index cac7fcfd3..9a78003c2 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ default: app.elf
 endif
 run: app_run
 
+.PHONY: info
 info:
 	@echo "========= BUILD SETTINGS ======"
 	@echo "DEBUG = $(DEBUG)"
@@ -50,7 +51,6 @@ info:
 	@echo "==============================="
 
 ifeq ($(USE_LIBA),0)
-#LDFLAGS += -lc -lc++ -lcrt1.o
 else
 SFLAGS += -ffreestanding -nostdinc -nostdlib
 include liba/Makefile
diff --git a/Makefile.simulator b/Makefile.simulator
index 222834079..c1d186892 100644
--- a/Makefile.simulator
+++ b/Makefile.simulator
@@ -1,6 +1,6 @@
-CC=gcc
-CXX=g++
-LD=g++
+CC=clang
+CXX=clang++
+LD=clang++
 SIZE=size
 
 USE_LIBA=0
diff --git a/ion/src/simulator/Makefile b/ion/src/simulator/Makefile
index a96203c0c..3fb5fdb65 100644
--- a/ion/src/simulator/Makefile
+++ b/ion/src/simulator/Makefile
@@ -3,7 +3,11 @@ objs += $(addprefix ion/src/simulator/boot/, main.o)
 objs += $(addprefix ion/src/simulator/display/, fltklcd.o)
 objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
 
-#SFLAGS += -I/usr/local/Cellar/fltk/1.3.3/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_THREAD_SAFE -D_REENTRANT
 SFLAGS += `fltk-config --cflags`
-#LDFLAGS += -L/usr/local/Cellar/fltk/1.3.3/lib -lfltk -lpthread -framework Cocoa
 LDFLAGS += `fltk-config --ldflags`
+
+.PHONY: %_memory_map
+%_memory_map:
+	@echo "========== MEMORY MAP ========="
+	@echo "No memory map on simulator."
+	@echo "==============================="