diff --git a/.ssh/config b/.ssh/config
index e39dfb9..08a4992 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -15,8 +15,13 @@ Host aino
   User jakub
   Port 22209
 
+Host puffinus
+  HostName puffinus.fy.chalmers.se
+  User jakub
+  Port 22209
+
 Host sharknado
-  HostName 130.238.29.144
+  HostName 130.239.81.182
   User ubuntu
   IdentityFile ~/.ssh/jupyterhub_rsa
 
@@ -43,7 +48,7 @@ Host vera2
   User fojt
 
 Host tetralith
-  Hostname tetralith-el9.nsc.liu.se
+  Hostname tetralith.nsc.liu.se
   User x_jakfo
 
 Host remote11
@@ -57,7 +62,7 @@ Host remote11
 Host dardel
   Hostname dardel.pdc.kth.se
   User fojt
-  IdentityFile ~/.ssh/id_dardel
+  IdentityFile ~/.ssh/id-ed25519-pdc
 
 Host *
     ForwardAgent no
diff --git a/.tmux.conf b/.tmux.conf
index 4ccb482..0191fca 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -11,9 +11,14 @@ set -g default-terminal "screen-256color"
 bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
 bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
 
-# ssh socket, important to create symlink in ~/.ssh/rc
-set -g update-environment -r
-set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock
+# Update the session environment upon attaching
+set-option -g update-environment 'SSH_AUTH_SOCK SSH_CONNECTION DISPLAY'
+set-hook -g client-attached 'run-shell /bin/update_display.sh'
+
+# Rename the session to the path
+set-option -g status-interval 5
+set-option -g automatic-rename on
+set-option -g automatic-rename-format '#{pane_current_path}'
 
 # Shorten delay for relaying Esc (to e.g. vim). Too short and PgUp will not work
 set -sg escape-time 20
diff --git a/.vimrc b/.vimrc
index cb9c45e..78f01c0 100755
--- a/.vimrc
+++ b/.vimrc
@@ -30,6 +30,7 @@ if filereadable(expand(plug_fpath))
     Plug 'tpope/vim-unimpaired'
     Plug 'JuliaEditorSupport/julia-vim'
     Plug 'tell-k/vim-autopep8'
+    Plug 'tell-k/vim-autoflake'
     Plug 'jpalardy/vim-slime'
     Plug 'preservim/tagbar'
     Plug 'wellle/context.vim'
@@ -349,7 +350,7 @@ let g:latex_to_unicode_auto = 1
 
 noremap <expr> <F7> LaTeXtoUnicode#Toggle()
 noremap! <expr> <F7> LaTeXtoUnicode#Toggle()
-autocmd FileType python noremap <buffer> <F8> :call Autopep8()<CR>
+autocmd FileType python noremap <buffer> :call Autoflake()<CR> :call Autopep8()<CR>
 
 let g:slime_target = "tmux"
 let g:slime_default_config = {"socket_name": "default", "target_pane": "{last}"}
@@ -396,3 +397,7 @@ nmap <Leader>p :set paste! <CR>
 map <Leader>n :noh<CR>
 vmap <Leader>T :'<,'> Tabularize /
 nnoremap <leader>c :execute "set colorcolumn=" . (&colorcolumn == "" ? "120" : "")<CR>
+
+" Insert "Embed IPython" command
+:command InsIPython :normal oimport IPython<CR>IPython.embed()<ESC><up>^
+nmap <Leader>i :InsIPython <CR>