Update maps and fix for use with tmux