diff --git a/client.c b/client.c
index b2318ab..e9075a2 100644
--- a/client.c
+++ b/client.c
@@ -398,7 +398,6 @@ manage(Window w, XWindowAttributes *wa)
 	c->next = *l; /* *l == nil */
 	*l = c;
 
-	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMapRaised(dpy, c->win);
 	XMapRaised(dpy, c->title);
 	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
@@ -495,6 +494,7 @@ resize(Client *c, Bool inc)
 	if(c->maxh && c->h > c->maxh)
 		c->h = c->maxh;
 	resize_title(c);
+	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 	e.type = ConfigureNotify;
 	e.event = c->win;
diff --git a/config.mk b/config.mk
index 39533c2..ed58c1f 100644
--- a/config.mk
+++ b/config.mk
@@ -14,9 +14,12 @@ VERSION = 0.0
 LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
 
 # Linux/BSD
-CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+CFLAGS = -Os -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 	-DVERSION=\"${VERSION}\"
-LDFLAGS = -g ${LIBS}
+LDFLAGS = ${LIBS}
+#CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+#	-DVERSION=\"${VERSION}\"
+#LDFLAGS = -g ${LIBS}
 
 
 # Solaris
diff --git a/dwm.1 b/dwm.1
index 1e312e9..1c7a5a6 100644
--- a/dwm.1
+++ b/dwm.1
@@ -12,3 +12,36 @@ is a dynamic window manager for X11.
 .TP
 .B \-v
 prints version information to stdout, then exits.
+.SS Default Key Bindings
+.TP 16
+.I Key	
+.I Action
+.TP
+.B Mod1-Return
+Zoom
+.B window
+to the 
+.B master
+track
+.TP
+.B Mod1-k
+Focus previous
+.B window
+.TP
+.B Mod1-j
+Focus next
+.B window
+.TP
+.B Mod1-m
+Maximize current
+.B window
+.TP
+.B Mod1-[0..n]
+Focus
+.B nth
+tag
+.TP
+.B Mod1-space
+(Re-)arrange
+.B all
+windows tiled
diff --git a/event.c b/event.c
index e85e11f..c55be0f 100644
--- a/event.c
+++ b/event.c
@@ -87,7 +87,7 @@ configurerequest(XEvent *e)
 		if(ev->value_mask & CWHeight)
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
-			c->border = ev->border_width;
+			c->border = 1;
 		gravitate(c, False);
 		resize(c, True);
 	}