diff --git a/ChangeLog b/ChangeLog
index 4f7363db18..f4c6c6edde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-01-18  Wim Taymans  <wim@fluendo.com>
+
+	* gst/gstbin.c: (gst_bin_element_set_state):
+	* gst/gstclock.c: (gst_clock_id_wait):
+	Added some more debug info.
+
+	* libs/gst/base/gstadapter.c:
+	Added more docs.
+
+	* libs/gst/base/gstbasesink.c: (gst_base_sink_handle_object),
+	(gst_base_sink_do_sync), (gst_base_sink_chain):
+	Added some comments.
+
 2006-01-18  Wim Taymans  <wim@fluendo.com>
 
 	* tests/check/Makefile.am:
diff --git a/gst/gstbin.c b/gst/gstbin.c
index e9e079e7e4..b4c56ec114 100644
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -1621,6 +1621,8 @@ gst_bin_element_set_state (GstBin * bin, GstElement * element, GstState pending)
 
   /* skip locked elements */
   if (G_UNLIKELY (locked)) {
+    GST_DEBUG_OBJECT (element,
+        "element is locked, pretending state change succeeded");
     ret = GST_STATE_CHANGE_SUCCESS;
     goto done;
   }
diff --git a/gst/gstclock.c b/gst/gstclock.c
index 8e5cc58cdf..955fe7d2a6 100644
--- a/gst/gstclock.c
+++ b/gst/gstclock.c
@@ -356,7 +356,8 @@ gst_clock_id_wait (GstClockID id, GstClockTimeDiff * jitter)
     GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock, "waiting on clock entry %p",
         id);
     res = cclass->wait (clock, entry);
-    GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock, "done waiting entry %p", id);
+    GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock,
+        "done waiting entry %p, res: %d", id, res);
 
     if (jitter) {
       GstClockTime now = gst_clock_get_time (clock);
diff --git a/libs/gst/base/gstadapter.c b/libs/gst/base/gstadapter.c
index e3aa409a3d..15fe930666 100644
--- a/libs/gst/base/gstadapter.c
+++ b/libs/gst/base/gstadapter.c
@@ -303,7 +303,7 @@ gst_adapter_flush (GstAdapter * adapter, guint flush)
  * @nbytes: the number of bytes to take
  *
  * Returns a freshly allocated buffer containing the first @nbytes bytes of the
- * @adapter.
+ * @adapter. The returned bytes will be flushed from the adapter.
  *
  * Caller owns returned value. g_free after usage.
  *
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 328f1f1158..9da7cccda5 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -1177,6 +1177,8 @@ wrong_mode:
     g_warning ("Push on pad %s:%s, but it was not activated in push mode",
         GST_DEBUG_PAD_NAME (pad));
     GST_OBJECT_UNLOCK (pad);
+    /* we don't post an error message this will signal to the peer
+     * pushing that EOS is reached. */
     result = GST_FLOW_UNEXPECTED;
     goto done;
   }