minor refactor and and restore svi() for tmux