diff --git a/coolamqp/clustering/cluster.py b/coolamqp/clustering/cluster.py
index f1e7342719680ae73077e128b4f62c399d07ec74..f81e3642c6aadc9ec01069ca0cadc0b2f68541eb 100644
--- a/coolamqp/clustering/cluster.py
+++ b/coolamqp/clustering/cluster.py
@@ -187,7 +187,7 @@ class Cluster(object):
         """
         Start consuming from a queue.
 
-        args and kwargs will be passed to Consumer constructor (coolamqp.attaches.consumer.Consumer).
+        args and kwargs will be passed to Consumer constructor.
         Don't use future_to_notify - it's done here!
 
         Take care not to lose the Consumer object - it's the only way to cancel a consumer!
diff --git a/docs/reference.rst b/docs/reference.rst
index a5cf4ea3fe2e9a1677fea9ed3fb65c85f5f13281..73ec242c8d6d20d5f95eac6f82e090d8cc8a6abd 100644
--- a/docs/reference.rst
+++ b/docs/reference.rst
@@ -8,14 +8,13 @@ Cluster-related things
     :members:
 
 .. note:: If environment variable :code:`COOLAMQP_FORCE_SELECT_LISTENER` is defined, select will be used instead of epoll.
-
+          This will automatically use select if epoll is not available (eg. Windows).
 
 .. autoclass:: coolamqp.attaches.consumer.BodyReceiveMode
     :members:
 
 .. autoclass:: coolamqp.attaches.consumer.Consumer
     :members:
-    :undoc-members:
 
 Please note that :meth:`coolamqp.clustering.Cluster.consume` passes lot of it's
 args and kwargs directly to the :class:`coolamqp.attaches.consumer.Consumer`.
@@ -23,19 +22,19 @@ args and kwargs directly to the :class:`coolamqp.attaches.consumer.Consumer`.
 Extra objects
 -------------
 
-.. class:: coolamqp.objects.Message
+.. autoclass:: coolamqp.objects.Message
     :members:
 
-.. class:: coolamqp.objects.ReceivedMessage
+.. autoclass:: coolamqp.objects.ReceivedMessage
     :members:
 
-.. class:: coolamqp.objects.MessageProperties
+.. autoclass:: coolamqp.objects.MessageProperties
     :members:
 
-.. class:: coolamqp.objects.Queue
+.. autoclass:: coolamqp.objects.Queue
     :members:
 
-.. class:: coolamqp.objects.Exchange
+.. autoclass:: coolamqp.objects.Exchange
     :members: