linked tunnels, cleaned up
fixed merge conflict