Updated a few files,.. tmux starting now also
merge