Updated comments
tmux
merge fixes
tmux setup