diff --git a/ChangeLog b/ChangeLog
index 525c738a3..8969cc2d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-18  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-group.h: Add public functions
+	clutter_group_get_n_children() and clutter_group_get_nth_child().
+
+	* clutter/clutter-behaviour.h:
+	* clutter/clutter-behaviour.c: Fix header alignment; fix argument
+	name for apidoc.
+
 2007-01-18  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/Makefile.am: Use the build dir when linking to the
diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c
index 4817539a8..e9987c5c1 100644
--- a/clutter/clutter-behaviour.c
+++ b/clutter/clutter-behaviour.c
@@ -265,7 +265,7 @@ clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
 /**
  * clutter_behaviour_get_nth_actor:
  * @behave: a #ClutterBehaviour
- * @num:  the index of an actor this behaviour is applied too. 
+ * @index:  the index of an actor this behaviour is applied too. 
  *
  * Gets an actor the behaviour was applied to referenced by index num.
  *
@@ -275,11 +275,11 @@ clutter_behaviour_get_n_actors (ClutterBehaviour *behave)
  */
 ClutterActor*
 clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
-				 gint              num)
+				 gint              index)
 {
   g_return_val_if_fail (CLUTTER_IS_BEHAVIOUR (behave), NULL);
 
-  return g_slist_nth_data (behave->priv->actors, num);
+  return g_slist_nth_data (behave->priv->actors, index);
 }
 
 
diff --git a/clutter/clutter-behaviour.h b/clutter/clutter-behaviour.h
index ad96658db..19d16741b 100644
--- a/clutter/clutter-behaviour.h
+++ b/clutter/clutter-behaviour.h
@@ -105,13 +105,9 @@ void          clutter_behaviour_remove         (ClutterBehaviour            *beh
 void          clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
                                                 ClutterBehaviourForeachFunc  func,
                                                 gpointer                     data);
-gint           clutter_behaviour_get_n_actors (ClutterBehaviour *behave);
-
-ClutterActor*  clutter_behaviour_get_nth_actor (ClutterBehaviour *behave,
-						gint              num);
-
-
-
+gint          clutter_behaviour_get_n_actors   (ClutterBehaviour            *behave);
+ClutterActor *clutter_behaviour_get_nth_actor  (ClutterBehaviour            *behave,
+						gint                         index);
 GSList *      clutter_behaviour_get_actors     (ClutterBehaviour            *behave);
 ClutterAlpha *clutter_behaviour_get_alpha      (ClutterBehaviour            *behave);
 void          clutter_behaviour_set_alpha      (ClutterBehaviour            *behave,
diff --git a/clutter/clutter-group.c b/clutter/clutter-group.c
index 4208ff487..be2da6e5a 100644
--- a/clutter/clutter-group.c
+++ b/clutter/clutter-group.c
@@ -253,7 +253,7 @@ clutter_group_get_children (ClutterGroup *self)
 }
 
 /**
- * clutter_group_get_nth_child:
+ * clutter_group_get_n_children:
  * @self: A #ClutterGroup
  *
  * Gets the number of actors held in the group.
diff --git a/clutter/clutter-group.h b/clutter/clutter-group.h
index 24a448e66..88ed559b7 100644
--- a/clutter/clutter-group.h
+++ b/clutter/clutter-group.h
@@ -107,6 +107,9 @@ void          clutter_group_hide_all         (ClutterGroup    *self);
 
 ClutterActor *clutter_group_find_child_by_id (ClutterGroup    *self,
 					      guint            id);
+ClutterActor *clutter_group_get_nth_child    (ClutterGroup    *self,
+                                              gint             index);
+gint          clutter_group_get_n_children   (ClutterGroup    *self);
 void          clutter_group_raise            (ClutterGroup    *self,
 					      ClutterActor    *actor, 
 					      ClutterActor    *sibling);
diff --git a/doc/reference/tmpl/clutter-fixed.sgml b/doc/reference/tmpl/clutter-fixed.sgml
index 2c8b18b7e..4c23a293f 100644
--- a/doc/reference/tmpl/clutter-fixed.sgml
+++ b/doc/reference/tmpl/clutter-fixed.sgml
@@ -55,12 +55,6 @@ Two fixed point numbers can only be multiplied and divided by the provided
 </para>
 
 
-<!-- ##### TYPEDEF ClutterAngle ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO CFX_Q ##### -->
 <para>
 Number of bits used to store fractional part of #ClutterFixed.
@@ -89,6 +83,12 @@ Minumum number representable by #ClutterFixed.
 
 
 
+<!-- ##### TYPEDEF ClutterAngle ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO CFX_PI ##### -->
 <para>