diff --git a/Makefile b/Makefile
index e9d3eba..b5079ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 # Makefile for the Non-DAW.
 # Copyright 2008 Jonathan Moore Liles
-# This file is licencesd under version 2 of the GPL.
+# This file is licensed under version 2 of the GPL.
 
 #
 # Do not edit this file; run `make config` instead.
@@ -14,12 +14,15 @@ all: make.conf FL Timeline Mixer
 make.conf: configure
 	@ ./configure
 
+config:
+	@ ./configure
+
 -include make.conf
 
 ifeq ($(USE_DEBUG),yes)
 	CXXFLAGS := -pipe -ggdb -Wall -Wextra -Wnon-virtual-dtor -Wno-missing-field-initializers -O0 -fno-rtti -fno-exceptions
 else
-	CXXFLAGS := -pipe -O3 -fno-rtti -fno-exceptions -DNDEBUG
+	CXXFLAGS := -pipe -O2 -fno-rtti -fno-exceptions -DNDEBUG
 endif
 
 CXXFLAGS += $(SNDFILE_CFLAGS) $(LASH_CFLAGS) $(FLTK_CFLAGS) -DINSTALL_PREFIX="\"$(prefix)\"" -DVERSION=\"$(VERSION)\"
@@ -49,14 +52,11 @@ TAGS: $(SRCS)
 	etags $(SRCS)
 
 makedepend: make.conf $(SRCS)
-	@ echo -n Checking dependencies...
+	@ echo -n Calculating dependencies...
 	@ makedepend -f- -- $(CXXFLAGS) -I. -IFL -ITimeline -IMixer -- $(SRCS) > makedepend 2>/dev/null && echo $(DONE)
 
 .PHONEY: clean config
 
 clean: FL_clean Timeline_clean Mixer_clean
 
-config:
-	@ ./configure
-
 -include makedepend