Whitespace and punctuation fixes.
but sockets instead, internally. Old, backward compatible interfaces maintained.