@@ -75,23 +75,20 @@
  */
 @interface OFStreamObserver: OFObject
 {
 	OFMutableArray *readStreams;
 	OFMutableArray *writeStreams;
+	OFMutableArray *queue, *queueInfo;
 	id <OFStreamObserverDelegate> delegate;
 #ifdef OF_HAVE_POLL
 	OFDataArray *fds;
 	OFMutableDictionary *fdToStream;
 #else
 	fd_set readfds;
 	fd_set writefds;
 	fd_set exceptfds;
-# ifndef _WIN32
-	nfds_t nfds;
-# else
 	int nfds;
-# endif
 #endif
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (retain) id <OFStreamObserverDelegate> delegate;
@@ -118,20 +115,20 @@
  * Adds a stream to observe for reading.
  * 
  * This is also used to observe a listening socket for incoming connections,
  * which then triggers a read event for the observed stream.
  *
- * It is recommended that the stream you add it set to non-blocking mode.
+ * It is recommended that the stream you add is set to non-blocking mode.
  *
  * \param stream The stream to observe for reading
  */
 - (void)addStreamToObserveForReading: (OFStream*)stream;
 
 /**
  * Adds a stream to observe for writing.
  *
- * It is recommended that the stream you add it set to non-blocking mode.
+ * It is recommended that the stream you add is set to non-blocking mode.
  *
  * \param stream The stream to observe for writing
  */
 - (void)addStreamToObserveForWriting: (OFStream*)stream;