Updates Copyright Year
Various Adjustments

* Converts comments to use a more compact style
* Overrides some of the hackery done to support socket timeouts