diff --git a/CHANGES b/CHANGES
index 46025a6c..840ec436 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,9 @@
 
 * Rework the prefix-time stuff. The option is now call repeat-time and defaults
   to 500 ms. However, it only applies to a small subset of commands, currently:
-  up-pane, down-pane, next-window, previous-window, resize-pane-up,
-  resize-pane-down. These are the commands for which it is obviously useful,
-  having it for everything else was just bloody annoying.
+  up-pane, down-pane, next-window, previous-window, last-window,
+  resize-pane-up, resize-pane-down. These are the commands for which it is
+  obviously useful, having it for everything else was just bloody annoying.
 * The alt-up and alt-down keys now resize a pane by five lines at a time.
 * switch-pane is now select-pane and requires -p to select a pane. The
   "o" key binding is changed to down-pane.
@@ -923,7 +923,7 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.207 2009-01-14 22:13:30 nicm Exp $
+$Id: CHANGES,v 1.208 2009-01-14 22:36:07 nicm Exp $
 
  LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
  LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB
diff --git a/cmd-last-window.c b/cmd-last-window.c
index 0bff8d21..e51dad6c 100644
--- a/cmd-last-window.c
+++ b/cmd-last-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-last-window.c,v 1.13 2008-06-18 22:21:51 nicm Exp $ */
+/* $Id: cmd-last-window.c,v 1.14 2009-01-14 22:36:07 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,7 @@ void	cmd_last_window_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_last_window_entry = {
 	"last-window", "last",
 	CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_CANREPEAT,
 	cmd_target_init,
 	cmd_target_parse,
 	cmd_last_window_exec,
diff --git a/examples/n-marriott.conf b/examples/n-marriott.conf
index c3695fbc..8b4874a9 100644
--- a/examples/n-marriott.conf
+++ b/examples/n-marriott.conf
@@ -3,19 +3,23 @@ set -g status-bg green
 set -g status-right-length 60
 set -g default-command "exec /bin/ksh -l"
 set -g bell-action none
+set -g lock-after-time 1800
 
 # Default global window options.
-setw -g remain-on-exit on
+#setw -g remain-on-exit on
 
 # Prefix key.
-set -g prefix ^A
-unbind ^B
-bind ^A send-prefix
+set -g prefix C-a
+unbind C-b
+bind C-a send-prefix
+
+# Unlock password.
+pass -c '$2a$06$7LpuTSfDjcz.KD3a9mdEuuJmC.zEq6RBqHWMjdv9/qqzrfWedUBHe'
 
 # Keys to switch session.
-bind q switch -t0
-bind w switch -t1
-bind e switch -t2
+bind q switchc -t0
+bind w switchc -t1
+bind e switchc -t2
 
 # Other key bindings.
 bind i list-windows
@@ -25,15 +29,22 @@ bind m setw monitor-activity
 bind y setw force-width 81
 bind u setw force-width 0
 
-# First session.
-new -d -s0 -nirssi 'screen -DRS irssi irssi' # safe from pkill tmux ;-)
+bind ~ split-window "top -s 0.5"
+bind "#" split-window "ncmpc -f ~/.ncmpc.conf"
+bind / command-prompt "split-window 'man %%'"
+
+# First session.s
+new -d -s0 -nirssi 'ssh -t natalya screen -DRS irssi irssi'
 setw -t0:0 monitor-activity on
 setw -t0:0 aggressive-resize on
 set -t0 status-bg green
 set -t0 status-left '[0]'
 neww -d -ntodo 'exec emacs ~/TODO'
+setw -t0:1 aggressive-resize on
 neww -d -nncmpc 'exec ncmpc -f ~/.ncmpc.conf'
-neww -d
+setw -t0:2 aggressive-resize on
+neww -d -nmutt 'exec mutt'
+setw -t0:3 aggressive-resize on
 neww -d
 neww -d
 neww -d
@@ -46,6 +57,12 @@ new -d -s1
 set -t1 status-bg cyan
 set -t1 status-left '[1]'
 linkw -dk -t0 -s0:0
+linkw -dk -t1 -s0:1
+linkw -dk -t2 -s0:2
+linkw -dk -t3 -s0:3
+neww -d
+neww -d
+neww -d
 neww -d
 neww -d
 neww -d
@@ -55,6 +72,12 @@ new -d -s2
 set -t2 status-bg yellow
 set -t2 status-left '[2]'
 linkw -dk -t0 -s0:0
+linkw -dk -t1 -s0:1
+linkw -dk -t2 -s0:2
+linkw -dk -t3 -s0:3
+neww -d
+neww -d
+neww -d
 neww -d
 neww -d
 neww -d