added tmux adjustments as well as a tty thing to prevent ctrl-s suspending the term
not sure
Merge with remote
merge with remote