Added socket options, and updated Channels and Poll implementation
Changed a comment