diff --git a/bin/screen b/bin/screen
new file mode 100755
index 0000000..83b71a5
--- /dev/null
+++ b/bin/screen
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Wrapper script to set SSH env vars so agent forwarding works when
+# resuming screen sessions. Place at ~/bin/screen and make sure
+# your personal bin directory has priority in your PATH
+
+for SSHVAR in SSH_CLIENT SSH_TTY SSH_AUTH_SOCK SSH_CONNECTION DISPLAY; do
+    echo "export ${SSHVAR}=\"${!SSHVAR}\""
+done > ~/.sshvars
+/usr/bin/screen $*
diff --git a/config/.bashrc.aliases b/config/.bashrc.aliases
index 8718e91..b483ebd 100644
--- a/config/.bashrc.aliases
+++ b/config/.bashrc.aliases
@@ -130,8 +130,11 @@ alias screenshot="xwd -display :0 -root > screenshot.dmp"
 alias h="history|tail -n 25"
 alias hg="history|grep "
 alias m=make
+alias mt="make test"
+alias mit="make install test"
 alias mj="nice -n20 make -j"
 alias l=less
+alias fixssh='source ~/.sshvars'
 alias sx="ssh -XA"
 alias ..='cd ..'
 alias 2..='cd $up2'
diff --git a/config/.screenrc b/config/.screenrc
index 60f69e7..0f5821f 100644
--- a/config/.screenrc
+++ b/config/.screenrc
@@ -1,7 +1,7 @@
  startup_message off                  # default: on
 
 # Change the number of scrollback lines
-  defscrollback 1000                   # default: 100
+  defscrollback 2000                   # default: 100
 
 # Ensure the default shell is the same as the $SHELL environment variable
   shell -$SHELL