Env refactor

mostly fixing some tmux ish, but became a general refactor branch