lots of cleanups
more Tor