diff --git a/Makefile b/Makefile
index d81cd4c1..ecfd798b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ all:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 	@for i in ${SUBDIRS} cmd/wm; do \
-		(cd $$i; make;) \
+		(cd $$i; make) \
 	done
 
 dist: clean
diff --git a/cmd/wm/wmii b/cmd/wm/wmii
index 68d854ae..1f499f95 100644
--- a/cmd/wm/wmii
+++ b/cmd/wm/wmii
@@ -1,7 +1,6 @@
 #!/bin/sh
 # start wmiiwm and wait for its termination
 
-test $# -eq 0 || exec wmiiwm "$@"
 wmiiwm -c || exit 1
 
 OLD_PATH=$PATH export OLD_PATH
diff --git a/cmd/wm/wmii.1 b/cmd/wm/wmii.1
index c3c1fb3c..019b7472 100644
--- a/cmd/wm/wmii.1
+++ b/cmd/wm/wmii.1
@@ -1,6 +1,8 @@
 .TH WMII 1 wmii-3
 .SH NAME
 wmii \- window manager improved 2
+.SH SYNOPSIS
+.B wmii
 .SH DESCRIPTION
 .SS Overview
 .BR wmii (1)
diff --git a/rc/wmiirc b/rc/wmiirc
index 0c2cc65e..10ba28f9 100644
--- a/rc/wmiirc
+++ b/rc/wmiirc
@@ -71,6 +71,7 @@ $MODKEY-n
 $MODKEY-m
 $MODKEY-s
 $MODKEY-equal
+$MODKEY-0
 $MODKEY-1
 $MODKEY-2
 $MODKEY-3
@@ -80,6 +81,7 @@ $MODKEY-6
 $MODKEY-7
 $MODKEY-8
 $MODKEY-9
+$MODKEY-Shift-0
 $MODKEY-Shift-1
 $MODKEY-Shift-2
 $MODKEY-Shift-3
@@ -113,7 +115,7 @@ do
 		$MODKEY-Control-a)
 			`proglist CONFPREFIX/wmii-3:$HOME/.wmii-3 | wmiimenu` &;;
 		$MODKEY-Control-t)
-			xwrite /ctl select `wmiir read /tags | awk '{print $10}' | wmiimenu`;;
+			xwrite /ctl select `wmiir read /tags | awk '{print $NF}' | wmiimenu`;;
 		$MODKEY-t)
 			extern xterm &;;
 		$MODKEY-m)