Improve tunnel commands in shell