Slight modifications and tmux changes