Clean up strings, add tor-only checkbox