* Added the connection preferences.
* Added SOCKS proxy support.
* Removed extraneous bits.