session.tunnel_peer changed by session.session_host. Other minor changes