Tor Mode improvments