diff --git a/Makefile b/Makefile
index af846370..bdbd5526 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ DEBUG=1
 INSTALL=install
 
 CFLAGS += -std=c99
+CFLAGS += -pipe
 CFLAGS += -Wall
 CFLAGS += -Iinclude
 CFLAGS += -I/usr/local/include
diff --git a/website/index.html b/website/index.html
index a44d40fc..2328c921 100644
--- a/website/index.html
+++ b/website/index.html
@@ -29,7 +29,7 @@ li {
 </p>
 
 <p>
-  Please be aware that i3 is primarily targeted at computer geeks.
+  Please be aware that i3 is primarily targeted at advanced users and developers.
 </p>
 
 <h2>Goals</h2>
@@ -57,7 +57,7 @@ li {
   <li>
     Implement Xinerama correctly, that is by assigning each workspace to a
     virtual screen. Especially make sure that attaching and detaching new monitors
-    like beamers works during operation and does the right thing.
+    like video projectors works during operation and does the right thing.
   </li>
   <li>
     Use the metaphor of a table for abstraction. You can create horizontal and