diff --git a/.tmux.conf b/.tmux.conf
index d993166..00b71bb 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -6,7 +6,7 @@ bind-key C-b last-window
 set -g base-index 1
 
 # Allows for faster key repetition
-# set -s escape-time 0
+#set -s escape-time 0
 
 # Set status bar
 set -g status-bg black
@@ -14,9 +14,6 @@ set -g status-fg white
 set -g status-left ""
 set -g status-right "#[fg=green]#H"
 
-# COLORS
-set -g default-terminal "screen-256color"
-
 # Rather than constraining window size to the maximum size of any client
 # connected to the *session*, constrain window size to the maximum size of any
 # client connected to *that window*. Much more reasonable.
@@ -27,14 +24,25 @@ setw -g aggressive-resize on
 bind-key a send-prefix
 
 # Fix control keys through putty
+# (It looks like on some versions of tmux this needs to be setw not set.)
 set -g xterm-keys on
+setw -g xterm-keys on
+
+# Colors?
+set -g default-terminal "screen-256color"
 
 # Activity monitoring
-# setw -g monitor-activity on
-# set -g visual-activity on
+#setw -g monitor-activity on
+#set -g visual-activity on
 
 # Example of using a shell command in the status line
-# set -g status-right "#[fg=yellow]#(uptime | cut -d ',' -f 2-)"
+set -g status-right "#[fg=yellow]#(date)"
 
 # Highlight active window
 set-window-option -g window-status-current-bg red
+
+# set-window-option -g mouse on
+set -g history-limit 30000
+
+# fish!
+set-option -g default-shell /bin/fish
\ No newline at end of file